diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 24723d7fb12..eebc95ae0e2 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -25,7 +25,7 @@
                 <separator/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Invoices"/>
                 <filter string="Pro-forma" icon="terp-gtk-media-pause" domain="['|', ('state','=','proforma'),('state','=','proforma2')]" help = "Pro-forma Invoices"/>
-                <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel'))]" help = "Open and Paid Invoices"/>
+                <filter string="Invoiced" name="current" icon="terp-check" domain="[('state','not in', ('draft','cancel','proforma','proforma2'))]" help = "Open and Paid Invoices"/>
                 <separator/>
                 <filter icon="terp-personal" string="Customer" name="customer" domain="['|', ('type','=','out_invoice'),('type','=','out_refund')]" help="Customer Invoices And Refunds"/>
                 <filter icon="terp-personal" string="Supplier" domain="['|', ('type','=','in_invoice'),('type','=','in_refund')]" help="Supplier Invoices And Refunds"/>
diff --git a/addons/account/report/report_vat.py b/addons/account/report/report_vat.py
index 236e2ffaac2..3a0950ac62f 100644
--- a/addons/account/report/report_vat.py
+++ b/addons/account/report/report_vat.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp.osv import osv
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from common_report_header import common_report_header
@@ -29,14 +30,12 @@ except ImportError:
 import xlwt
 
 
-class tax_report(http.Controller, common_report_header):
+class tax_report(osv.AbstractModel, common_report_header):
+    _name = 'report.account.report_vat'
 
-    @http.route(['/report/account.report_vat'], type='http', auth='user', website=True, multilang=True)
-    def report_account_tax(self, **data):
+    def render_html(self, cr, uid, ids, data=None, context=None):
         report_obj = request.registry['report']
-        self.cr, self.uid, self.pool = request.cr, request.uid, request.registry
-
-        data = report_obj.eval_params(data)
+        self.cr, self.uid, self.context = cr, uid, context
 
         res = {}
         self.period_ids = []
@@ -54,23 +53,23 @@ class tax_report(http.Controller, common_report_header):
             'based_on': self._get_basedon(data),
             'period_from': self.get_start_period(data),
             'period_to': self.get_end_period(data),
-            'taxlines': self._get_lines(self._get_basedon(data), company_id=data['form']['company_id']),
+            'taxlines': self._get_lines(self._get_basedon(data), company_id=data['form']['company_id'], cr=cr, uid=uid),
         }
-        return request.registry['report'].render(self.cr, self.uid, [], 'account.report_vat', docargs)
+        return report_obj.render(self.cr, self.uid, [], 'account.report_vat', docargs, context=context)
 
     def _get_basedon(self, form):
         return form['form']['based_on']
 
-    def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None):
+    def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None, cr=None, uid=None):
         period_list = self.period_ids
-        res = self._get_codes(based_on, company_id, parent, level, period_list, context=context)
+        res = self._get_codes(based_on, company_id, parent, level, period_list, cr=cr, uid=uid, context=context)
         if period_list:
             res = self._add_codes(based_on, res, period_list, context=context)
         else:
-            self.cr.execute ("select id from account_fiscalyear")
-            fy = self.cr.fetchall()
-            self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
-            periods = self.cr.fetchall()
+            cr.execute ("select id from account_fiscalyear")
+            fy = cr.fetchall()
+            cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
+            periods = cr.fetchall()
             for p in periods:
                 period_list.append(p[0])
             res = self._add_codes(based_on, res, period_list, context=context)
@@ -90,7 +89,7 @@ class tax_report(http.Controller, common_report_header):
             }
 
             top_result.append(res_dict)
-            res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, context=context)
+            res_general = self._get_general(res[i][1].id, period_list, company_id, based_on, cr=cr, uid=uid, context=context)
             ind_general = 0
             while ind_general < len(res_general):
                 res_general[ind_general]['type'] = 2
@@ -101,14 +100,14 @@ class tax_report(http.Controller, common_report_header):
             i+=1
         return top_result
 
-    def _get_general(self, tax_code_id, period_list, company_id, based_on, context=None):
+    def _get_general(self, tax_code_id, period_list, company_id, based_on, cr=None, uid=None, context=None):
         if not self.display_detail:
             return []
         res = []
         obj_account = self.pool.get('account.account')
         periods_ids = tuple(period_list)
         if based_on == 'payments':
-            self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+            cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
                         SUM(line.debit) AS debit, \
                         SUM(line.credit) AS credit, \
                         COUNT(*) AS count, \
@@ -132,7 +131,7 @@ class tax_report(http.Controller, common_report_header):
                         company_id, periods_ids, 'paid',))
 
         else:
-            self.cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
+            cr.execute('SELECT SUM(line.tax_amount) AS tax_amount, \
                         SUM(line.debit) AS debit, \
                         SUM(line.credit) AS credit, \
                         COUNT(*) AS count, \
@@ -149,23 +148,21 @@ class tax_report(http.Controller, common_report_header):
                         AND account.active \
                     GROUP BY account.id,account.name,account.code', ('draft', tax_code_id,
                         company_id, periods_ids,))
-        res = self.cr.dictfetchall()
+        res = cr.dictfetchall()
 
         i = 0
         while i<len(res):
-            res[i]['account'] = obj_account.browse(self.cr, self.uid, res[i]['account_id'], context=context)
+            res[i]['account'] = obj_account.browse(cr, uid, res[i]['account_id'], context=context)
             i+=1
         return res
 
-    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=None, context=None):
+    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=None, cr=None, uid=None, context=None):
         obj_tc = self.pool.get('account.tax.code')
-        ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], order='sequence', context=context)
-
+        ids = obj_tc.search(cr, uid, [('parent_id', '=', parent), ('company_id', '=', company_id)], order='sequence', context=context)
         res = []
-        for code in obj_tc.browse(self.cr, self.uid, ids, {'based_on': based_on}):
+        for code in obj_tc.browse(cr, uid, ids, {'based_on': based_on}):
             res.append(('.'*2*level, code))
-
-            res += self._get_codes(based_on, company_id, code.id, level+1, context=context)
+            res += self._get_codes(based_on, company_id, code.id, level+1, cr=cr, uid=uid, context=context)
         return res
 
     def _add_codes(self, based_on, account_list=None, period_list=None, context=None):
@@ -187,9 +184,6 @@ class tax_report(http.Controller, common_report_header):
             res.append((account[0], code))
         return res
 
-    def _get_currency(self, form, context=None):
-        return self.pool.get('res.company').browse(self.cr, self.uid, form['company_id'], context=context).currency_id.name
-
     def sort_result(self, accounts, context=None):
         result_accounts = []
         ind=0
@@ -206,7 +200,8 @@ class tax_report(http.Controller, common_report_header):
                 bcl_rup_ind = ind - 1
 
                 while (bcl_current_level >= int(accounts[bcl_rup_ind]['level']) and bcl_rup_ind >= 0 ):
-                    res_tot = { 'code': accounts[bcl_rup_ind]['code'],
+                    res_tot = {
+                        'code': accounts[bcl_rup_ind]['code'],
                         'name': '',
                         'debit': 0,
                         'credit': 0,
@@ -229,25 +224,23 @@ class tax_report(http.Controller, common_report_header):
 
         return result_accounts
 
+
+class tax_report_xls(http.Controller):
+
     @http.route(['/report/account.report_vat_xls'], type='http', auth='user', website=True, multilang=True)
     def report_account_tax_xls(self, **data):
-        report_obj = request.registry['report']
-        self.cr, self.uid, self.pool = request.cr, request.uid, request.registry
 
-        data = report_obj.eval_params(data)
+        # Very ugly lines, only for the proof of concept of 'controller' report
+        taxreport_obj = request.registry['report.account.report_vat']
+        from openerp.addons.report.controllers.main import ReportController
+        eval_params = ReportController()._eval_params
 
-        res = {}
-        self.period_ids = []
-        period_obj = self.pool.get('account.period')
-        self.display_detail = data['form']['display_detail']
-        res['periods'] = ''
-        res['fiscalyear'] = data['form'].get('fiscalyear_id', False)
+        cr, uid = request.cr, request.uid
+        data = eval_params(data)
+        data = {'form': data}
 
-        if data['form'].get('period_from', False) and data['form'].get('period_to', False):
-            self.period_ids = period_obj.build_ctx_periods(self.cr, self.uid, data['form']['period_from'], data['form']['period_to'])
-
-        content = ''
-        lines = self._get_lines(self._get_basedon(data), company_id=data['form']['company_id'])
+        taxreport_obj.render_html(cr, uid, [], data=data)
+        lines = taxreport_obj._get_lines(taxreport_obj._get_basedon(data), company_id=data['form']['company_id'], cr=cr, uid=uid)
 
         if lines:
             xls = StringIO.StringIO()
diff --git a/addons/account/wizard/account_report_aged_partner_balance_view.xml b/addons/account/wizard/account_report_aged_partner_balance_view.xml
index be1d710c09d..09ae525c595 100644
--- a/addons/account/wizard/account_report_aged_partner_balance_view.xml
+++ b/addons/account/wizard/account_report_aged_partner_balance_view.xml
@@ -19,6 +19,7 @@
                         <newline/>
                         <field name="result_selection"/>
                         <field name="direction_selection"/>
+                        <field name="target_move"/>
                     </group>
                     <field name="journal_ids" required="0" invisible="1"/>
                     <footer>
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 22a240e310b..b4ce20d49e3 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -78,6 +78,9 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
     @http.route()
     def web_login(self, *args, **kw):
         ensure_db()
+        if request.httprequest.method == 'GET' and request.session.uid and request.params.get('redirect'):
+            # Redirect if already logged in and redirect param is present
+            return http.redirect_with_hash(request.params.get('redirect'))
         providers = self.list_providers()
 
         response = super(OAuthLogin, self).web_login(*args, **kw)
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 78f2833f3d1..8a66d3ab075 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -37,6 +37,9 @@ class AuthSignupHome(openerp.addons.web.controllers.main.Home):
         ensure_db()
         response = super(AuthSignupHome, self).web_login(*args, **kw)
         response.qcontext.update(self.get_auth_signup_config())
+        if request.httprequest.method == 'GET' and request.session.uid and request.params.get('redirect'):
+            # Redirect if already logged in and redirect param is present
+            return http.redirect_with_hash(request.params.get('redirect'))
         return response
 
     @http.route('/web/signup', type='http', auth='public', website=True, multilang=True)
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 4c1c1a671b7..5a744c21c81 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -20,8 +20,8 @@
 ##############################################################################
 from datetime import datetime, timedelta
 import random
-from urllib import urlencode
 from urlparse import urljoin
+import werkzeug
 
 from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
 from openerp.osv import osv, fields
@@ -53,7 +53,7 @@ class res_partner(osv.Model):
                                 (not partner.signup_expiration or dt <= partner.signup_expiration)
         return res
 
-    def _get_signup_url_for_action(self, cr, uid, ids, action='login', view_type=None, menu_id=None, res_id=None, model=None, context=None):
+    def _get_signup_url_for_action(self, cr, uid, ids, action=None, view_type=None, menu_id=None, res_id=None, model=None, context=None):
         """ generate a signup url for the given partner ids and action, possibly overriding
             the url state components (menu_id, id, view_type) """
         if context is None:
@@ -81,6 +81,8 @@ class res_partner(osv.Model):
                 continue        # no signup token, no user, thus no signup url!
 
             fragment = dict()
+            if action:
+                fragment['action'] = action
             if view_type:
                 fragment['view_type'] = view_type
             if menu_id:
@@ -90,7 +92,10 @@ class res_partner(osv.Model):
             if res_id:
                 fragment['id'] = res_id
 
-            res[partner.id] = urljoin(base_url, "/web/%s?%s#%s" % (route, urlencode(query), urlencode(fragment)))
+            if fragment:
+                query['redirect'] = '/web#' + werkzeug.url_encode(fragment)
+
+            res[partner.id] = urljoin(base_url, "/web/%s?%s" % (route, werkzeug.url_encode(query)))
 
         return res
 
diff --git a/addons/crm/test/lead2opportunity_assign_salesmen.yml b/addons/crm/test/lead2opportunity_assign_salesmen.yml
index 12d212ec5fd..76b35be531d 100644
--- a/addons/crm/test/lead2opportunity_assign_salesmen.yml
+++ b/addons/crm/test/lead2opportunity_assign_salesmen.yml
@@ -65,8 +65,8 @@
   Salesman create a mass convert wizard and convert all the leads.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01"), 'no_force_assignation': False})
-    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('crm.section_sales_department'), 'deduplicate': False}, context=context)
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("test_crm_lead_01"), ref("test_crm_lead_02"), ref("test_crm_lead_03"), ref("test_crm_lead_04"), ref("test_crm_lead_05"), ref("test_crm_lead_06")], 'active_id': ref("test_crm_lead_01")})
+    id = self.create(cr, uid, {'user_ids': [(6, 0, [ref('test_res_user_01'), ref('test_res_user_02'), ref('test_res_user_03'), ref('test_res_user_04')])], 'section_id': ref('crm.section_sales_department'), 'deduplicate': False, 'force_assignation': True}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
   The leads should now be opps with a salesman and a salesteam.  Also, salesmen should have been assigned following a round-robin method.
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 347475d100f..40654f464f4 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -42,7 +42,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
     def onchange_action(self, cr, uid, ids, action, context=None):
         return {'value': {'partner_id': False if action != 'exist' else self._find_matching_partner(cr, uid, context=context)}}
 
-    def _get_duplicated_leads(self, cr, uid, partner_id, email, context=None):
+    def _get_duplicated_leads(self, cr, uid, partner_id, email, include_lost=False, context=None):
         """
         Search for opportunities that have the same partner and that arent done or cancelled
         """
@@ -56,8 +56,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             partner_match_domain.append(('partner_id', '=', partner_id))
         partner_match_domain = ['|'] * (len(partner_match_domain) - 1) + partner_match_domain
         if not partner_match_domain:
-            return []        
-        return lead_obj.search(cr, uid, partner_match_domain + final_stage_domain)
+            return []
+        domain = partner_match_domain
+        if not include_lost:
+            domain += final_stage_domain
+        return lead_obj.search(cr, uid, domain)
 
     def default_get(self, cr, uid, fields, context=None):
         """
@@ -75,7 +78,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
             lead = lead_obj.browse(cr, uid, int(context['active_id']), context=context)
             email = lead.partner_id and lead.partner_id.email or lead.email_from
 
-            tomerge.extend(self._get_duplicated_leads(cr, uid, partner_id, email))
+            tomerge.extend(self._get_duplicated_leads(cr, uid, partner_id, email, include_lost=True, context=context))
             tomerge = list(set(tomerge))
 
             if 'action' in fields:
@@ -197,8 +200,7 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
                 ('each_exist_or_create', 'Use existing partner or create'),
                 ('nothing', 'Do not link to a customer')
             ], 'Related Customer', required=True),
-        # Uncomment me in trunk
-        # 'force_assignation': fields.boolean('Force assignation', help='If unchecked, this will leave the salesman of duplicated opportunities'),
+        'force_assignation': fields.boolean('Force assignation', help='If unchecked, this will leave the salesman of duplicated opportunities'),
     }
 
     _defaults = {
@@ -274,10 +276,7 @@ class crm_lead2opportunity_mass_convert(osv.osv_memory):
             active_ids = active_ids.difference(merged_lead_ids)
             active_ids = active_ids.union(remaining_lead_ids)
             ctx['active_ids'] = list(active_ids)
-        # Remove me in trunk
-        ctx['no_force_assignation'] = ctx.get('no_force_assignation', True) 
-        # Uncomment me in trunk
-        # ctx['no_force_assignation'] = not data.force_assignation
+        ctx['no_force_assignation'] = not data.force_assignation
         return self.action_apply(cr, uid, ids, context=ctx)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
deleted file mode 100644
index 23ff8f1e37d..00000000000
--- a/addons/document_ftp/__openerp__.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Shared Repositories (FTP)',
-    'version': '1.99',
-    'category': 'Knowledge Management',
-    'description': """
-This is a support FTP Interface with document management system.
-================================================================
-
-With this module you would not only be able to access documents through OpenERP
-but you would also be able to connect with them through the file system using the
-FTP client.
-""",
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base', 'document'],
-    'data': [
-        'wizard/ftp_configuration_view.xml',
-        'wizard/ftp_browse_view.xml',
-        'security/ir.model.access.csv',
-        'res_config_view.xml',
-    ],
-    'demo': [],
-    'test': [
-        'test/document_ftp_test2.yml',
-        'test/document_ftp_test4.yml',
-    ],
-    'installable': True,
-    'auto_install': False,
-    'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
-    'post_load': 'post_load',
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
deleted file mode 100644
index 6474def3e99..00000000000
--- a/addons/document_ftp/ftpserver/__init__.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import threading
-import logging
-
-import authorizer
-import abstracted_fs
-import ftpserver
-
-import openerp
-from openerp.tools import config
-_logger = logging.getLogger(__name__)
-
-def start_server():
-    if openerp.multi_process:
-        _logger.info("FTP disabled in multiprocess mode")
-        return
-    if openerp.evented:
-        _logger.info("FTP disabled in evented mode")
-        return
-    HOST = config.get('ftp_server_host', '127.0.0.1')
-    PORT = int(config.get('ftp_server_port', '8021'))
-    PASSIVE_PORTS = None
-    pps = config.get('ftp_server_passive_ports', '').split(':')
-    if len(pps) == 2:
-        PASSIVE_PORTS = int(pps[0]), int(pps[1])
-
-    class ftp_server(threading.Thread):
-        
-        def run(self):
-            autho = authorizer.authorizer()
-            ftpserver.FTPHandler.authorizer = autho
-            ftpserver.max_cons = 300
-            ftpserver.max_cons_per_ip = 50
-            ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs
-            if PASSIVE_PORTS:
-                ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS
-
-            ftpserver.log = lambda msg: _logger.info(msg)
-            ftpserver.logline = lambda msg: None
-            ftpserver.logerror = lambda msg: _logger.error(msg)
-
-            ftpd = ftpserver.FTPServer((HOST, PORT), ftpserver.FTPHandler)
-            ftpd.serve_forever()
-
-    if HOST.lower() == 'none':
-        _logger.info("\n Server FTP Not Started\n")
-    else:
-        _logger.info("\n Serving FTP on %s:%s\n" % (HOST, PORT))
-        ds = ftp_server()
-        ds.daemon = True
-        ds.start()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
deleted file mode 100644
index 514ba10f2f6..00000000000
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ /dev/null
@@ -1,665 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-import os
-import time
-from tarfile import filemode
-import logging
-import errno
-
-import glob
-import fnmatch
-
-import openerp
-from openerp import sql_db
-import openerp.service
-from openerp.service import security
-from openerp.osv import osv
-
-from openerp.addons.document.document import get_node_context
-
-def _get_month_name(month):
-    month=int(month)
-    if month==1:return 'Jan'
-    elif month==2:return 'Feb'
-    elif month==3:return 'Mar'
-    elif month==4:return 'Apr'
-    elif month==5:return 'May'
-    elif month==6:return 'Jun'
-    elif month==7:return 'Jul'
-    elif month==8:return 'Aug'
-    elif month==9:return 'Sep'
-    elif month==10:return 'Oct'
-    elif month==11:return 'Nov'
-    elif month==12:return 'Dec'
-
-from ftpserver import _to_decode, _to_unicode
-
-
-class abstracted_fs(object):
-    """A class used to interact with the file system, providing a high
-    level, cross-platform interface compatible with both Windows and
-    UNIX style filesystems.
-
-    It provides some utility methods and some wraps around operations
-    involved in file creation and file system operations like moving
-    files or removing directories.
-
-    Instance attributes:
-     - (str) root: the user home directory.
-     - (str) cwd: the current working directory.
-     - (str) rnfr: source file to be renamed.
-
-    """
-
-    def __init__(self):
-        self.root = None
-        self.cwd = '/'
-        self.cwd_node = None
-        self.rnfr = None
-        self._log = logging.getLogger(__name__)
-
-    # Ok
-    def db_list(self):
-        """Get the list of available databases, with FTPd support
-        """
-        s = openerp.service.db
-        result = s.exp_list(document=True)
-        self.db_name_list = []
-        for db_name in result:
-            db, cr = None, None
-            try:
-                try:
-                    db = sql_db.db_connect(db_name)
-                    cr = db.cursor()
-                    cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'")
-                    if not cr.fetchone():
-                        continue
-
-                    cr.execute("SELECT id FROM ir_module_module WHERE name = 'document_ftp' AND state IN ('installed', 'to install', 'to upgrade') ")
-                    res = cr.fetchone()
-                    if res and len(res):
-                        self.db_name_list.append(db_name)
-                    cr.commit()
-                except Exception:
-                    self._log.warning('Cannot use db "%s".', db_name)
-            finally:
-                if cr is not None:
-                    cr.close()
-        return self.db_name_list
-
-    def ftpnorm(self, ftppath):
-        """Normalize a "virtual" ftp pathname (tipically the raw string
-        coming from client).
-
-        Pathname returned is relative!.
-        """
-        p = os.path.normpath(ftppath)
-        # normalize string in a standard web-path notation having '/'
-        # as separator. xrg: is that really in the spec?
-        p = p.replace("\\", "/")
-        # os.path.normpath supports UNC paths (e.g. "//a/b/c") but we
-        # don't need them.  In case we get an UNC path we collapse
-        # redundant separators appearing at the beginning of the string
-        while p[:2] == '//':
-            p = p[1:]
-        if p == '.':
-            return ''
-        return p
-
-    def get_cwd(self):
-        """ return the cwd, decoded in utf"""
-        return _to_decode(self.cwd)
-
-    def ftp2fs(self, path_orig, data):
-        raise DeprecationWarning()
-
-    def fs2ftp(self, node):
-        """ Return the string path of a node, in ftp form
-        """
-        res='/'
-        if node:
-            paths = node.full_path()
-            res = '/' + node.context.dbname + '/' +  \
-                _to_decode(os.path.join(*paths))
-
-        return res
-
-    def validpath(self, path):
-        """Check whether the path belongs to user's home directory.
-        Expected argument is a datacr tuple
-        """
-        # TODO: are we called for "/" ?
-        return isinstance(path, tuple) and path[1] and True or False
-
-    # --- Wrapper methods around open() and tempfile.mkstemp
-
-    def create(self, datacr, objname, mode):
-        """ Create a children file-node under node, open it
-            @return open node_descriptor of the created node
-        """
-        objname = _to_unicode(objname)
-        cr , node, rem = datacr
-        try:
-            child = node.child(cr, objname)
-            if child:
-                if child.type not in ('file','content'):
-                    raise OSError(1, 'Operation is not permitted.')
-
-                ret = child.open_data(cr, mode)
-                cr.commit()
-                assert ret, "Cannot create descriptor for %r: %r." % (child, ret)
-                return ret
-        except EnvironmentError:
-            raise
-        except Exception:
-            self._log.exception('Cannot locate item %s at node %s.', objname, repr(node))
-            pass
-
-        try:
-            child = node.create_child(cr, objname, data=None)
-            ret = child.open_data(cr, mode)
-            assert ret, "Cannot create descriptor for %r." % child
-            cr.commit()
-            return ret
-        except EnvironmentError:
-            raise
-        except Exception:
-            self._log.exception('Cannot create item %s at node %s.', objname, repr(node))
-            raise OSError(1, 'Operation is not permitted.')
-
-    def open(self, datacr, mode):
-        if not (datacr and datacr[1]):
-            raise OSError(1, 'Operation is not permitted.')
-        # Reading operation
-        cr, node, rem = datacr
-        try:
-            res = node.open_data(cr, mode)
-            cr.commit()
-        except TypeError:
-            raise IOError(errno.EINVAL, "No data.")
-        return res
-
-    # ok, but need test more
-
-    def mkstemp(self, suffix='', prefix='', dir=None, mode='wb'):
-        """A wrap around tempfile.mkstemp creating a file with a unique
-        name.  Unlike mkstemp it returns an object with a file-like
-        interface.
-        """
-        raise NotImplementedError # TODO
-
-        text = not 'b' in mode
-        # for unique file , maintain version if duplicate file
-        if dir:
-            cr = dir.cr
-            uid = dir.uid
-            pool = openerp.registry(node.context.dbname)
-            object=dir and dir.object or False
-            object2=dir and dir.object2 or False
-            res=pool.get('ir.attachment').search(cr,uid,[('name','like',prefix),('parent_id','=',object and object.type in ('directory','ressource') and object.id or False),('res_id','=',object2 and object2.id or False),('res_model','=',object2 and object2._name or False)])
-            if len(res):
-                pre = prefix.split('.')
-                prefix=pre[0] + '.v'+str(len(res))+'.'+pre[1]
-        return self.create(dir,suffix+prefix,text)
-
-
-
-    # Ok
-    def chdir(self, datacr):
-        if (not datacr) or datacr == (None, None, None):
-            self.cwd = '/'
-            self.cwd_node = None
-            return None
-        if not datacr[1]:
-            raise OSError(1, 'Operation is not permitted.')
-        if datacr[1].type not in  ('collection','database'):
-            raise OSError(2, 'Path is not a directory.')
-        self.cwd = '/'+datacr[1].context.dbname + '/'
-        self.cwd += '/'.join(datacr[1].full_path())
-        self.cwd_node = datacr[1]
-
-    # Ok
-    def mkdir(self, datacr, basename):
-        """Create the specified directory."""
-        cr, node, rem = datacr or (None, None, None)
-        if not node:
-            raise OSError(1, 'Operation is not permitted.')
-
-        try:
-            basename =_to_unicode(basename)
-            cdir = node.create_child_collection(cr, basename)
-            self._log.debug("Created child dir: %r", cdir)
-            cr.commit()
-        except Exception:
-            self._log.exception('Cannot create dir "%s" at node %s.', basename, repr(node))
-            raise OSError(1, 'Operation is not permitted.')
-
-    def close_cr(self, data):
-        if data and data[0]:
-            data[0].close()
-        return True
-
-    def get_cr(self, pathname):
-        raise DeprecationWarning()
-
-    def get_crdata(self, line, mode='file'):
-        """ Get database cursor, node and remainder data, for commands
-
-        This is the helper function that will prepare the arguments for
-        any of the subsequent commands.
-        It returns a tuple in the form of:
-        @code        ( cr, node, rem_path=None )
-
-        @param line An absolute or relative ftp path, as passed to the cmd.
-        @param mode A word describing the mode of operation, so that this
-                    function behaves properly in the different commands.
-        """
-        path = self.ftpnorm(line)
-        if self.cwd_node is None:
-            if not os.path.isabs(path):
-                path = os.path.join(self.root, path)
-
-        if path == '/' and mode in ('list', 'cwd'):
-            return (None, None, None )
-
-        if path == '..': path = self.cwd + '/..'
-        path = _to_unicode(os.path.normpath(path)) # again, for '/db/../ss'
-        if path == '.': path = ''
-
-        if os.path.isabs(path) and self.cwd_node is not None \
-                and path.startswith(self.cwd):
-            # make relative, so that cwd_node is used again
-            path = path[len(self.cwd):]
-            if path.startswith('/'):
-                path = path[1:]
-
-        p_parts = path.split(os.sep)
-
-        assert '..' not in p_parts
-
-        rem_path = None
-        if mode in ('create',):
-            rem_path = p_parts[-1]
-            p_parts = p_parts[:-1]
-
-        if os.path.isabs(path):
-            # we have to start from root, again
-            while p_parts and p_parts[0] == '':
-                p_parts = p_parts[1:]
-            # self._log.debug("Path parts: %r ", p_parts)
-            if not p_parts:
-                raise IOError(errno.EPERM, 'Cannot perform operation at root directory.')
-            dbname = p_parts[0]
-            if dbname not in self.db_list():
-                raise IOError(errno.ENOENT,'Invalid database path: %s.' % dbname)
-            try:
-                db = openerp.registry(dbname).db
-            except Exception:
-                raise OSError(1, 'Database cannot be used.')
-            cr = db.cursor()
-            try:
-                uid = security.login(dbname, self.username, self.password)
-            except Exception:
-                cr.close()
-                raise
-            if not uid:
-                cr.close()
-                raise OSError(2, 'Authentification required.')
-            n = get_node_context(cr, uid, {})
-            node = n.get_uri(cr, p_parts[1:])
-            return (cr, node, rem_path)
-        else:
-            # we never reach here if cwd_node is not set
-            if p_parts and p_parts[-1] == '':
-                p_parts = p_parts[:-1]
-            cr, uid = self.get_node_cr_uid(self.cwd_node)
-            if p_parts:
-                node = self.cwd_node.get_uri(cr, p_parts)
-            else:
-                node = self.cwd_node
-            if node is False and mode not in ('???'):
-                cr.close()
-                raise IOError(errno.ENOENT, 'Path does not exist.')
-            return (cr, node, rem_path)
-
-    def get_node_cr_uid(self, node):
-        """ Get cr, uid, pool from a node
-        """
-        assert node
-        db = openerp.registry(node.context.dbname).db
-        return db.cursor(), node.context.uid
-
-    def get_node_cr(self, node):
-        """ Get the cursor for the database of a node
-
-        The cursor is the only thing that a node will not store
-        persistenly, so we have to obtain a new one for each call.
-        """
-        return self.get_node_cr_uid(node)[0]
-
-    def listdir(self, datacr):
-        """List the content of a directory."""
-        class false_node(object):
-            write_date = 0.0
-            create_date = 0.0
-            unixperms = 040550
-            content_length = 0L
-            uuser = 'root'
-            ugroup = 'root'
-            type = 'database'
-
-            def __init__(self, db):
-                self.path = db
-
-        if datacr[1] is None:
-            result = []
-            for db in self.db_list():
-                try:
-                    result.append(false_node(db))
-                except osv.except_osv:
-                    pass
-            return result
-        cr, node, rem = datacr
-        res = node.children(cr)
-        return res
-
-    def rmdir(self, datacr):
-        """Remove the specified directory."""
-        cr, node, rem = datacr
-        assert node
-        node.rmcol(cr)
-        cr.commit()
-
-    def remove(self, datacr):
-        assert datacr[1]
-        if datacr[1].type == 'collection':
-            return self.rmdir(datacr)
-        elif datacr[1].type == 'file':
-            return self.rmfile(datacr)
-        raise OSError(1, 'Operation is not permitted.')
-
-    def rmfile(self, datacr):
-        """Remove the specified file."""
-        assert datacr[1]
-        cr = datacr[0]
-        datacr[1].rm(cr)
-        cr.commit()
-
-    def rename(self, src, datacr):
-        """ Renaming operation, the effect depends on the src:
-            * A file: read, create and remove
-            * A directory: change the parent and reassign children to ressource
-        """
-        cr = datacr[0]
-        try:
-            nname = _to_unicode(datacr[2])
-            ret = src.move_to(cr, datacr[1], new_name=nname)
-            # API shouldn't wait for us to write the object
-            assert (ret is True) or (ret is False)
-            cr.commit()
-        except EnvironmentError:
-            raise
-        except Exception:
-            self._log.exception('Cannot rename "%s" to "%s" at "%s".', src, datacr[2], datacr[1])
-            raise OSError(1,'Operation is not permitted.')
-
-    def stat(self, node):
-        raise NotImplementedError()
-
-    # --- Wrapper methods around os.path.*
-
-    # Ok
-    def isfile(self, node):
-        if node and (node.type in ('file','content')):
-            return True
-        return False
-
-    # Ok
-    def islink(self, path):
-        """Return True if path is a symbolic link."""
-        return False
-
-    def isdir(self, node):
-        """Return True if path is a directory."""
-        if node is None:
-            return True
-        if node and (node.type in ('collection','database')):
-            return True
-        return False
-
-    def getsize(self, datacr):
-        """Return the size of the specified file in bytes."""
-        if not (datacr and datacr[1]):
-            raise IOError(errno.ENOENT, "No such file or directory.")
-        if datacr[1].type in ('file', 'content'):
-            return datacr[1].get_data_len(datacr[0]) or 0L
-        return 0L
-
-    # Ok
-    def getmtime(self, datacr):
-        """Return the last modified time as a number of seconds since
-        the epoch."""
-
-        node = datacr[1]
-        if node.write_date or node.create_date:
-            dt = (node.write_date or node.create_date)[:19]
-            result = time.mktime(time.strptime(dt, '%Y-%m-%d %H:%M:%S'))
-        else:
-            result = time.mktime(time.localtime())
-        return result
-
-    # Ok
-    def realpath(self, path):
-        """Return the canonical version of path eliminating any
-        symbolic links encountered in the path (if they are
-        supported by the operating system).
-        """
-        return path
-
-    # Ok
-    def lexists(self, path):
-        """Return True if path refers to an existing path, including
-        a broken or circular symbolic link.
-        """
-        raise DeprecationWarning()
-        return path and True or False
-
-    exists = lexists
-
-    # Ok, can be improved
-    def glob1(self, dirname, pattern):
-        """Return a list of files matching a dirname pattern
-        non-recursively.
-
-        Unlike glob.glob1 raises exception if os.listdir() fails.
-        """
-        names = self.listdir(dirname)
-        if pattern[0] != '.':
-            names = filter(lambda x: x.path[0] != '.', names)
-        return fnmatch.filter(names, pattern)
-
-    # --- Listing utilities
-
-    # note: the following operations are no more blocking
-
-    def get_list_dir(self, datacr):
-        """"Return an iterator object that yields a directory listing
-        in a form suitable for LIST command.
-        """
-        if not datacr:
-            return None
-        elif self.isdir(datacr[1]):
-            listing = self.listdir(datacr)
-            return self.format_list(datacr[0], datacr[1], listing)
-        # if path is a file or a symlink we return information about it
-        elif self.isfile(datacr[1]):
-            par = datacr[1].parent
-            return self.format_list(datacr[0], par, [datacr[1]])
-
-    def get_stat_dir(self, rawline, datacr):
-        """Return an iterator object that yields a list of files
-        matching a dirname pattern non-recursively in a form
-        suitable for STAT command.
-
-         - (str) rawline: the raw string passed by client as command
-         argument.
-        """
-        ftppath = self.ftpnorm(rawline)
-        if not glob.has_magic(ftppath):
-            return self.get_list_dir(self.ftp2fs(rawline, datacr))
-        else:
-            basedir, basename = os.path.split(ftppath)
-            if glob.has_magic(basedir):
-                return iter(['Directory recursion not supported.\r\n'])
-            else:
-                basedir = self.ftp2fs(basedir, datacr)
-                listing = self.glob1(basedir, basename)
-                if listing:
-                    listing.sort()
-                return self.format_list(basedir, listing)
-
-    def format_list(self, cr, parent_node, listing, ignore_err=True):
-        """Return an iterator object that yields the entries of given
-        directory emulating the "/bin/ls -lA" UNIX command output.
-
-         - (str) basedir: the parent directory node. Can be None
-         - (list) listing: a list of nodes
-         - (bool) ignore_err: when False raise exception if os.lstat()
-         call fails.
-
-        On platforms which do not support the pwd and grp modules (such
-        as Windows), ownership is printed as "owner" and "group" as a
-        default, and number of hard links is always "1". On UNIX
-        systems, the actual owner, group, and number of links are
-        printed.
-
-        This is how output appears to client:
-
-        -rw-rw-rw-   1 owner   group    7045120 Sep 02  3:47 music.mp3
-        drwxrwxrwx   1 owner   group          0 Aug 31 18:50 e-books
-        -rw-rw-rw-   1 owner   group        380 Sep 02  3:40 module.py
-        """
-        for node in listing:
-            perms = filemode(node.unixperms)  # permissions
-            nlinks = 1
-            size = node.content_length or 0L
-            uname = _to_decode(node.uuser)
-            gname = _to_decode(node.ugroup)
-            # stat.st_mtime could fail (-1) if last mtime is too old
-            # in which case we return the local time as last mtime
-            try:
-                st_mtime = node.write_date or 0.0
-                if isinstance(st_mtime, basestring):
-                    st_mtime = time.strptime(st_mtime, '%Y-%m-%d %H:%M:%S')
-                elif isinstance(st_mtime, float):
-                    st_mtime = time.localtime(st_mtime)
-                mname=_get_month_name(time.strftime("%m", st_mtime ))
-                mtime = mname+' '+time.strftime("%d %H:%M", st_mtime)
-            except ValueError:
-                mname=_get_month_name(time.strftime("%m"))
-                mtime = mname+' '+time.strftime("%d %H:%M")
-            fpath = node.path
-            if isinstance(fpath, (list, tuple)):
-                fpath = fpath[-1]
-            # formatting is matched with proftpd ls output
-            path=_to_decode(fpath)
-            yield "%s %3s %-8s %-8s %8s %s %s\r\n" %(perms, nlinks, uname, gname,
-                                                     size, mtime, path)
-
-    # Ok
-    def format_mlsx(self, cr, basedir, listing, perms, facts, ignore_err=True):
-        """Return an iterator object that yields the entries of a given
-        directory or of a single file in a form suitable with MLSD and
-        MLST commands.
-
-        Every entry includes a list of "facts" referring the listed
-        element.  See RFC-3659, chapter 7, to see what every single
-        fact stands for.
-
-         - (str) basedir: the absolute dirname.
-         - (list) listing: the names of the entries in basedir
-         - (str) perms: the string referencing the user permissions.
-         - (str) facts: the list of "facts" to be returned.
-         - (bool) ignore_err: when False raise exception if os.stat()
-         call fails.
-
-        Note that "facts" returned may change depending on the platform
-        and on what user specified by using the OPTS command.
-
-        This is how output could appear to the client issuing
-        a MLSD request:
-
-        type=file;size=156;perm=r;modify=20071029155301;unique=801cd2; music.mp3
-        type=dir;size=0;perm=el;modify=20071127230206;unique=801e33; ebooks
-        type=file;size=211;perm=r;modify=20071103093626;unique=801e32; module.py
-        """
-        permdir = ''.join([x for x in perms if x not in 'arw'])
-        permfile = ''.join([x for x in perms if x not in 'celmp'])
-        if ('w' in perms) or ('a' in perms) or ('f' in perms):
-            permdir += 'c'
-        if 'd' in perms:
-            permdir += 'p'
-        type = size = perm = modify = create = unique = mode = uid = gid = ""
-        for node in listing:
-            # type + perm
-            if self.isdir(node):
-                if 'type' in facts:
-                    type = 'type=dir;'
-                if 'perm' in facts:
-                    perm = 'perm=%s;' %permdir
-            else:
-                if 'type' in facts:
-                    type = 'type=file;'
-                if 'perm' in facts:
-                    perm = 'perm=%s;' %permfile
-            if 'size' in facts:
-                size = 'size=%s;' % (node.content_length or 0L)
-            # last modification time
-            if 'modify' in facts:
-                try:
-                    st_mtime = node.write_date or 0.0
-                    if isinstance(st_mtime, basestring):
-                        st_mtime = time.strptime(st_mtime, '%Y-%m-%d %H:%M:%S')
-                    elif isinstance(st_mtime, float):
-                        st_mtime = time.localtime(st_mtime)
-                    modify = 'modify=%s;' %time.strftime("%Y%m%d%H%M%S", st_mtime)
-                except ValueError:
-                    # stat.st_mtime could fail (-1) if last mtime is too old
-                    modify = ""
-            if 'create' in facts:
-                # on Windows we can provide also the creation time
-                try:
-                    st_ctime = node.create_date or 0.0
-                    if isinstance(st_ctime, basestring):
-                        st_ctime = time.strptime(st_ctime, '%Y-%m-%d %H:%M:%S')
-                    elif isinstance(st_mtime, float):
-                        st_ctime = time.localtime(st_ctime)
-                    create = 'create=%s;' %time.strftime("%Y%m%d%H%M%S",st_ctime)
-                except ValueError:
-                    create = ""
-            # UNIX only
-            if 'unix.mode' in facts:
-                mode = 'unix.mode=%s;' %oct(node.unixperms & 0777)
-            if 'unix.uid' in facts:
-                uid = 'unix.uid=%s;' % _to_decode(node.uuser)
-            if 'unix.gid' in facts:
-                gid = 'unix.gid=%s;' % _to_decode(node.ugroup)
-            # We provide unique fact (see RFC-3659, chapter 7.5.2) on
-            # posix platforms only; we get it by mixing st_dev and
-            # st_ino values which should be enough for granting an
-            # uniqueness for the file listed.
-            # The same approach is used by pure-ftpd.
-            # Implementors who want to provide unique fact on other
-            # platforms should use some platform-specific method (e.g.
-            # on Windows NTFS filesystems MTF records could be used).
-            # if 'unique' in facts: todo
-            #    unique = "unique=%x%x;" %(st.st_dev, st.st_ino)
-            path = node.path
-            if isinstance (path, (list, tuple)):
-                path = path[-1]
-            path=_to_decode(path)
-            yield "%s%s%s%s%s%s%s%s%s %s\r\n" %(type, size, perm, modify, create,
-                                                mode, uid, gid, unique, path)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/document_ftp/ftpserver/authorizer.py b/addons/document_ftp/ftpserver/authorizer.py
deleted file mode 100644
index e863eeb39ec..00000000000
--- a/addons/document_ftp/ftpserver/authorizer.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-class authorizer:
-    read_perms = "elr"
-    write_perms = "adfmw"
-
-    def __init__(self):
-        self.password = ''
-
-    def validate_authentication(self, username, password):
-        """Return True if the supplied username and password match the
-        stored credentials."""
-        self.password = password
-        return True
-
-    def impersonate_user(self, username, password):
-        """Impersonate another user (noop).
-
-        It is always called before accessing the filesystem.
-        By default it does nothing.  The subclass overriding this
-        method is expected to provide a mechanism to change the
-        current user.
-        """
-
-    def terminate_impersonation(self):
-        """Terminate impersonation (noop).
-
-        It is always called after having accessed the filesystem.
-        By default it does nothing.  The subclass overriding this
-        method is expected to provide a mechanism to switch back
-        to the original user.
-        """
-
-    def has_user(self, username):
-        """Whether the username exists in the virtual users table."""
-        if username=='anonymous':
-            return False
-        return True
-
-    def has_perm(self, username, perm, path=None):
-        """Whether the user has permission over path (an absolute
-        pathname of a file or a directory).
-
-        Expected perm argument is one of the following letters:
-        "elradfmw".
-        """
-        paths = path.split('/')
-        if not len(paths)>2:
-            return True
-        db_name = paths[1]
-        res = security.login(db_name, username, self.password)
-        return bool(res)
-
-    def get_perms(self, username):
-        """Return current user permissions."""
-        return 'elr'
-
-    def get_home_dir(self, username):
-        """Return the user's home directory."""
-        return '/'
-
-    def get_msg_login(self, username):
-        """Return the user's login message."""
-        return 'Welcome on OpenERP document management system.'
-
-    def get_msg_quit(self, username):
-        """Return the user's quitting message."""
-        return 'Bye.'
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py
deleted file mode 100755
index 1e8b8d88468..00000000000
--- a/addons/document_ftp/ftpserver/ftpserver.py
+++ /dev/null
@@ -1,3047 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-# ftpserver.py
-#
-#  pyftpdlib is released under the MIT license, reproduced below:
-#  ======================================================================
-#  Copyright (C) 2007 Giampaolo Rodola' <g.rodola@gmail.com>
-#  Hacked by Fabien Pinckaers (C) 2008 <fp@openerp.com>
-#
-#                         All Rights Reserved
-#
-#  Permission to use, copy, modify, and distribute this software and
-#  its documentation for any purpose and without fee is hereby
-#  granted, provided that the above copyright notice appear in all
-#  copies and that both that copyright notice and this permission
-#  notice appear in supporting documentation, and that the name of
-#  Giampaolo Rodola' not be used in advertising or publicity pertaining to
-#  distribution of the software without specific, written prior
-#  permission.
-#
-#  Giampaolo Rodola' DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-#  NO EVENT Giampaolo Rodola' BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-#  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-#  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-#  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#  ======================================================================
-
-
-"""pyftpdlib: RFC-959 asynchronous FTP server.
-
-pyftpdlib implements a fully functioning asynchronous FTP server as
-defined in RFC-959.  A hierarchy of classes outlined below implement
-the backend functionality for the FTPd:
-
-    [FTPServer] - the base class for the backend.
-
-    [FTPHandler] - a class representing the server-protocol-interpreter
-    (server-PI, see RFC-959). Each time a new connection occurs
-    FTPServer will create a new FTPHandler instance to handle the
-    current PI session.
-
-    [ActiveDTP], [PassiveDTP] - base classes for active/passive-DTP
-    backends.
-
-    [DTPHandler] - this class handles processing of data transfer
-    operations (server-DTP, see RFC-959).
-
-    [DummyAuthorizer] - an "authorizer" is a class handling FTPd
-    authentications and permissions. It is used inside FTPHandler class
-    to verify user passwords, to get user's home directory and to get
-    permissions when a filesystem read/write occurs. "DummyAuthorizer"
-    is the base authorizer class providing a platform independent
-    interface for managing virtual users.
-
-    [AbstractedFS] - class used to interact with the file system,
-    providing a high level, cross-platform interface compatible
-    with both Windows and UNIX style filesystems.
-
-    [AuthorizerError] - base class for authorizers exceptions.
-
-
-pyftpdlib also provides 3 different logging streams through 3 functions
-which can be overridden to allow for custom logging.
-
-    [log] - the main logger that logs the most important messages for
-    the end user regarding the FTPd.
-
-    [logline] - this function is used to log commands and responses
-    passing through the control FTP channel.
-
-    [logerror] - log traceback outputs occurring in case of errors.
-
-
-Usage example:
-
->>> from pyftpdlib import ftpserver
->>> authorizer = ftpserver.DummyAuthorizer()
->>> authorizer.add_user('user', 'password', '/home/user', perm='elradfmw')
->>> authorizer.add_anonymous('/home/nobody')
->>> ftp_handler = ftpserver.FTPHandler
->>> ftp_handler.authorizer = authorizer
->>> address = ("127.0.0.1", 21)
->>> ftpd = ftpserver.FTPServer(address, ftp_handler)
->>> ftpd.serve_forever()
-Serving FTP on 127.0.0.1:21
-[]127.0.0.1:2503 connected.
-127.0.0.1:2503 ==> 220 Ready.
-127.0.0.1:2503 <== USER anonymous
-127.0.0.1:2503 ==> 331 Username ok, send password.
-127.0.0.1:2503 <== PASS ******
-127.0.0.1:2503 ==> 230 Login successful.
-[anonymous]@127.0.0.1:2503 User anonymous logged in.
-127.0.0.1:2503 <== TYPE A
-127.0.0.1:2503 ==> 200 Type set to: ASCII.
-127.0.0.1:2503 <== PASV
-127.0.0.1:2503 ==> 227 Entering passive mode (127,0,0,1,9,201).
-127.0.0.1:2503 <== LIST
-127.0.0.1:2503 ==> 150 File status okay. About to open data connection.
-[anonymous]@127.0.0.1:2503 OK LIST "/". Transfer starting.
-127.0.0.1:2503 ==> 226 Transfer complete.
-[anonymous]@127.0.0.1:2503 Transfer complete. 706 bytes transmitted.
-127.0.0.1:2503 <== QUIT
-127.0.0.1:2503 ==> 221 Goodbye.
-[anonymous]@127.0.0.1:2503 Disconnected.
-"""
-
-
-import asyncore
-import asynchat
-import socket
-import os
-import sys
-import traceback
-import errno
-import time
-import glob
-import fnmatch
-import tempfile
-import warnings
-import random
-import stat
-from collections import deque
-from tarfile import filemode
-
-LOG_ACTIVE = True
-
-__all__ = ['proto_cmds', 'Error', 'log', 'logline', 'logerror', 'DummyAuthorizer',
-           'FTPHandler', 'FTPServer', 'PassiveDTP', 'ActiveDTP', 'DTPHandler',
-           'FileProducer', 'IteratorProducer', 'BufferedIteratorProducer',
-           'AbstractedFS',]
-
-
-__pname__   = 'Python FTP server library (pyftpdlib)'
-__ver__     = '0.4.0'
-__date__    = '2008-05-16'
-__author__  = "Giampaolo Rodola' <g.rodola@gmail.com>"
-__web__     = 'http://code.google.com/p/pyftpdlib/'
-
-
-proto_cmds = {
-    'ABOR': 'Syntax: ABOR (abort transfer).',
-    'ALLO': 'Syntax: ALLO <SP> bytes (obsolete; allocate storage).',
-    'APPE': 'Syntax: APPE <SP> file-name (append data to an existent file).',
-    'CDUP': 'Syntax: CDUP (go to parent directory).',
-    'CWD' : 'Syntax: CWD <SP> dir-name (change current working directory).',
-    'DELE': 'Syntax: DELE <SP> file-name (delete file).',
-    'EPRT': 'Syntax: EPRT <SP> |proto|ip|port| (set server in extended active mode).',
-    'EPSV': 'Syntax: EPSV [<SP> proto/"ALL"] (set server in extended passive mode).',
-    'FEAT': 'Syntax: FEAT (list all new features supported).',
-    'HELP': 'Syntax: HELP [<SP> cmd] (show help).',
-    'LIST': 'Syntax: LIST [<SP> path-name] (list files).',
-    'MDTM': 'Syntax: MDTM <SP> file-name (get last modification time).',
-    'MLSD': 'Syntax: MLSD [<SP> dir-name] (list files in a machine-processable form)',
-    'MLST': 'Syntax: MLST [<SP> path-name] (show a path in a machine-processable form)',
-    'MODE': 'Syntax: MODE <SP> mode (obsolete; set data transfer mode).',
-    'MKD' : 'Syntax: MDK <SP> dir-name (create directory).',
-    'NLST': 'Syntax: NLST [<SP> path-name] (list files in a compact form).',
-    'NOOP': 'Syntax: NOOP (just do nothing).',
-    'OPTS': 'Syntax: OPTS <SP> ftp-command [<SP> option] (specify options for FTP commands)',
-    'PASS': 'Syntax: PASS <SP> user-name (set user password).',
-    'PASV': 'Syntax: PASV (set server in passive mode).',
-    'PORT': 'Syntax: PORT <sp> h1,h2,h3,h4,p1,p2 (set server in active mode).',
-    'PWD' : 'Syntax: PWD (get current working directory).',
-    'QUIT': 'Syntax: QUIT (quit current session).',
-    'REIN': 'Syntax: REIN (reinitialize / flush account).',
-    'REST': 'Syntax: REST <SP> marker (restart file position).',
-    'RETR': 'Syntax: RETR <SP> file-name (retrieve a file).',
-    'RMD' : 'Syntax: RMD <SP> dir-name (remove directory).',
-    'RNFR': 'Syntax: RNFR <SP> file-name (file renaming (source name)).',
-    'RNTO': 'Syntax: RNTO <SP> file-name (file renaming (destination name)).',
-    'SIZE': 'Syntax: HELP <SP> file-name (get file size).',
-    'STAT': 'Syntax: STAT [<SP> path name] (status information [list files]).',
-    'STOR': 'Syntax: STOR <SP> file-name (store a file).',
-    'STOU': 'Syntax: STOU [<SP> file-name] (store a file with a unique name).',
-    'STRU': 'Syntax: STRU <SP> type (obsolete; set file structure).',
-    'SYST': 'Syntax: SYST (get operating system type).',
-    'TYPE': 'Syntax: TYPE <SP> [A | I] (set transfer type).',
-    'USER': 'Syntax: USER <SP> user-name (set username).',
-    'XCUP': 'Syntax: XCUP (obsolete; go to parent directory).',
-    'XCWD': 'Syntax: XCWD <SP> dir-name (obsolete; change current directory).',
-    'XMKD': 'Syntax: XMDK <SP> dir-name (obsolete; create directory).',
-    'XPWD': 'Syntax: XPWD (obsolete; get current dir).',
-    'XRMD': 'Syntax: XRMD <SP> dir-name (obsolete; remove directory).',
-    }
-
-
-def _strerror(err):
-    """A wrap around os.strerror() which may be not available on all
-    platforms (e.g. pythonCE).
-
-     - (instance) err: an EnvironmentError or derived class instance.
-    """
-    if hasattr(os, 'strerror'):
-        return os.strerror(err.errno)
-    else:
-        return err.strerror
-
-def _to_unicode(s):
-    try:
-        return s.decode('utf-8')
-    except UnicodeError:
-        pass
-    try:
-        return s.decode('latin')
-    except UnicodeError:
-        pass
-    try:
-        return s.encode('ascii')
-    except UnicodeError:
-        return s
-
-def _to_decode(s):
-    try:
-        return s.encode('utf-8')
-    except UnicodeError:
-        pass
-    try:
-        return s.encode('latin')
-    except UnicodeError:
-        pass
-    try:
-        return s.decode('ascii')
-    except UnicodeError:
-        return s
-
-# --- library defined exceptions
-
-class Error(Exception):
-    """Base class for module exceptions."""
-
-class AuthorizerError(Error):
-    """Base class for authorizer exceptions."""
-
-
-# --- loggers
-
-def log(msg):
-    """Log messages intended for the end user."""
-    if LOG_ACTIVE:
-        print msg
-
-def logline(msg):
-    """Log commands and responses passing through the command channel."""
-    if LOG_ACTIVE:
-        print msg
-
-def logerror(msg):
-    """Log traceback outputs occurring in case of errors."""
-    sys.stderr.write(str(msg) + '\n')
-    sys.stderr.flush()
-
-
-# --- authorizers
-
-class DummyAuthorizer:
-    """Basic "dummy" authorizer class, suitable for subclassing to
-    create your own custom authorizers.
-
-    An "authorizer" is a class handling authentications and permissions
-    of the FTP server.  It is used inside FTPHandler class for verifying
-    user's password, getting users home directory, checking user
-    permissions when a file read/write event occurs and changing user
-    before accessing the filesystem.
-
-    DummyAuthorizer is the base authorizer, providing a platform
-    independent interface for managing "virtual" FTP users. System
-    dependent authorizers can by written by subclassing this base
-    class and overriding appropriate methods as necessary.
-    """
-
-    read_perms = "elr"
-    write_perms = "adfmw"
-
-    def __init__(self):
-        self.user_table = {}
-
-    def add_user(self, username, password, homedir, perm='elr',
-                    msg_login="Login successful.", msg_quit="Goodbye."):
-        """Add a user to the virtual users table.
-
-        AuthorizerError exceptions raised on error conditions such as
-        invalid permissions, missing home directory or duplicate usernames.
-
-        Optional perm argument is a string referencing the user's
-        permissions explained below:
-
-        Read permissions:
-         - "e" = change directory (CWD command)
-         - "l" = list files (LIST, NLST, MLSD commands)
-         - "r" = retrieve file from the server (RETR command)
-
-        Write permissions:
-         - "a" = append data to an existing file (APPE command)
-         - "d" = delete file or directory (DELE, RMD commands)
-         - "f" = rename file or directory (RNFR, RNTO commands)
-         - "m" = create directory (MKD command)
-         - "w" = store a file to the server (STOR, STOU commands)
-
-        Optional msg_login and msg_quit arguments can be specified to
-        provide customized response strings when user log-in and quit.
-        """
-        if self.has_user(username):
-            raise AuthorizerError('User "%s" already exists.' %username)
-        homedir = os.path.realpath(homedir)
-        if not os.path.isdir(homedir):
-            raise AuthorizerError('No such directory: "%s".' %homedir)
-        for p in perm:
-            if p not in 'elradfmw':
-                raise AuthorizerError('No such permission: "%s".' %p)
-        for p in perm:
-            if (p in self.write_perms) and (username == 'anonymous'):
-                warnings.warn("Write permissions are assigned to anonymous user.",
-                              RuntimeWarning)
-                break
-        dic = {'pwd': str(password),
-               'home': homedir,
-               'perm': perm,
-               'msg_login': str(msg_login),
-               'msg_quit': str(msg_quit)
-               }
-        self.user_table[username] = dic
-
-    def add_anonymous(self, homedir, **kwargs):
-        """Add an anonymous user to the virtual users table.
-
-        AuthorizerError exception raised on error conditions such as
-        invalid permissions, missing home directory, or duplicate
-        anonymous users.
-
-        The keyword arguments in kwargs are the same expected by
-        add_user method: "perm", "msg_login" and "msg_quit".
-
-        The optional "perm" keyword argument is a string defaulting to
-        "elr" referencing "read-only" anonymous user's permissions.
-
-        Using write permission values ("adfmw") results in a
-        RuntimeWarning.
-        """
-        DummyAuthorizer.add_user(self, 'anonymous', '', homedir, **kwargs)
-
-    def remove_user(self, username):
-        """Remove a user from the virtual users table."""
-        del self.user_table[username]
-
-    def validate_authentication(self, username, password):
-        """Return True if the supplied username and password match the
-        stored credentials."""
-        return self.user_table[username]['pwd'] == password
-
-    def impersonate_user(self, username, password):
-        """Impersonate another user (noop).
-
-        It is always called before accessing the filesystem.
-        By default it does nothing.  The subclass overriding this
-        method is expected to provide a mechanism to change the
-        current user.
-        """
-
-    def terminate_impersonation(self):
-        """Terminate impersonation (noop).
-
-        It is always called after having accessed the filesystem.
-        By default it does nothing.  The subclass overriding this
-        method is expected to provide a mechanism to switch back
-        to the original user.
-        """
-
-    def has_user(self, username):
-        """Whether the username exists in the virtual users table."""
-        return username in self.user_table
-
-    def has_perm(self, username, perm, path=None):
-        """Whether the user has permission over path (an absolute
-        pathname of a file or a directory).
-
-        Expected perm argument is one of the following letters:
-        "elradfmw".
-        """
-        return perm in self.user_table[username]['perm']
-
-    def get_perms(self, username):
-        """Return current user permissions."""
-        return self.user_table[username]['perm']
-
-    def get_home_dir(self, username):
-        """Return the user's home directory."""
-        return self.user_table[username]['home']
-
-    def get_msg_login(self, username):
-        """Return the user's login message."""
-        return self.user_table[username]['msg_login']
-
-    def get_msg_quit(self, username):
-        """Return the user's quitting message."""
-        return self.user_table[username]['msg_quit']
-
-
-# --- DTP classes
-
-class PassiveDTP(asyncore.dispatcher):
-    """This class is an asyncore.disptacher subclass.  It creates a
-    socket listening on a local port, dispatching the resultant
-    connection to DTPHandler.
-    """
-
-    def __init__(self, cmd_channel, extmode=False):
-        """Initialize the passive data server.
-
-         - (instance) cmd_channel: the command channel class instance.
-         - (bool) extmode: wheter use extended passive mode response type.
-        """
-        asyncore.dispatcher.__init__(self)
-        self.cmd_channel = cmd_channel
-
-        ip = self.cmd_channel.getsockname()[0]
-        self.create_socket(self.cmd_channel.af, socket.SOCK_STREAM)
-
-        if not self.cmd_channel.passive_ports:
-        # By using 0 as port number value we let kernel choose a free
-        # unprivileged random port.
-            self.bind((ip, 0))
-        else:
-            ports = list(self.cmd_channel.passive_ports)
-            while ports:
-                port = ports.pop(random.randint(0, len(ports) -1))
-                try:
-                    self.bind((ip, port))
-                except socket.error, why:
-                    if why[0] == errno.EADDRINUSE:  # port already in use
-                        if ports:
-                            continue
-                        # If cannot use one of the ports in the configured
-                        # range we'll use a kernel-assigned port, and log
-                        # a message reporting the issue.
-                        # By using 0 as port number value we let kernel
-                        # choose a free unprivileged random port.
-                        else:
-                            self.bind((ip, 0))
-                            self.cmd_channel.log(
-                                "Can't find a valid passive port in the "
-                                "configured range. A random kernel-assigned "
-                                "port will be used."
-                                )
-                    else:
-                        raise
-                else:
-                    break
-        self.listen(5)
-        port = self.socket.getsockname()[1]
-        if not extmode:
-            if self.cmd_channel.masquerade_address:
-                ip = self.cmd_channel.masquerade_address
-            # The format of 227 response in not standardized.
-            # This is the most expected:
-            self.cmd_channel.respond('227 Entering passive mode (%s,%d,%d).' %(
-                    ip.replace('.', ','), port / 256, port % 256))
-        else:
-            self.cmd_channel.respond('229 Entering extended passive mode '
-                                     '(|||%d|).' %port)
-
-    # --- connection / overridden
-
-    def handle_accept(self):
-        """Called when remote client initiates a connection."""
-        sock, addr = self.accept()
-
-        # Check the origin of data connection.  If not expressively
-        # configured we drop the incoming data connection if remote
-        # IP address does not match the client's IP address.
-        if (self.cmd_channel.remote_ip != addr[0]):
-            if not self.cmd_channel.permit_foreign_addresses:
-                try:
-                    sock.close()
-                except socket.error:
-                    pass
-                msg = 'Rejected data connection from foreign address %s:%s.' \
-                        %(addr[0], addr[1])
-                self.cmd_channel.respond("425 %s" %msg)
-                self.cmd_channel.log(msg)
-                # do not close listening socket: it couldn't be client's blame
-                return
-            else:
-                # site-to-site FTP allowed
-                msg = 'Established data connection with foreign address %s:%s.'\
-                        %(addr[0], addr[1])
-                self.cmd_channel.log(msg)
-        # Immediately close the current channel (we accept only one
-        # connection at time) and avoid running out of max connections
-        # limit.
-        self.close()
-        # delegate such connection to DTP handler
-        handler = self.cmd_channel.dtp_handler(sock, self.cmd_channel)
-        self.cmd_channel.data_channel = handler
-        self.cmd_channel.on_dtp_connection()
-
-    def writable(self):
-        return 0
-
-    def handle_error(self):
-        """Called to handle any uncaught exceptions."""
-        try:
-            raise
-        except (KeyboardInterrupt, SystemExit, asyncore.ExitNow):
-            raise
-        logerror(traceback.format_exc())
-        self.close()
-
-    def handle_close(self):
-        """Called on closing the data connection."""
-        self.close()
-
-
-class ActiveDTP(asyncore.dispatcher):
-    """This class is an asyncore.disptacher subclass. It creates a
-    socket resulting from the connection to a remote user-port,
-    dispatching it to DTPHandler.
-    """
-
-    def __init__(self, ip, port, cmd_channel):
-        """Initialize the active data channel attemping to connect
-        to remote data socket.
-
-         - (str) ip: the remote IP address.
-         - (int) port: the remote port.
-         - (instance) cmd_channel: the command channel class instance.
-        """
-        asyncore.dispatcher.__init__(self)
-        self.cmd_channel = cmd_channel
-        self.create_socket(self.cmd_channel.af, socket.SOCK_STREAM)
-        try:
-            self.connect((ip, port))
-        except socket.gaierror:
-            self.cmd_channel.respond("425 Cannot connect to specified address.")
-            self.close()
-
-    # --- connection / overridden
-
-    def handle_write(self):
-        """NOOP, must be overridden to prevent unhandled write event."""
-
-    def handle_connect(self):
-        """Called when connection is established."""
-        self.cmd_channel.respond('200 Active data connection has been established.')
-        # delegate such connection to DTP handler
-        handler = self.cmd_channel.dtp_handler(self.socket, self.cmd_channel)
-        self.cmd_channel.data_channel = handler
-        self.cmd_channel.on_dtp_connection()
-
-    def handle_expt(self):
-        self.cmd_channel.respond("425 Cannot connect to specified address.")
-        self.close()
-
-    def handle_error(self):
-        """Called to handle any uncaught exceptions."""
-        try:
-            raise
-        except (KeyboardInterrupt, SystemExit, asyncore.ExitNow):
-            raise
-        except socket.error:
-            pass
-        except:
-            logerror(traceback.format_exc())
-        self.cmd_channel.respond("425 Cannot connect to specified address.")
-        self.close()
-
-class DTPHandler(asyncore.dispatcher):
-    """Class handling server-data-transfer-process (server-DTP, see
-    RFC-959) managing data-transfer operations involving sending
-    and receiving data.
-
-    Instance attributes defined in this class, initialized when
-    channel is opened:
-
-     - (instance) cmd_channel: the command channel class instance.
-     - (file) file_obj: the file transferred (if any).
-     - (bool) receive: True if channel is used for receiving data.
-     - (bool) transfer_finished: True if transfer completed successfully.
-     - (int) tot_bytes_sent: the total bytes sent.
-     - (int) tot_bytes_received: the total bytes received.
-
-    DTPHandler implementation note:
-
-    When a producer is consumed and close_when_done() has been called
-    previously, refill_buffer() erroneously calls close() instead of
-    handle_close() - (see: http://bugs.python.org/issue1740572)
-
-    To avoid this problem DTPHandler is implemented as a subclass of
-    asyncore.dispatcher instead of asynchat.async_chat.
-    This implementation follows the same approach that asynchat module
-    should use in Python 2.6.
-
-    The most important change in the implementation is related to
-    producer_fifo, which is a pure deque object instead of a
-    producer_fifo instance.
-
-    Since we don't want to break backward compatibily with older python
-    versions (deque has been introduced in Python 2.4), if deque is not
-    available we use a list instead.
-    """
-
-    ac_in_buffer_size = 8192
-    ac_out_buffer_size  = 8192
-
-    def __init__(self, sock_obj, cmd_channel):
-        """Initialize the command channel.
-
-         - (instance) sock_obj: the socket object instance of the newly
-            established connection.
-         - (instance) cmd_channel: the command channel class instance.
-        """
-        asyncore.dispatcher.__init__(self, sock_obj)
-        # we toss the use of the asynchat's "simple producer" and
-        # replace it  with a pure deque, which the original fifo
-        # was a wrapping of
-        self.producer_fifo = deque()
-
-        self.cmd_channel = cmd_channel
-        self.file_obj = None
-        self.receive = False
-        self.transfer_finished = False
-        self.tot_bytes_sent = 0
-        self.tot_bytes_received = 0
-        self.data_wrapper = lambda x: x
-
-    # --- utility methods
-
-    def enable_receiving(self, type):
-        """Enable receiving of data over the channel. Depending on the
-        TYPE currently in use it creates an appropriate wrapper for the
-        incoming data.
-
-         - (str) type: current transfer type, 'a' (ASCII) or 'i' (binary).
-        """
-        if type == 'a':
-            self.data_wrapper = lambda x: x.replace('\r\n', os.linesep)
-        elif type == 'i':
-            self.data_wrapper = lambda x: x
-        else:
-            raise TypeError, "Unsupported type."
-        self.receive = True
-
-    def get_transmitted_bytes(self):
-        "Return the number of transmitted bytes."
-        return self.tot_bytes_sent + self.tot_bytes_received
-
-    def transfer_in_progress(self):
-        "Return True if a transfer is in progress, else False."
-        return self.get_transmitted_bytes() != 0
-
-    # --- connection
-
-    def handle_read(self):
-        """Called when there is data waiting to be read."""
-        try:
-            chunk = self.recv(self.ac_in_buffer_size)
-        except socket.error:
-            self.handle_error()
-        else:
-            self.tot_bytes_received += len(chunk)
-            if not chunk:
-                self.transfer_finished = True
-                #self.close()  # <-- asyncore.recv() already do that...
-                return
-            # while we're writing on the file an exception could occur
-            # in case  that filesystem gets full;  if this happens we
-            # let handle_error() method handle this exception, providing
-            # a detailed error message.
-            self.file_obj.write(self.data_wrapper(chunk))
-
-    def handle_write(self):
-        """Called when data is ready to be written, initiates send."""
-        self.initiate_send()
-
-    def push(self, data):
-        """Push data onto the deque and initiate send."""
-        sabs = self.ac_out_buffer_size
-        if len(data) > sabs:
-            for i in xrange(0, len(data), sabs):
-                self.producer_fifo.append(data[i:i+sabs])
-        else:
-            self.producer_fifo.append(data)
-        self.initiate_send()
-
-    def push_with_producer(self, producer):
-        """Push data using a producer and initiate send."""
-        self.producer_fifo.append(producer)
-        self.initiate_send()
-
-    def readable(self):
-        """Predicate for inclusion in the readable for select()."""
-        return self.receive
-
-    def writable(self):
-        """Predicate for inclusion in the writable for select()."""
-        return self.producer_fifo or (not self.connected)
-
-    def close_when_done(self):
-        """Automatically close this channel once the outgoing queue is empty."""
-        self.producer_fifo.append(None)
-
-    def initiate_send(self):
-        """Attempt to send data in fifo order."""
-        while self.producer_fifo and self.connected:
-            first = self.producer_fifo[0]
-            # handle empty string/buffer or None entry
-            if not first:
-                del self.producer_fifo[0]
-                if first is None:
-                    self.transfer_finished = True
-                    self.handle_close()
-                    return
-
-            # handle classic producer behavior
-            obs = self.ac_out_buffer_size
-            try:
-                data = buffer(first, 0, obs)
-            except TypeError:
-                data = first.more()
-                if data:
-                    self.producer_fifo.appendleft(data)
-                else:
-                    del self.producer_fifo[0]
-                continue
-
-            # send the data
-            try:
-                num_sent = self.send(data)
-            except socket.error:
-                self.handle_error()
-                return
-
-            if num_sent:
-                self.tot_bytes_sent += num_sent
-                if num_sent < len(data) or obs < len(first):
-                    self.producer_fifo[0] = first[num_sent:]
-                else:
-                    del self.producer_fifo[0]
-            # we tried to send some actual data
-            return
-
-    def handle_expt(self):
-        """Called on "exceptional" data events."""
-        self.cmd_channel.respond("426 Connection error; transfer aborted.")
-        self.close()
-
-    def handle_error(self):
-        """Called when an exception is raised and not otherwise handled."""
-        try:
-            raise
-        except (KeyboardInterrupt, SystemExit, asyncore.ExitNow):
-            raise
-        except socket.error, err:
-            # fix around asyncore bug (http://bugs.python.org/issue1736101)
-            if err[0] in (errno.ECONNRESET, errno.ENOTCONN, errno.ESHUTDOWN, \
-                          errno.ECONNABORTED):
-                self.handle_close()
-                return
-            else:
-                error = str(err[1])
-        # an error could occur in case we fail reading / writing
-        # from / to file (e.g. file system gets full)
-        except EnvironmentError, err:
-            error = _strerror(err)
-        except:
-            # some other exception occurred;  we don't want to provide
-            # confidential error messages
-            logerror(traceback.format_exc())
-            error = "Internal error."
-        self.cmd_channel.respond("426 %s; transfer aborted." %error)
-        self.close()
-
-    def handle_close(self):
-        """Called when the socket is closed."""
-        # If we used channel for receiving we assume that transfer is
-        # finished when client close connection , if we used channel
-        # for sending we have to check that all data has been sent
-        # (responding with 226) or not (responding with 426).
-        if self.receive:
-            self.transfer_finished = True
-            action = 'received'
-        else:
-            action = 'sent'
-        if self.transfer_finished:
-            self.cmd_channel.respond("226 Transfer complete.")
-            if self.file_obj:
-                fname = self.file_obj.name
-                self.cmd_channel.log('"%s" %s.' %(fname, action))
-        else:
-            tot_bytes = self.get_transmitted_bytes()
-            msg = "Transfer aborted; %d bytes transmitted." %tot_bytes
-            self.cmd_channel.respond("426 " + msg)
-            self.cmd_channel.log(msg)
-        self.close()
-
-    def close(self):
-        """Close the data channel, first attempting to close any remaining
-        file handles."""
-        if self.file_obj and not self.file_obj.closed:
-            self.file_obj.close()
-        asyncore.dispatcher.close(self)
-        self.cmd_channel.on_dtp_close()
-
-
-# --- producers
-
-class FileProducer:
-    """Producer wrapper for file[-like] objects."""
-
-    buffer_size = 65536
-
-    def __init__(self, file, type):
-        """Initialize the producer with a data_wrapper appropriate to TYPE.
-
-         - (file) file: the file[-like] object.
-         - (str) type: the current TYPE, 'a' (ASCII) or 'i' (binary).
-        """
-        self.done = False
-        self.file = file
-        if type == 'a':
-            self.data_wrapper = lambda x: x.replace(os.linesep, '\r\n')
-        elif type == 'i':
-            self.data_wrapper = lambda x: x
-        else:
-            raise TypeError, "Unsupported type."
-
-    def more(self):
-        """Attempt a chunk of data of size self.buffer_size."""
-        if self.done:
-            return ''
-        data = self.data_wrapper(self.file.read(self.buffer_size))
-        if not data:
-            self.done = True
-            if not self.file.closed:
-                self.file.close()
-        return data
-
-
-class IteratorProducer:
-    """Producer for iterator objects."""
-
-    def __init__(self, iterator):
-        self.iterator = iterator
-
-    def more(self):
-        """Attempt a chunk of data from iterator by calling its next()
-        method.
-        """
-        try:
-            return self.iterator.next()
-        except StopIteration:
-            return ''
-
-
-class BufferedIteratorProducer:
-    """Producer for iterator objects with buffer capabilities."""
-    # how many times iterator.next() will be called before
-    # returning some data
-    loops = 20
-
-    def __init__(self, iterator):
-        self.iterator = iterator
-
-    def more(self):
-        """Attempt a chunk of data from iterator by calling
-        its next() method different times.
-        """
-        buffer = []
-        for x in xrange(self.loops):
-            try:
-                buffer.append(self.iterator.next())
-            except StopIteration:
-                break
-        return ''.join(buffer)
-
-
-# --- filesystem
-
-class AbstractedFS:
-    """A class used to interact with the file system, providing a high
-    level, cross-platform interface compatible with both Windows and
-    UNIX style filesystems.
-
-    It provides some utility methods and some wraps around operations
-    involved in file creation and file system operations like moving
-    files or removing directories.
-
-    Instance attributes:
-     - (str) root: the user home directory.
-     - (str) cwd: the current working directory.
-     - (str) rnfr: source file to be renamed.
-    """
-
-    def __init__(self):
-        self.root = None
-        self.cwd = '/'
-        self.rnfr = None
-
-    # --- Pathname / conversion utilities
-
-    def ftpnorm(self, ftppath):
-        """Normalize a "virtual" ftp pathname (tipically the raw string
-        coming from client) depending on the current working directory.
-
-        Example (having "/foo" as current working directory):
-        'x' -> '/foo/x'
-
-        Note: directory separators are system independent ("/").
-        Pathname returned is always absolutized.
-        """
-        if os.path.isabs(ftppath):
-            p = os.path.normpath(ftppath)
-        else:
-            p = os.path.normpath(os.path.join(self.cwd, ftppath))
-        # normalize string in a standard web-path notation having '/'
-        # as separator.
-        p = p.replace("\\", "/")
-        # os.path.normpath supports UNC paths (e.g. "//a/b/c") but we
-        # don't need them.  In case we get an UNC path we collapse
-        # redundant separators appearing at the beginning of the string
-        while p[:2] == '//':
-            p = p[1:]
-        # Anti path traversal: don't trust user input, in the event
-        # that self.cwd is not absolute, return "/" as a safety measure.
-        # This is for extra protection, maybe not really necessary.
-        if not os.path.isabs(p):
-            p = "/"
-        return p
-
-    def ftp2fs(self, ftppath):
-        """Translate a "virtual" ftp pathname (tipically the raw string
-        coming from client) into equivalent absolute "real" filesystem
-        pathname.
-
-        Example (having "/home/user" as root directory):
-        'x' -> '/home/user/x'
-
-        Note: directory separators are system dependent.
-        """
-        # as far as I know, it should always be path traversal safe...
-        if os.path.normpath(self.root) == os.sep:
-            return os.path.normpath(self.ftpnorm(ftppath))
-        else:
-            p = self.ftpnorm(ftppath)[1:]
-            return os.path.normpath(os.path.join(self.root, p))
-
-    def fs2ftp(self, fspath):
-        """Translate a "real" filesystem pathname into equivalent
-        absolute "virtual" ftp pathname depending on the user's
-        root directory.
-
-        Example (having "/home/user" as root directory):
-        '/home/user/x' -> '/x'
-
-        As for ftpnorm, directory separators are system independent
-        ("/") and pathname returned is always absolutized.
-
-        On invalid pathnames escaping from user's root directory
-        (e.g. "/home" when root is "/home/user") always return "/".
-        """
-        if os.path.isabs(fspath):
-            p = os.path.normpath(fspath)
-        else:
-            p = os.path.normpath(os.path.join(self.root, fspath))
-        if not self.validpath(p):
-            return '/'
-        p = p.replace(os.sep, "/")
-        p = p[len(self.root):]
-        if not p.startswith('/'):
-            p = '/' + p
-        return p
-
-    # alias for backward compatibility with 0.2.0
-    normalize = ftpnorm
-    translate = ftp2fs
-
-    def validpath(self, path):
-        """Check whether the path belongs to user's home directory.
-        Expected argument is a "real" filesystem pathname.
-
-        If path is a symbolic link it is resolved to check its real
-        destination.
-
-        Pathnames escaping from user's root directory are considered
-        not valid.
-        """
-        root = self.realpath(self.root)
-        path = self.realpath(path)
-        if not self.root.endswith(os.sep):
-            root = self.root + os.sep
-        if not path.endswith(os.sep):
-            path = path + os.sep
-        if path[0:len(root)] == root:
-            return True
-        return False
-
-    # --- Wrapper methods around open() and tempfile.mkstemp
-
-    def open(self, filename, mode):
-        """Open a file returning its handler."""
-        return open(filename, mode)
-
-    def mkstemp(self, suffix='', prefix='', dir=None, mode='wb'):
-        """A wrap around tempfile.mkstemp creating a file with a unique
-        name.  Unlike mkstemp it returns an object with a file-like
-        interface.
-        """
-        class FileWrapper:
-            def __init__(self, fd, name):
-                self.file = fd
-                self.name = name
-            def __getattr__(self, attr):
-                return getattr(self.file, attr)
-
-        text = not 'b' in mode
-        # max number of tries to find out a unique file name
-        tempfile.TMP_MAX = 50
-        fd, name = tempfile.mkstemp(suffix, prefix, dir, text=text)
-        file = os.fdopen(fd, mode)
-        return FileWrapper(file, name)
-
-    # --- Wrapper methods around os.*
-
-    def chdir(self, path):
-        """Change the current directory."""
-        # temporarily join the specified directory to see if we have
-        # permissions to do so
-        basedir = os.getcwd()
-        try:
-            os.chdir(path)
-        except os.error:
-            raise
-        else:
-            os.chdir(basedir)
-            self.cwd = self.fs2ftp(path)
-
-    def mkdir(self, path, basename):
-        """Create the specified directory."""
-        os.mkdir(os.path.join(path, basename))
-
-    def listdir(self, path):
-        """List the content of a directory."""
-        return os.listdir(path)
-
-    def rmdir(self, path):
-        """Remove the specified directory."""
-        os.rmdir(path)
-
-    def remove(self, path):
-        """Remove the specified file."""
-        os.remove(path)
-
-    def rename(self, src, dst):
-        """Rename the specified src file to the dst filename."""
-        os.rename(src, dst)
-
-    def stat(self, path):
-        """Perform a stat() system call on the given path."""
-        return os.stat(path)
-
-    def lstat(self, path):
-        """Like stat but does not follow symbolic links."""
-        return os.lstat(path)
-
-    if not hasattr(os, 'lstat'):
-        lstat = stat
-
-    # --- Wrapper methods around os.path.*
-
-    def isfile(self, path):
-        """Return True if path is a file."""
-        return os.path.isfile(path)
-
-    def islink(self, path):
-        """Return True if path is a symbolic link."""
-        return os.path.islink(path)
-
-    def isdir(self, path):
-        """Return True if path is a directory."""
-        return os.path.isdir(path)
-
-    def getsize(self, path):
-        """Return the size of the specified file in bytes."""
-        return os.path.getsize(path)
-
-    def getmtime(self, path):
-        """Return the last modified time as a number of seconds since
-        the epoch."""
-        return os.path.getmtime(path)
-
-    def realpath(self, path):
-        """Return the canonical version of path eliminating any
-        symbolic links encountered in the path (if they are
-        supported by the operating system).
-        """
-        return os.path.realpath(path)
-
-    def lexists(self, path):
-        """Return True if path refers to an existing path, including
-        a broken or circular symbolic link.
-        """
-        if hasattr(os.path, 'lexists'):
-            return os.path.lexists(path)
-        # grant backward compatibility with python 2.3
-        elif hasattr(os, 'lstat'):
-            try:
-                os.lstat(path)
-            except os.error:
-                return False
-            return True
-        # fallback
-        else:
-            return os.path.exists(path)
-
-    exists = lexists  # alias for backward compatibility with 0.2.0
-
-    def glob1(self, dirname, pattern):
-        """Return a list of files matching a dirname pattern
-        non-recursively.
-
-        Unlike glob.glob1 raises exception if os.listdir() fails.
-        """
-        names = self.listdir(dirname)
-        if pattern[0] != '.':
-            names = filter(lambda x: x[0] != '.', names)
-        return fnmatch.filter(names, pattern)
-
-    # --- Listing utilities
-
-    # note: the following operations are no more blocking
-
-    def get_list_dir(self, datacr):
-        """"Return an iterator object that yields a directory listing
-        in a form suitable for LIST command.
-        """
-        raise DeprecationWarning()
-
-    def get_stat_dir(self, rawline):
-        """Return an iterator object that yields a list of files
-        matching a dirname pattern non-recursively in a form
-        suitable for STAT command.
-
-         - (str) rawline: the raw string passed by client as command
-         argument.
-        """
-        ftppath = self.ftpnorm(rawline)
-        if not glob.has_magic(ftppath):
-            return self.get_list_dir(self.ftp2fs(rawline))
-        else:
-            basedir, basename = os.path.split(ftppath)
-            if glob.has_magic(basedir):
-                return iter(['Directory recursion not supported.\r\n'])
-            else:
-                basedir = self.ftp2fs(basedir)
-                listing = self.glob1(basedir, basename)
-                if listing:
-                    listing.sort()
-                return self.format_list(basedir, listing)
-
-    def format_list(self, basedir, listing, ignore_err=True):
-        """Return an iterator object that yields the entries of given
-        directory emulating the "/bin/ls -lA" UNIX command output.
-
-         - (str) basedir: the absolute dirname.
-         - (list) listing: the names of the entries in basedir
-         - (bool) ignore_err: when False raise exception if os.lstat()
-         call fails.
-
-        On platforms which do not support the pwd and grp modules (such
-        as Windows), ownership is printed as "owner" and "group" as a
-        default, and number of hard links is always "1". On UNIX
-        systems, the actual owner, group, and number of links are
-        printed.
-
-        This is how output appears to client:
-
-        -rw-rw-rw-   1 owner   group    7045120 Sep 02  3:47 music.mp3
-        drwxrwxrwx   1 owner   group          0 Aug 31 18:50 e-books
-        -rw-rw-rw-   1 owner   group        380 Sep 02  3:40 module.py
-        """
-        for basename in listing:
-            file = os.path.join(basedir, basename)
-            try:
-                st = self.lstat(file)
-            except os.error:
-                if ignore_err:
-                    continue
-                raise
-            perms = filemode(st.st_mode)  # permissions
-            nlinks = st.st_nlink  # number of links to inode
-            if not nlinks:  # non-posix system, let's use a bogus value
-                nlinks = 1
-            size = st.st_size  # file size
-            uname = st.st_uid or "owner"
-            gname = st.st_gid or "group"
-
-            # stat.st_mtime could fail (-1) if last mtime is too old
-            # in which case we return the local time as last mtime
-            try:
-                mtime = time.strftime("%b %d %H:%M", time.localtime(st.st_mtime))
-            except ValueError:
-                mtime = time.strftime("%b %d %H:%M")
-            # if the file is a symlink, resolve it, e.g. "symlink -> realfile"
-            if stat.S_ISLNK(st.st_mode):
-                basename = basename + " -> " + os.readlink(file)
-
-            # formatting is matched with proftpd ls output
-            yield "%s %3s %-8s %-8s %8s %s %s\r\n" %(perms, nlinks, uname, gname,
-                                                     size, mtime, basename)
-
-    def format_mlsx(self, basedir, listing, perms, facts, ignore_err=True):
-        """Return an iterator object that yields the entries of a given
-        directory or of a single file in a form suitable with MLSD and
-        MLST commands.
-
-        Every entry includes a list of "facts" referring the listed
-        element.  See RFC-3659, chapter 7, to see what every single
-        fact stands for.
-
-         - (str) basedir: the absolute dirname.
-         - (list) listing: the names of the entries in basedir
-         - (str) perms: the string referencing the user permissions.
-         - (str) facts: the list of "facts" to be returned.
-         - (bool) ignore_err: when False raise exception if os.stat()
-         call fails.
-
-        Note that "facts" returned may change depending on the platform
-        and on what user specified by using the OPTS command.
-
-        This is how output could appear to the client issuing
-        a MLSD request:
-
-        type=file;size=156;perm=r;modify=20071029155301;unique=801cd2; music.mp3
-        type=dir;size=0;perm=el;modify=20071127230206;unique=801e33; ebooks
-        type=file;size=211;perm=r;modify=20071103093626;unique=801e32; module.py
-        """
-        permdir = ''.join([x for x in perms if x not in 'arw'])
-        permfile = ''.join([x for x in perms if x not in 'celmp'])
-        if ('w' in perms) or ('a' in perms) or ('f' in perms):
-            permdir += 'c'
-        if 'd' in perms:
-            permdir += 'p'
-        type = size = perm = modify = create = unique = mode = uid = gid = ""
-        for basename in listing:
-            file = os.path.join(basedir, basename)
-            try:
-                st = self.stat(file)
-            except OSError:
-                if ignore_err:
-                    continue
-                raise
-            # type + perm
-            if stat.S_ISDIR(st.st_mode):
-                if 'type' in facts:
-                    if basename == '.':
-                        type = 'type=cdir;'
-                    elif basename == '..':
-                        type = 'type=pdir;'
-                    else:
-                        type = 'type=dir;'
-                if 'perm' in facts:
-                    perm = 'perm=%s;' %permdir
-            else:
-                if 'type' in facts:
-                    type = 'type=file;'
-                if 'perm' in facts:
-                    perm = 'perm=%s;' %permfile
-            if 'size' in facts:
-                size = 'size=%s;' %st.st_size  # file size
-            # last modification time
-            if 'modify' in facts:
-                try:
-                    modify = 'modify=%s;' %time.strftime("%Y%m%d%H%M%S",
-                                           time.localtime(st.st_mtime))
-                except ValueError:
-                    # stat.st_mtime could fail (-1) if last mtime is too old
-                    modify = ""
-            if 'create' in facts:
-                # on Windows we can provide also the creation time
-                try:
-                    create = 'create=%s;' %time.strftime("%Y%m%d%H%M%S",
-                                           time.localtime(st.st_ctime))
-                except ValueError:
-                    create = ""
-            # UNIX only
-            if 'unix.mode' in facts:
-                mode = 'unix.mode=%s;' %oct(st.st_mode & 0777)
-            if 'unix.uid' in facts:
-                uid = 'unix.uid=%s;' %st.st_uid
-            if 'unix.gid' in facts:
-                gid = 'unix.gid=%s;' %st.st_gid
-            # We provide unique fact (see RFC-3659, chapter 7.5.2) on
-            # posix platforms only; we get it by mixing st_dev and
-            # st_ino values which should be enough for granting an
-            # uniqueness for the file listed.
-            # The same approach is used by pure-ftpd.
-            # Implementors who want to provide unique fact on other
-            # platforms should use some platform-specific method (e.g.
-            # on Windows NTFS filesystems MTF records could be used).
-            if 'unique' in facts:
-                unique = "unique=%x%x;" %(st.st_dev, st.st_ino)
-
-            yield "%s%s%s%s%s%s%s%s%s %s\r\n" %(type, size, perm, modify, create,
-                                                mode, uid, gid, unique, basename)
-
-
-# --- FTP
-
-class FTPExceptionSent(Exception):
-    """An FTP exception that FTPHandler has processed
-    """
-    pass
-
-class FTPHandler(asynchat.async_chat):
-    """Implements the FTP server Protocol Interpreter (see RFC-959),
-    handling commands received from the client on the control channel.
-
-    All relevant session information is stored in class attributes
-    reproduced below and can be modified before instantiating this
-    class.
-
-     - (str) banner: the string sent when client connects.
-
-     - (int) max_login_attempts:
-        the maximum number of wrong authentications before disconnecting
-        the client (default 3).
-
-     - (bool)permit_foreign_addresses:
-        FTP site-to-site transfer feature: also referenced as "FXP" it
-        permits for transferring a file between two remote FTP servers
-        without the transfer going through the client's host (not
-        recommended for security reasons as described in RFC-2577).
-        Having this attribute set to False means that all data
-        connections from/to remote IP addresses which do not match the
-        client's IP address will be dropped (defualt False).
-
-     - (bool) permit_privileged_ports:
-        set to True if you want to permit active data connections (PORT)
-        over privileged ports (not recommended, defaulting to False).
-
-     - (str) masquerade_address:
-        the "masqueraded" IP address to provide along PASV reply when
-        pyftpdlib is running behind a NAT or other types of gateways.
-        When configured pyftpdlib will hide its local address and
-        instead use the public address of your NAT (default None).
-
-     - (list) passive_ports:
-        what ports ftpd will use for its passive data transfers.
-        Value expected is a list of integers (e.g. range(60000, 65535)).
-        When configured pyftpdlib will no longer use kernel-assigned
-        random ports (default None).
-
-
-    All relevant instance attributes initialized when client connects
-    are reproduced below.  You may be interested in them in case you
-    want to subclass the original FTPHandler.
-
-     - (bool) authenticated: True if client authenticated himself.
-     - (str) username: the name of the connected user (if any).
-     - (int) attempted_logins: number of currently attempted logins.
-     - (str) current_type: the current transfer type (default "a")
-     - (int) af: the address family (IPv4/IPv6)
-     - (instance) server: the FTPServer class instance.
-     - (instance) data_server: the data server instance (if any).
-     - (instance) data_channel: the data channel instance (if any).
-    """
-    # these are overridable defaults
-
-    # default classes
-    authorizer = DummyAuthorizer()
-    active_dtp = ActiveDTP
-    passive_dtp = PassiveDTP
-    dtp_handler = DTPHandler
-    abstracted_fs = AbstractedFS
-
-    # session attributes (explained in the docstring)
-    banner = "pyftpdlib %s ready." %__ver__
-    max_login_attempts = 3
-    permit_foreign_addresses = False
-    permit_privileged_ports = False
-    masquerade_address = None
-    passive_ports = None
-
-    def __init__(self, conn, server):
-        """Initialize the command channel.
-
-         - (instance) conn: the socket object instance of the newly
-            established connection.
-         - (instance) server: the ftp server class instance.
-        """
-        try:
-            asynchat.async_chat.__init__(self, conn=conn) # python2.5
-        except TypeError:
-            asynchat.async_chat.__init__(self, sock=conn) # python2.6
-        self.server = server
-        self.remote_ip, self.remote_port = self.socket.getpeername()[:2]
-        self.in_buffer = []
-        self.in_buffer_len = 0
-        self.set_terminator("\r\n")
-
-        # session attributes
-        self.fs = self.abstracted_fs()
-        self.authenticated = False
-        self.username = ""
-        self.password = ""
-        self.attempted_logins = 0
-        self.current_type = 'a'
-        self.restart_position = 0
-        self.quit_pending = False
-        self._epsvall = False
-        self.__in_dtp_queue = None
-        self.__out_dtp_queue = None
-
-        self.__errno_responses = {
-                errno.EPERM: 553,
-                errno.EINVAL: 504,
-                errno.ENOENT: 550,
-                errno.EREMOTE: 450,
-                errno.EEXIST: 521,
-                }
-
-        # mlsx facts attributes
-        self.current_facts = ['type', 'perm', 'size', 'modify']
-        self.current_facts.append('unique')
-        self.available_facts = self.current_facts[:]
-        self.available_facts += ['unix.mode', 'unix.uid', 'unix.gid']
-        self.available_facts.append('create')
-
-        # dtp attributes
-        self.data_server = None
-        self.data_channel = None
-
-        if hasattr(self.socket, 'family'):
-            self.af = self.socket.family
-        else:  # python < 2.5
-            ip, port = self.socket.getsockname()[:2]
-            self.af = socket.getaddrinfo(ip, port, socket.AF_UNSPEC,
-                                         socket.SOCK_STREAM)[0][0]
-
-    def handle(self):
-        """Return a 220 'Ready' response to the client over the command
-        channel.
-        """
-        if len(self.banner) <= 75:
-            self.respond("220 %s" %str(self.banner))
-        else:
-            self.push('220-%s\r\n' %str(self.banner))
-            self.respond('220 ')
-
-    def handle_max_cons(self):
-        """Called when limit for maximum number of connections is reached."""
-        msg = "Too many connections. Service temporary unavailable."
-        self.respond("421 %s" %msg)
-        self.log(msg)
-        # If self.push is used, data could not be sent immediately in
-        # which case a new "loop" will occur exposing us to the risk of
-        # accepting new connections.  Since this could cause asyncore to
-        # run out of fds (...and exposes the server to DoS attacks), we
-        # immediately close the channel by using close() instead of
-        # close_when_done(). If data has not been sent yet client will
-        # be silently disconnected.
-        self.close()
-
-    def handle_max_cons_per_ip(self):
-        """Called when too many clients are connected from the same IP."""
-        msg = "Too many connections from the same IP address."
-        self.respond("421 %s" %msg)
-        self.log(msg)
-        self.close_when_done()
-
-    # --- asyncore / asynchat overridden methods
-
-    def readable(self):
-        # if there's a quit pending we stop reading data from socket
-        return not self.quit_pending
-
-    def collect_incoming_data(self, data):
-        """Read incoming data and append to the input buffer."""
-        self.in_buffer.append(data)
-        self.in_buffer_len += len(data)
-        # Flush buffer if it gets too long (possible DoS attacks).
-        # RFC-959 specifies that a 500 response could be given in
-        # such cases
-        buflimit = 2048
-        if self.in_buffer_len > buflimit:
-            self.respond('500 Command too long.')
-            self.log('Command has been received exceeds buffer limit of %s.' %(buflimit))
-            self.in_buffer = []
-            self.in_buffer_len = 0
-
-    # commands accepted before authentication
-    unauth_cmds = ('FEAT','HELP','NOOP','PASS','QUIT','STAT','SYST','USER')
-
-    # commands needing an argument
-    arg_cmds = ('ALLO','APPE','DELE','EPRT','MDTM','MODE','MKD','OPTS','PORT',
-                'REST','RETR','RMD','RNFR','RNTO','SIZE', 'STOR','STRU',
-                'TYPE','USER','XMKD','XRMD')
-
-    # commands needing no argument
-    unarg_cmds = ('ABOR','CDUP','FEAT','NOOP','PASV','PWD','QUIT','REIN',
-                  'SYST','XCUP','XPWD')
-
-    def found_terminator(self):
-        r"""Called when the incoming data stream matches the \r\n
-        terminator.
-
-        Depending on the command received it calls the command's
-        corresponding method (e.g. for received command "MKD pathname",
-        ftp_MKD() method is called with "pathname" as the argument).
-        """
-        line = ''.join(self.in_buffer)
-        self.in_buffer = []
-        self.in_buffer_len = 0
-
-        cmd = line.split(' ')[0].upper()
-        space = line.find(' ')
-        if space != -1:
-            arg = line[space + 1:]
-        else:
-            arg = ""
-
-        if cmd != 'PASS':
-            self.logline("<== %s" %line)
-        else:
-            self.logline("<== %s %s" %(line.split(' ')[0], '*' * 6))
-
-        # let's check if user provided an argument for those commands
-        # needing one
-        if not arg and cmd in self.arg_cmds:
-            self.respond("501 Syntax error! Command needs an argument.")
-            return
-
-        # let's do the same for those commands requiring no argument.
-        elif arg and cmd in self.unarg_cmds:
-            self.respond("501 Syntax error! Command does not accept arguments.")
-            return
-
-        # provide a limited set of commands if user isn't
-        # authenticated yet
-        if (not self.authenticated):
-            if cmd in self.unauth_cmds:
-                # we permit STAT during this phase but we don't want
-                # STAT to return a directory LISTing if the user is
-                # not authenticated yet (this could happen if STAT
-                # is used with an argument)
-                if (cmd == 'STAT') and arg:
-                    self.respond("530 Log in with USER and PASS first.")
-                else:
-                    method = getattr(self, 'ftp_' + cmd)
-                    method(arg)  # call the proper ftp_* method
-            elif cmd in proto_cmds:
-                self.respond("530 Log in with USER and PASS first.")
-            else:
-                self.respond('500 Command "%s" not understood.' %line)
-
-        # provide full command set
-        elif (self.authenticated) and (cmd in proto_cmds):
-            if not (self.__check_path(arg, arg)): # and self.__check_perm(cmd, arg)):
-                return
-            method = getattr(self, 'ftp_' + cmd)
-            method(arg)  # call the proper ftp_* method
-
-        else:
-            # recognize those commands having "special semantics"
-            if 'ABOR' in cmd:
-                self.ftp_ABOR("")
-            elif 'STAT' in cmd:
-                self.ftp_STAT("")
-            # unknown command
-            else:
-                self.respond('500 Command "%s" not understood.' %line)
-
-    def __check_path(self, cmd, line):
-        """Check whether a path is valid."""
-
-        # Always true, we will only check later, once we have a cursor
-        return True
-
-    def __check_perm(self, cmd, line, datacr):
-        """Check permissions depending on issued command."""
-        map = {'CWD':'e', 'XCWD':'e', 'CDUP':'e', 'XCUP':'e',
-               'LIST':'l', 'NLST':'l', 'MLSD':'l', 'STAT':'l',
-               'RETR':'r',
-               'APPE':'a',
-               'DELE':'d', 'RMD':'d', 'XRMD':'d',
-               'RNFR':'f',
-               'MKD':'m', 'XMKD':'m',
-               'STOR':'w'}
-        raise NotImplementedError
-        if cmd in map:
-            if cmd == 'STAT' and not line:
-                return True
-            perm = map[cmd]
-            if not line and (cmd in ('LIST','NLST','MLSD')):
-                path = self.fs.ftp2fs(self.fs.cwd, datacr)
-            else:
-                path = self.fs.ftp2fs(line, datacr)
-            if not self.authorizer.has_perm(self.username, perm, path):
-                self.log('FAIL %s "%s". Not enough privileges.' \
-                         %(cmd, self.fs.ftpnorm(line)))
-                self.respond("550 Can't %s. Not enough privileges." %cmd)
-                return False
-        return True
-
-    def handle_expt(self):
-        """Called when there is out of band (OOB) data for the socket
-        connection.  This could happen in case of such commands needing
-        "special action" (typically STAT and ABOR) in which case we
-        append OOB data to incoming buffer.
-        """
-        if hasattr(socket, 'MSG_OOB'):
-            try:
-                data = self.socket.recv(1024, socket.MSG_OOB)
-            except socket.error:
-                pass
-            else:
-                self.in_buffer.append(data)
-                return
-        self.log("Cannot handle OOB data.")
-        self.close()
-
-    def handle_error(self):
-        try:
-            raise
-        except (KeyboardInterrupt, SystemExit, asyncore.ExitNow):
-            raise
-        except socket.error, err:
-            # fix around asyncore bug (http://bugs.python.org/issue1736101)
-            if err[0] in (errno.ECONNRESET, errno.ENOTCONN, errno.ESHUTDOWN, \
-                          errno.ECONNABORTED):
-                self.handle_close()
-                return
-            else:
-                logerror(traceback.format_exc())
-        except:
-            logerror(traceback.format_exc())
-        self.close()
-
-    def handle_close(self):
-        self.close()
-
-    _closed = False
-    def close(self):
-        """Close the current channel disconnecting the client."""
-        if not self._closed:
-            self._closed = True
-            if self.data_server:
-                self.data_server.close()
-                del self.data_server
-
-            if self.data_channel:
-                self.data_channel.close()
-                del self.data_channel
-
-            del self.__out_dtp_queue
-            del self.__in_dtp_queue
-
-            # remove client IP address from ip map
-            self.server.ip_map.remove(self.remote_ip)
-            asynchat.async_chat.close(self)
-            self.log("Disconnected.")
-
-    # --- callbacks
-
-    def on_dtp_connection(self):
-        """Called every time data channel connects (either active or
-        passive).
-
-        Incoming and outgoing queues are checked for pending data.
-        If outbound data is pending, it is pushed into the data channel.
-        If awaiting inbound data, the data channel is enabled for
-        receiving.
-        """
-        if self.data_server:
-            self.data_server.close()
-        self.data_server = None
-
-        # check for data to send
-        if self.__out_dtp_queue:
-            data, isproducer, file = self.__out_dtp_queue
-            if file:
-                self.data_channel.file_obj = file
-            if not isproducer:
-                self.data_channel.push(data)
-            else:
-                self.data_channel.push_with_producer(data)
-            if self.data_channel:
-                self.data_channel.close_when_done()
-            self.__out_dtp_queue = None
-
-        # check for data to receive
-        elif self.__in_dtp_queue:
-            self.data_channel.file_obj = self.__in_dtp_queue
-            self.data_channel.enable_receiving(self.current_type)
-            self.__in_dtp_queue = None
-
-    def on_dtp_close(self):
-        """Called every time the data channel is closed."""
-        self.data_channel = None
-        if self.quit_pending:
-            self.close_when_done()
-
-    # --- utility
-
-    def respond(self, resp):
-        """Send a response to the client using the command channel."""
-        self.push(resp + '\r\n')
-        self.logline('==> %s' % resp)
-
-    def push_dtp_data(self, data, isproducer=False, file=None):
-        """Pushes data into the data channel.
-
-        It is usually called for those commands requiring some data to
-        be sent over the data channel (e.g. RETR).
-        If data channel does not exist yet, it queues the data to send
-        later; data will then be pushed into data channel when
-        on_dtp_connection() will be called.
-
-         - (str/classobj) data: the data to send which may be a string
-            or a producer object).
-         - (bool) isproducer: whether treat data as a producer.
-         - (file) file: the file[-like] object to send (if any).
-        """
-        if self.data_channel:
-            self.respond("125 Data connection already open. Transfer starting.")
-            if file:
-                self.data_channel.file_obj = file
-            if not isproducer:
-                self.data_channel.push(data)
-            else:
-                self.data_channel.push_with_producer(data)
-            if self.data_channel:
-                self.data_channel.close_when_done()
-        else:
-            self.respond("150 File status okay. About to open data connection.")
-            self.__out_dtp_queue = (data, isproducer, file)
-
-    def log(self, msg):
-        """Log a message, including additional identifying session data."""
-        log("[%s]@%s:%s %s" %(self.username, self.remote_ip,
-                              self.remote_port, msg))
-
-    def logline(self, msg):
-        """Log a line including additional indentifying session data."""
-        logline("%s:%s %s" %(self.remote_ip, self.remote_port, msg))
-
-    def flush_account(self):
-        """Flush account information by clearing attributes that need
-        to be reset on a REIN or new USER command.
-        """
-        if self.data_channel:
-            if not self.data_channel.transfer_in_progress():
-                self.data_channel.close()
-                self.data_channel = None
-        if self.data_server:
-            self.data_server.close()
-            self.data_server = None
-
-        self.fs.rnfr = None
-        self.authenticated = False
-        self.username = ""
-        self.password = ""
-        self.attempted_logins = 0
-        self.current_type = 'a'
-        self.restart_position = 0
-        self.quit_pending = False
-        self.__in_dtp_queue = None
-        self.__out_dtp_queue = None
-
-    def run_as_current_user(self, function, *args, **kwargs):
-        """Execute a function impersonating the current logged-in user."""
-        self.authorizer.impersonate_user(self.username, self.password)
-        try:
-            return function(*args, **kwargs)
-        finally:
-            self.authorizer.terminate_impersonation()
-
-        # --- connection
-
-    def try_as_current_user(self, function, args=None, kwargs=None, line=None, errno_resp=None):
-        """run function as current user, auto-respond in exceptions
-           @param args,kwargs the arguments, in list and dict respectively
-           @param errno_resp a dictionary of responses to IOError, OSError
-        """
-        if errno_resp:
-            eresp = self.__errno_responses.copy()
-            eresp.update(errno_resp)
-        else:
-            eresp = self.__errno_responses
-
-        uline = ''
-        if line:
-            uline = ' "%s"' % _to_unicode(line)
-        try:
-            if args is None:
-                args = ()
-            if kwargs is None:
-                kwargs = {}
-            return self.run_as_current_user(function, *args, **kwargs)
-        except NotImplementedError, err:
-            cmdname = function.__name__
-            why = err.args[0] or 'Not implemented'
-            self.log('FAIL %s() is not implemented:  %s.' %(cmdname, why))
-            self.respond('502 %s.' %why)
-            raise FTPExceptionSent(why)
-        except EnvironmentError, err:
-            cmdname = function.__name__
-            try:
-                logline(traceback.format_exc())
-            except Exception:
-                pass
-            ret_code = eresp.get(err.errno, '451')
-            why = (err.strerror) or 'Error in command.'
-            self.log('FAIL %s() %s errno=%s:  %s.' %(cmdname, uline, err.errno, why))
-            self.respond('%s %s.' % (str(ret_code), why))
-
-            raise FTPExceptionSent(why)
-        except Exception, err:
-            cmdname = function.__name__
-            try:
-                logerror(traceback.format_exc())
-            except Exception:
-                pass
-            why = (err.args and err.args[0]) or 'Exception'
-            self.log('FAIL %s() %s Exception:  %s.' %(cmdname, uline, why))
-            self.respond('451 %s.' % why)
-            raise FTPExceptionSent(why)
-
-    def get_crdata2(self, *args, **kwargs):
-        return self.try_as_current_user(self.fs.get_crdata, args, kwargs, line=args[0])
-
-    def _make_eport(self, ip, port):
-        """Establish an active data channel with remote client which
-        issued a PORT or EPRT command.
-        """
-        # FTP bounce attacks protection: according to RFC-2577 it's
-        # recommended to reject PORT if IP address specified in it
-        # does not match client IP address.
-        if not self.permit_foreign_addresses:
-            if ip != self.remote_ip:
-                self.log("Rejected data connection to foreign address %s:%s."
-                         %(ip, port))
-                self.respond("501 Cannot connect to a foreign address.")
-                return
-
-        # ...another RFC-2577 recommendation is rejecting connections
-        # to privileged ports (< 1024) for security reasons.
-        if not self.permit_privileged_ports:
-            if port < 1024:
-                self.log('PORT against the privileged port "%s" has been refused.' %port)
-                self.respond("501 Cannot connect over a privileged port.")
-                return
-
-        # close existent DTP-server instance, if any.
-        if self.data_server:
-            self.data_server.close()
-            self.data_server = None
-        if self.data_channel:
-            self.data_channel.close()
-            self.data_channel = None
-
-        # make sure we are not hitting the max connections limit
-        if self.server.max_cons:
-            if len(self._map) >= self.server.max_cons:
-                msg = "Too many connections. Can't open data channel."
-                self.respond("425 %s" %msg)
-                self.log(msg)
-                return
-
-        # open data channel
-        self.active_dtp(ip, port, self)
-
-    def _make_epasv(self, extmode=False):
-        """Initialize a passive data channel with remote client which
-        issued a PASV or EPSV command.
-        If extmode argument is False we assume that client issued EPSV in
-        which case extended passive mode will be used (see RFC-2428).
-        """
-        # close existing DTP-server instance, if any
-        if self.data_server:
-            self.data_server.close()
-            self.data_server = None
-
-        if self.data_channel:
-            self.data_channel.close()
-            self.data_channel = None
-
-        # make sure we are not hitting the max connections limit
-        if self.server.max_cons:
-            if len(self._map) >= self.server.max_cons:
-                msg = "Too many connections. Cannot open data channel."
-                self.respond("425 %s" %msg)
-                self.log(msg)
-                return
-
-        # open data channel
-        self.data_server = self.passive_dtp(self, extmode)
-
-    def ftp_PORT(self, line):
-        """Start an active data channel by using IPv4."""
-        if self._epsvall:
-            self.respond("501 PORT not allowed after EPSV ALL.")
-            return
-        if self.af != socket.AF_INET:
-            self.respond("425 You cannot use PORT on IPv6 connections. "
-                         "Use EPRT instead.")
-            return
-        # Parse PORT request for getting IP and PORT.
-        # Request comes in as:
-        # > h1,h2,h3,h4,p1,p2
-        # ...where the client's IP address is h1.h2.h3.h4 and the TCP
-        # port number is (p1 * 256) + p2.
-        try:
-            addr = map(int, line.split(','))
-            assert len(addr) == 6
-            for x in addr[:4]:
-                assert 0 <= x <= 255
-            ip = '%d.%d.%d.%d' %tuple(addr[:4])
-            port = (addr[4] * 256) + addr[5]
-            assert 0 <= port <= 65535
-        except (AssertionError, ValueError, OverflowError):
-            self.respond("501 Invalid PORT format.")
-            return
-        self._make_eport(ip, port)
-
-    def ftp_EPRT(self, line):
-        """Start an active data channel by choosing the network protocol
-        to use (IPv4/IPv6) as defined in RFC-2428.
-        """
-        if self._epsvall:
-            self.respond("501 EPRT not allowed after EPSV ALL.")
-            return
-        # Parse EPRT request for getting protocol, IP and PORT.
-        # Request comes in as:
-        # # <d>proto<d>ip<d>port<d>
-        # ...where <d> is an arbitrary delimiter character (usually "|") and
-        # <proto> is the network protocol to use (1 for IPv4, 2 for IPv6).
-        try:
-            af, ip, port = line.split(line[0])[1:-1]
-            port = int(port)
-            assert 0 <= port <= 65535
-        except (AssertionError, ValueError, IndexError, OverflowError):
-            self.respond("501 Invalid EPRT format.")
-            return
-
-        if af == "1":
-            if self.af != socket.AF_INET:
-                self.respond('522 Network protocol not supported (use 2).')
-            else:
-                try:
-                    octs = map(int, ip.split('.'))
-                    assert len(octs) == 4
-                    for x in octs:
-                        assert 0 <= x <= 255
-                except (AssertionError, ValueError, OverflowError):
-                    self.respond("501 Invalid EPRT format.")
-                else:
-                    self._make_eport(ip, port)
-        elif af == "2":
-            if self.af == socket.AF_INET:
-                self.respond('522 Network protocol not supported (use 1).')
-            else:
-                self._make_eport(ip, port)
-        else:
-            if self.af == socket.AF_INET:
-                self.respond('501 Unknown network protocol (use 1).')
-            else:
-                self.respond('501 Unknown network protocol (use 2).')
-
-    def ftp_PASV(self, line):
-        """Start a passive data channel by using IPv4."""
-        if self._epsvall:
-            self.respond("501 PASV not allowed after EPSV ALL.")
-            return
-        if self.af != socket.AF_INET:
-            self.respond("425 You cannot use PASV on IPv6 connections. "
-                         "Use EPSV instead.")
-        else:
-            self._make_epasv(extmode=False)
-
-    def ftp_EPSV(self, line):
-        """Start a passive data channel by using IPv4 or IPv6 as defined
-        in RFC-2428.
-        """
-        # RFC-2428 specifies that if an optional parameter is given,
-        # we have to determine the address family from that otherwise
-        # use the same address family used on the control connection.
-        # In such a scenario a client may use IPv4 on the control channel
-        # and choose to use IPv6 for the data channel.
-        # But how could we use IPv6 on the data channel without knowing
-        # which IPv6 address to use for binding the socket?
-        # Unfortunately RFC-2428 does not provide satisfing information
-        # on how to do that.  The assumption is that we don't have any way
-        # to know which address to use, hence we just use the same address
-        # family used on the control connection.
-        if not line:
-            self._make_epasv(extmode=True)
-        elif line == "1":
-            if self.af != socket.AF_INET:
-                self.respond('522 Network protocol not supported (use 2).')
-            else:
-                self._make_epasv(extmode=True)
-        elif line == "2":
-            if self.af == socket.AF_INET:
-                self.respond('522 Network protocol not supported (use 1).')
-            else:
-                self._make_epasv(extmode=True)
-        elif line.lower() == 'all':
-            self._epsvall = True
-            self.respond('220 Other commands other than EPSV are now disabled.')
-        else:
-            if self.af == socket.AF_INET:
-                self.respond('501 Unknown network protocol (use 1).')
-            else:
-                self.respond('501 Unknown network protocol (use 2).')
-
-    def ftp_QUIT(self, line):
-        """Quit the current session."""
-        # From RFC-959:
-        # This command terminates a USER and if file transfer is not
-        # in progress, the server closes the control connection.
-        # If file transfer is in progress, the connection will remain
-        # open for result response and the server will then close it.
-        if self.authenticated:
-            msg_quit = self.authorizer.get_msg_quit(self.username)
-        else:
-            msg_quit = "Goodbye."
-        if len(msg_quit) <= 75:
-            self.respond("221 %s" %msg_quit)
-        else:
-            self.push("221-%s\r\n" %msg_quit)
-            self.respond("221 ")
-
-        if not self.data_channel:
-            self.close_when_done()
-        else:
-            # tell the cmd channel to stop responding to commands.
-            self.quit_pending = True
-
-
-        # --- data transferring
-
-    def ftp_LIST(self, line):
-        """Return a list of files in the specified directory to the
-        client.
-        """
-        # - If no argument, fall back on cwd as default.
-        # - Some older FTP clients erroneously issue /bin/ls-like LIST
-        #   formats in which case we fall back on cwd as default.
-        if not line or line.lower() in ('-a', '-l', '-al', '-la'):
-            line = ''
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='list')
-            iterator = self.try_as_current_user(self.fs.get_list_dir, (datacr,))
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-
-        try:
-            self.log('OK LIST "%s". Transfer starting.' % line)
-            producer = BufferedIteratorProducer(iterator)
-            self.push_dtp_data(producer, isproducer=True)
-        finally:
-            self.fs.close_cr(datacr)
-
-
-    def ftp_NLST(self, line):
-        """Return a list of files in the specified directory in a
-        compact form to the client.
-        """
-        if not line:
-            line = ''
-
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='list')
-            if not datacr:
-                datacr = ( None, None, None )
-            if self.fs.isdir(datacr[1]):
-                nodelist = self.try_as_current_user(self.fs.listdir, (datacr,))
-            else:
-                # if path is a file we just list its name
-                nodelist = [datacr[1],]
-
-            listing = []
-            for nl in nodelist:
-                if isinstance(nl.path, (list, tuple)):
-                    listing.append(nl.path[-1])
-                else:
-                    listing.append(nl.path)    # assume string
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-
-        self.fs.close_cr(datacr)
-        data = ''
-        if listing:
-            listing.sort()
-            data =  ''.join([ _to_decode(x) + '\r\n' for x in listing ])
-        self.log('OK NLST "%s". Transfer starting.' %line)
-        self.push_dtp_data(data)
-
-        # --- MLST and MLSD commands
-
-    # The MLST and MLSD commands are intended to standardize the file and
-    # directory information returned by the server-FTP process.  These
-    # commands differ from the LIST command in that the format of the
-    # replies is strictly defined although extensible.
-
-    def ftp_MLST(self, line):
-        """Return information about a pathname in a machine-processable
-        form as defined in RFC-3659.
-        """
-        # if no argument, fall back on cwd as default
-        if not line:
-            line = ''
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='list')
-            perms = self.authorizer.get_perms(self.username)
-            iterator = self.try_as_current_user(self.fs.format_mlsx, (datacr[0], datacr[1].parent,
-                       [datacr[1],], perms, self.current_facts), {'ignore_err':False})
-            data = ''.join(iterator)
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-        else:
-            self.fs.close_cr(datacr)
-            # since TVFS is supported (see RFC-3659 chapter 6), a fully
-            # qualified pathname should be returned
-            data = data.split(' ')[0] + ' %s\r\n' %line
-            # response is expected on the command channel
-            self.push('250-Listing "%s":\r\n' %line)
-            # the fact set must be preceded by a space
-            self.push(' ' + data)
-            self.respond('250 End MLST.')
-
-    def ftp_MLSD(self, line):
-        """Return contents of a directory in a machine-processable form
-        as defined in RFC-3659.
-        """
-        # if no argument, fall back on cwd as default
-        if not line:
-            line = ''
-
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='list')
-            # RFC-3659 requires 501 response code if path is not a directory
-            if not self.fs.isdir(datacr[1]):
-                err = 'No such directory.'
-                self.log('FAIL MLSD "%s". %s.' %(line, err))
-                self.respond("501 %s." %err)
-                return
-            listing = self.try_as_current_user(self.fs.listdir, (datacr,))
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-        else:
-            self.fs.close_cr(datacr)
-            perms = self.authorizer.get_perms(self.username)
-            iterator = self.fs.format_mlsx(datacr[0], datacr[1], listing, perms,
-                       self.current_facts)
-            producer = BufferedIteratorProducer(iterator)
-            self.log('OK MLSD "%s". Transfer starting.' %line)
-            self.push_dtp_data(producer, isproducer=True)
-
-    def ftp_RETR(self, line):
-        """Retrieve the specified file (transfer from the server to the
-        client)
-        """
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='file')
-            fd = self.try_as_current_user(self.fs.open, (datacr, 'rb'))
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-
-        if self.restart_position:
-            # Make sure that the requested offset is valid (within the
-            # size of the file being resumed).
-            # According to RFC-1123 a 554 reply may result in case that
-            # the existing file cannot be repositioned as specified in
-            # the REST.
-            ok = 0
-            try:
-                assert not self.restart_position > self.fs.getsize(datacr)
-                fd.seek(self.restart_position)
-                ok = 1
-            except AssertionError:
-                why = "Invalid REST parameter."
-            except IOError, err:
-                why = _strerror(err)
-            self.restart_position = 0
-            if not ok:
-                self.respond('554 %s' %why)
-                self.log('FAIL RETR "%s". %s.' %(line, why))
-                self.fs.close_cr(datacr)
-                return
-        self.log('OK RETR "%s". Download starting.' %line)
-        producer = FileProducer(fd, self.current_type)
-        self.push_dtp_data(producer, isproducer=True, file=fd)
-        self.fs.close_cr(datacr)
-
-    def ftp_STOR(self, line, mode='w'):
-        """Store a file (transfer from the client to the server)."""
-        # A resume could occur in case of APPE or REST commands.
-        # In that case we have to open file object in different ways:
-        # STOR: mode = 'w'
-        # APPE: mode = 'a'
-        # REST: mode = 'r+' (to permit seeking on file object)
-        if 'a' in mode:
-            cmd = 'APPE'
-        else:
-            cmd = 'STOR'
-
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line,mode='create')
-            if self.restart_position:
-                mode = 'r+'
-            fd = self.try_as_current_user(self.fs.create, (datacr, datacr[2], mode + 'b'))
-            assert fd
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-
-        if self.restart_position:
-            # Make sure that the requested offset is valid (within the
-            # size of the file being resumed).
-            # According to RFC-1123 a 554 reply may result in case
-            # that the existing file cannot be repositioned as
-            # specified in the REST.
-            ok = 0
-            try:
-                assert not self.restart_position > self.fs.getsize(datacr)
-                fd.seek(self.restart_position)
-                ok = 1
-            except AssertionError:
-                why = "Invalid REST parameter."
-            except IOError, err:
-                why = _strerror(err)
-            self.restart_position = 0
-            if not ok:
-                self.fs.close_cr(datacr)
-                self.respond('554 %s' %why)
-                self.log('FAIL %s "%s". %s.' %(cmd, line, why))
-                return
-
-        self.log('OK %s "%s". Upload starting.' %(cmd, line))
-        if self.data_channel:
-            self.respond("125 Data connection already open. Transfer starting.")
-            self.data_channel.file_obj = fd
-            self.data_channel.enable_receiving(self.current_type)
-        else:
-            self.respond("150 File status okay. About to open data connection.")
-            self.__in_dtp_queue = fd
-        self.fs.close_cr(datacr)
-
-
-    def ftp_STOU(self, line):
-        """Store a file on the server with a unique name."""
-        # Note 1: RFC-959 prohibited STOU parameters, but this
-        # prohibition is obsolete.
-        # Note 2: 250 response wanted by RFC-959 has been declared
-        # incorrect in RFC-1123 that wants 125/150 instead.
-        # Note 3: RFC-1123 also provided an exact output format
-        # defined to be as follow:
-        # > 125 FILE: pppp
-        # ...where pppp represents the unique path name of the
-        # file that will be written.
-
-        # watch for STOU preceded by REST, which makes no sense.
-        if self.restart_position:
-            self.respond("450 Cannot STOU while REST request is pending.")
-            return
-
-
-        if line:
-            datacr = self.get_crdata2(line, mode='create')
-            # TODO
-        else:
-            # TODO
-            basedir = self.fs.ftp2fs(self.fs.cwd, datacr)
-            prefix = 'ftpd.'
-        try:
-            fd = self.try_as_current_user(self.fs.mkstemp, kwargs={'prefix':prefix,
-                                          'dir': basedir}, line=line )
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-        except IOError, err: # TODO
-            # hitted the max number of tries to find out file with
-            # unique name
-            if err.errno == errno.EEXIST:
-                why = 'No usable unique file name found.'
-            # something else happened
-            else:
-                why = _strerror(err)
-            self.respond("450 %s." %why)
-            self.log('FAIL STOU "%s". %s.' %(self.fs.ftpnorm(line), why))
-            self.fs.close_cr(datacr)
-            return
-
-        filename = line
-        if not self.authorizer.has_perm(self.username, 'w', filename):
-            self.log('FAIL STOU "%s". Not enough privileges.'
-                     %self.fs.ftpnorm(line))
-            self.respond("550 Cannot STOU: not enough privileges.")
-            self.fs.close_cr(datacr)
-            return
-
-        # now just acts like STOR except that restarting isn't allowed
-        self.log('OK STOU "%s". Upload starting.' %filename)
-        if self.data_channel:
-            self.respond("125 FILE: %s" %filename)
-            self.data_channel.file_obj = fd
-            self.data_channel.enable_receiving(self.current_type)
-        else:
-            self.respond("150 FILE: %s" %filename)
-            self.__in_dtp_queue = fd
-        self.fs.close_cr(datacr)
-
-
-    def ftp_APPE(self, line):
-        """Append data to an existing file on the server."""
-        # watch for APPE preceded by REST, which makes no sense.
-        if self.restart_position:
-            self.respond("550 Cannot APPE while REST request is pending.")
-        else:
-            self.ftp_STOR(line, mode='a')
-
-    def ftp_REST(self, line):
-        """Restart a file transfer from a previous mark."""
-        try:
-            marker = int(line)
-            if marker < 0:
-                raise ValueError
-        except (ValueError, OverflowError):
-            self.respond("501 Invalid parameter.")
-        else:
-            self.respond("350 Restarting at position %s. " \
-                        "Now use RETR/STOR for resuming." %marker)
-            self.log("OK REST %s." %marker)
-            self.restart_position = marker
-
-    def ftp_ABOR(self, line):
-        """Abort the current data transfer."""
-
-        # ABOR received while no data channel exists
-        if (self.data_server is None) and (self.data_channel is None):
-            resp = "225 No transfer to abort."
-        else:
-            # a PASV was received but connection wasn't made yet
-            if self.data_server:
-                self.data_server.close()
-                self.data_server = None
-                resp = "225 ABOR command successful; data channel closed."
-
-            # If a data transfer is in progress the server must first
-            # close the data connection, returning a 426 reply to
-            # indicate that the transfer terminated abnormally, then it
-            # must send a 226 reply, indicating that the abort command
-            # was successfully processed.
-            # If no data has been transmitted we just respond with 225
-            # indicating that no transfer was in progress.
-            if self.data_channel:
-                if self.data_channel.transfer_in_progress():
-                    self.data_channel.close()
-                    self.data_channel = None
-                    self.respond("426 Connection closed; transfer aborted.")
-                    self.log("OK ABOR. Transfer aborted, data channel closed.")
-                    resp = "226 ABOR command successful."
-                else:
-                    self.data_channel.close()
-                    self.data_channel = None
-                    self.log("OK ABOR. Data channel closed.")
-                    resp = "225 ABOR command successful; data channel closed."
-        self.respond(resp)
-
-
-        # --- authentication
-
-    def ftp_USER(self, line):
-        """Set the username for the current session."""
-        # we always treat anonymous user as lower-case string.
-        if line.lower() == "anonymous":
-            line = "anonymous"
-
-        # RFC-959 specifies a 530 response to the USER command if the
-        # username is not valid.  If the username is valid is required
-        # ftpd returns a 331 response instead.  In order to prevent a
-        # malicious client from determining valid usernames on a server,
-        # it is suggested by RFC-2577 that a server always return 331 to
-        # the USER command and then reject the combination of username
-        # and password for an invalid username when PASS is provided later.
-        if not self.authenticated:
-            self.respond('331 Username ok, send password.')
-        else:
-            # a new USER command could be entered at any point in order
-            # to change the access control flushing any user, password,
-            # and account information already supplied and beginning the
-            # login sequence again.
-            self.flush_account()
-            msg = 'Previous account information is flushed.'
-            self.log('OK USER "%s". %s.' %(line, msg))
-            self.respond('331 %s, send password.' %msg)
-        self.username = line
-
-    def ftp_PASS(self, line):
-        """Check username's password against the authorizer."""
-
-        if self.authenticated:
-            self.respond("503 User already authenticated.")
-            return
-        if not self.username:
-            self.respond("503 Login with USER first.")
-            return
-
-        # username ok
-        if self.authorizer.has_user(self.username):
-            if self.username == 'anonymous' \
-            or self.authorizer.validate_authentication(self.username, line):
-                msg_login = self.authorizer.get_msg_login(self.username)
-                if len(msg_login) <= 75:
-                    self.respond('230 %s' %msg_login)
-                else:
-                    self.push("230-%s\r\n" %msg_login)
-                    self.respond("230 ")
-
-                self.authenticated = True
-                self.password = line
-                self.attempted_logins = 0
-                self.fs.root = self.authorizer.get_home_dir(self.username)
-                self.fs.username=self.username
-                self.fs.password=line
-                self.log("User %s logged in." %self.username)
-            else:
-                self.attempted_logins += 1
-                if self.attempted_logins >= self.max_login_attempts:
-                    self.respond("530 Maximum login attempts. Disconnecting.")
-                    self.close()
-                else:
-                    self.respond("530 Authentication failed.")
-                self.log('Authentication failed (user: "%s").' %self.username)
-                self.username = ""
-
-        # wrong username
-        else:
-            self.attempted_logins += 1
-            if self.attempted_logins >= self.max_login_attempts:
-                self.log('Authentication failed: unknown username "%s".'
-                            %self.username)
-                self.respond("530 Maximum login attempts. Disconnecting.")
-                self.close()
-            elif self.username.lower() == 'anonymous':
-                self.respond("530 Anonymous access not allowed.")
-                self.log('Authentication failed: anonymous access not allowed.')
-            else:
-                self.respond("530 Authentication failed.")
-                self.log('Authentication failed: unknown username "%s".'
-                            %self.username)
-                self.username = ""
-
-    def ftp_REIN(self, line):
-        """Reinitialize user's current session."""
-        # From RFC-959:
-        # REIN command terminates a USER, flushing all I/O and account
-        # information, except to allow any transfer in progress to be
-        # completed.  All parameters are reset to the default settings
-        # and the control connection is left open.  This is identical
-        # to the state in which a user finds himself immediately after
-        # the control connection is opened.
-        self.log("OK REIN. Flushing account information.")
-        self.flush_account()
-        # Note: RFC-959 erroneously mention "220" as the correct response
-        # code to be given in this case, but this is wrong...
-        self.respond("230 Ready for new user.")
-
-
-        # --- filesystem operations
-
-    def ftp_PWD(self, line):
-        """Return the name of the current working directory to the client."""
-        cwd = self.fs.get_cwd()
-        self.respond('257 "%s" is the current directory.' % cwd)
-
-    def ftp_CWD(self, line):
-        """Change the current working directory."""
-        # check: a lot of FTP servers go back to root directory if no
-        # arg is provided but this is not specified in RFC-959.
-        # Search for official references about this behaviour.
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line,'cwd')
-            self.try_as_current_user(self.fs.chdir, (datacr,), line=line, errno_resp={2: 530})
-            cwd = self.fs.get_cwd()
-            self.log('OK CWD "%s".' % cwd)
-            self.respond('250 "%s" is the current directory.' % cwd)
-        except FTPExceptionSent:
-            return
-        finally:
-            self.fs.close_cr(datacr)
-
-    def ftp_CDUP(self, line):
-        """Change into the parent directory."""
-        # Note: RFC-959 says that code 200 is required but it also says
-        # that CDUP uses the same codes as CWD.
-        self.ftp_CWD('..')
-
-    def ftp_SIZE(self, line):
-        """Return size of file in a format suitable for using with
-        RESTart as defined in RFC-3659.
-
-        Implementation note:
-        properly handling the SIZE command when TYPE ASCII is used would
-        require to scan the entire file to perform the ASCII translation
-        logic (file.read().replace(os.linesep, '\r\n')) and then
-        calculating the len of such data which may be different than
-        the actual size of the file on the server.  Considering that
-        calculating such result could be very resource-intensive it
-        could be easy for a malicious client to try a DoS attack, thus
-        we do not perform the ASCII translation.
-
-        However, clients in general should not be resuming downloads in
-        ASCII mode.  Resuming downloads in binary mode is the recommended
-        way as specified in RFC-3659.
-        """
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='file')
-            size = self.try_as_current_user(self.fs.getsize,(datacr,), line=line)
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-        else:
-            self.respond("213 %s" %size)
-            self.log('OK SIZE "%s".' %line)
-        self.fs.close_cr(datacr)
-
-    def ftp_MDTM(self, line):
-        """Return last modification time of file to the client as an ISO
-        3307 style timestamp (YYYYMMDDHHMMSS) as defined in RFC-3659.
-        """
-        datacr = None
-
-        try:
-            if line.find('/', 1) < 0:
-                # root or db, just return local
-                lmt = None
-            else:
-                datacr = self.get_crdata2(line)
-                if not datacr:
-                    raise IOError(errno.ENOENT, "%s is not retrievable." %line)
-
-                lmt = self.try_as_current_user(self.fs.getmtime, (datacr,), line=line)
-            lmt = time.strftime("%Y%m%d%H%M%S", time.localtime(lmt))
-            self.respond("213 %s" %lmt)
-            self.log('OK MDTM "%s".' %line)
-        except FTPExceptionSent:
-            return
-        finally:
-            self.fs.close_cr(datacr)
-
-    def ftp_MKD(self, line):
-        """Create the specified directory."""
-        try:
-            datacr = self.get_crdata2(line, mode='create')
-            self.try_as_current_user(self.fs.mkdir, (datacr, datacr[2]), line=line)
-        except FTPExceptionSent:
-            self.fs.close_cr(datacr)
-            return
-        else:
-            self.log('OK MKD "%s".' %line)
-            self.respond("257 Directory created.")
-        self.fs.close_cr(datacr)
-
-    def ftp_RMD(self, line):
-        """Remove the specified directory."""
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='delete')
-            if not datacr[1]:
-                msg = "Cannot remove root directory."
-                self.respond("553 %s" %msg)
-                self.log('FAIL MKD "/". %s' %msg)
-                self.fs.close_cr(datacr)
-                return
-            self.try_as_current_user(self.fs.rmdir, (datacr,), line=line)
-            self.log('OK RMD "%s".' %line)
-            self.respond("250 Directory removed.")
-        except FTPExceptionSent:
-            pass
-        self.fs.close_cr(datacr)
-
-    def ftp_DELE(self, line):
-        """Delete the specified file."""
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='delete')
-            self.try_as_current_user(self.fs.remove, (datacr,), line=line)
-            self.log('OK DELE "%s".' %line)
-            self.respond("250 File removed.")
-        except FTPExceptionSent:
-            pass
-        self.fs.close_cr(datacr)
-
-    def ftp_RNFR(self, line):
-        """Rename the specified (only the source name is specified
-        here, see RNTO command)"""
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line, mode='rfnr')
-            if not datacr[1]:
-                self.respond("550 No such file or directory.")
-            elif not datacr[1]:
-                self.respond("553 Cannot rename the home directory.")
-            else:
-                self.fs.rnfr = datacr[1]
-                self.respond("350 Ready for destination name.")
-        except FTPExceptionSent:
-            pass
-        self.fs.close_cr(datacr)
-
-    def ftp_RNTO(self, line):
-        """Rename file (destination name only, source is specified with
-        RNFR).
-        """
-        if not self.fs.rnfr:
-            self.respond("503 Bad sequence of commands: use RNFR first.")
-            return
-        datacr = None
-        try:
-            datacr = self.get_crdata2(line,'create')
-            oldname = self.fs.rnfr.path
-            if isinstance(oldname, (list, tuple)):
-                oldname = '/'.join(oldname)
-            self.try_as_current_user(self.fs.rename, (self.fs.rnfr, datacr), line=line)
-            self.fs.rnfr = None
-            self.log('OK RNFR/RNTO "%s ==> %s".' % \
-                    (_to_unicode(oldname), _to_unicode(line)))
-            self.respond("250 Renaming ok.")
-        except FTPExceptionSent:
-            pass
-        finally:
-            self.fs.rnfr = None
-            self.fs.close_cr(datacr)
-
-
-        # --- others
-
-    def ftp_TYPE(self, line):
-        """Set current type data type to binary/ascii"""
-        line = line.upper()
-        if line in ("A", "AN", "A N"):
-            self.respond("200 Type set to: ASCII.")
-            self.current_type = 'a'
-        elif line in ("I", "L8", "L 8"):
-            self.respond("200 Type set to: Binary.")
-            self.current_type = 'i'
-        else:
-            self.respond('504 Unsupported type "%s".' %line)
-
-    def ftp_STRU(self, line):
-        """Set file structure (obsolete)."""
-        # obsolete (backward compatibility with older ftp clients)
-        if line in ('f','F'):
-            self.respond('200 File transfer structure set to: F.')
-        else:
-            self.respond('504 Unimplemented STRU type.')
-
-    def ftp_MODE(self, line):
-        """Set data transfer mode (obsolete)"""
-        # obsolete (backward compatibility with older ftp clients)
-        if line in ('s', 'S'):
-            self.respond('200 Transfer mode set to: S')
-        else:
-            self.respond('504 Unimplemented MODE type.')
-
-    def ftp_STAT(self, line):
-        """Return statistics about current ftp session. If an argument
-        is provided return directory listing over command channel.
-
-        Implementation note:
-
-        RFC-959 do not explicitly mention globbing; this means that FTP
-        servers are not required to support globbing in order to be
-        compliant.  However, many FTP servers do support globbing as a
-        measure of convenience for FTP clients and users.
-
-        In order to search for and match the given globbing expression,
-        the code has to search (possibly) many directories, examine
-        each contained filename, and build a list of matching files in
-        memory.  Since this operation can be quite intensive, both CPU-
-        and memory-wise, we limit the search to only one directory
-        non-recursively, as LIST does.
-        """
-        # return STATus information about ftpd
-        if not line:
-            s = []
-            s.append('Connected to: %s:%s' %self.socket.getsockname()[:2])
-            if self.authenticated:
-                s.append('Logged in as: %s' %self.username)
-            else:
-                if not self.username:
-                    s.append("Waiting for username.")
-                else:
-                    s.append("Waiting for password.")
-            if self.current_type == 'a':
-                type = 'ASCII'
-            else:
-                type = 'Binary'
-            s.append("TYPE: %s; STRUcture: File; MODE: Stream" %type)
-            if self.data_server:
-                s.append('Passive data channel waiting for connection.')
-            elif self.data_channel:
-                bytes_sent = self.data_channel.tot_bytes_sent
-                bytes_recv = self.data_channel.tot_bytes_received
-                s.append('Data connection open:')
-                s.append('Total bytes sent: %s' %bytes_sent)
-                s.append('Total bytes received: %s' %bytes_recv)
-            else:
-                s.append('Data connection closed.')
-
-            self.push('211-FTP server status:\r\n')
-            self.push(''.join([' %s\r\n' %item for item in s]))
-            self.respond('211 End of status.')
-        # return directory LISTing over the command channel
-        else:
-            datacr = None
-            try:
-                datacr = self.fs.get_cr(line)
-                iterator = self.try_as_current_user(self.fs.get_stat_dir, (line, datacr), line=line)
-            except FTPExceptionSent:
-                pass
-            else:
-                self.push('213-Status of "%s":\r\n' %self.fs.ftpnorm(line))
-                self.push_with_producer(BufferedIteratorProducer(iterator))
-                self.respond('213 End of status.')
-            self.fs.close_cr(datacr)
-
-    def ftp_FEAT(self, line):
-        """List all new features supported as defined in RFC-2398."""
-        features = ['EPRT','EPSV','MDTM','MLSD','REST STREAM','SIZE','TVFS']
-        s = ''
-        for fact in self.available_facts:
-            if fact in self.current_facts:
-                s += fact + '*;'
-            else:
-                s += fact + ';'
-        features.append('MLST ' + s)
-        features.sort()
-        self.push("211-Features supported:\r\n")
-        self.push("".join([" %s\r\n" %x for x in features]))
-        self.respond('211 End FEAT.')
-
-    def ftp_OPTS(self, line):
-        """Specify options for FTP commands as specified in RFC-2389."""
-        try:
-            assert (not line.count(' ') > 1), 'Invalid number of arguments.'
-            if ' ' in line:
-                cmd, arg = line.split(' ')
-                assert (';' in arg), 'Invalid argument!'
-            else:
-                cmd, arg = line, ''
-            # actually the only command able to accept options is MLST
-            assert (cmd.upper() == 'MLST'), 'Unsupported command "%s".' %cmd
-        except AssertionError, err:
-            self.respond('501 %s.' %err)
-        else:
-            facts = [x.lower() for x in arg.split(';')]
-            self.current_facts = [x for x in facts if x in self.available_facts]
-            f = ''.join([x + ';' for x in self.current_facts])
-            self.respond('200 MLST OPTS ' + f)
-
-    def ftp_NOOP(self, line):
-        """Do nothing."""
-        self.respond("200 I successfully done nothin'.")
-
-    def ftp_SYST(self, line):
-        """Return system type (always returns UNIX type: L8)."""
-        # This command is used to find out the type of operating system
-        # at the server.  The reply shall have as its first word one of
-        # the system names listed in RFC-943.
-        # Since that we always return a "/bin/ls -lA"-like output on
-        # LIST we  prefer to respond as if we would on Unix in any case.
-        self.respond("215 UNIX Type: L8")
-
-    def ftp_ALLO(self, line):
-        """Allocate bytes for storage (obsolete)."""
-        # obsolete (always respond with 202)
-        self.respond("202 No storage allocation necessary.")
-
-    def ftp_HELP(self, line):
-        """Return help text to the client."""
-        if line:
-            if line.upper() in proto_cmds:
-                self.respond("214 %s" %proto_cmds[line.upper()])
-            else:
-                self.respond("501 Unrecognized command.")
-        else:
-            # provide a compact list of recognized commands
-            def formatted_help():
-                cmds = []
-                keys = proto_cmds.keys()
-                keys.sort()
-                while keys:
-                    elems = tuple((keys[0:8]))
-                    cmds.append(' %-6s' * len(elems) %elems + '\r\n')
-                    del keys[0:8]
-                return ''.join(cmds)
-
-            self.push("214-The following commands are recognized:\r\n")
-            self.push(formatted_help())
-            self.respond("214 Help command successful.")
-
-
-        # --- support for deprecated cmds
-
-    # RFC-1123 requires that the server treat XCUP, XCWD, XMKD, XPWD
-    # and XRMD commands as synonyms for CDUP, CWD, MKD, LIST and RMD.
-    # Such commands are obsoleted but some ftp clients (e.g. Windows
-    # ftp.exe) still use them.
-
-    def ftp_XCUP(self, line):
-        """Change to the parent directory. Synonym for CDUP. Deprecated."""
-        self.ftp_CDUP(line)
-
-    def ftp_XCWD(self, line):
-        """Change the current working directory. Synonym for CWD. Deprecated."""
-        self.ftp_CWD(line)
-
-    def ftp_XMKD(self, line):
-        """Create the specified directory. Synonym for MKD. Deprecated."""
-        self.ftp_MKD(line)
-
-    def ftp_XPWD(self, line):
-        """Return the current working directory. Synonym for PWD. Deprecated."""
-        self.ftp_PWD(line)
-
-    def ftp_XRMD(self, line):
-        """Remove the specified directory. Synonym for RMD. Deprecated."""
-        self.ftp_RMD(line)
-
-
-class FTPServer(asyncore.dispatcher):
-    """This class is an asyncore.disptacher subclass.  It creates a FTP
-    socket listening on <address>, dispatching the requests to a <handler>
-    (typically FTPHandler class).
-
-    Depending on the type of address specified IPv4 or IPv6 connections
-    (or both, depending from the underlying system) will be accepted.
-
-    All relevant session information is stored in class attributes
-    described below.
-    Overriding them is strongly recommended to avoid running out of
-    file descriptors (DoS)!
-
-     - (int) max_cons:
-        number of maximum simultaneous connections accepted (defaults
-        to 0 == unlimited).
-
-     - (int) max_cons_per_ip:
-        number of maximum connections accepted for the same IP address
-        (defaults to 0 == unlimited).
-    """
-
-    max_cons = 0
-    max_cons_per_ip = 0
-
-    def __init__(self, address, handler):
-        """Initiate the FTP server opening listening on address.
-
-         - (tuple) address: the host:port pair on which the command
-           channel will listen.
-
-         - (classobj) handler: the handler class to use.
-        """
-        asyncore.dispatcher.__init__(self)
-        self.handler = handler
-        self.ip_map = []
-        host, port = address
-
-        # AF_INET or AF_INET6 socket
-        # Get the correct address family for our host (allows IPv6 addresses)
-        try:
-            info = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
-                                      socket.SOCK_STREAM, 0, socket.AI_PASSIVE)
-        except socket.gaierror:
-            # Probably a DNS issue. Assume IPv4.
-            self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
-            self.set_reuse_addr()
-            self.bind((host, port))
-        else:
-            for res in info:
-                af, socktype, proto, canonname, sa = res
-                try:
-                    self.create_socket(af, socktype)
-                    self.set_reuse_addr()
-                    self.bind(sa)
-                except socket.error, msg:
-                    if self.socket:
-                        self.socket.close()
-                    self.socket = None
-                    continue
-                break
-            if not self.socket:
-                raise socket.error, msg
-        self.listen(5)
-
-    def set_reuse_addr(self):
-        # Overridden for convenience. Avoid to reuse address on Windows.
-        if (os.name in ('nt', 'ce')) or (sys.platform == 'cygwin'):
-            return
-        asyncore.dispatcher.set_reuse_addr(self)
-
-    def serve_forever(self, **kwargs):
-        """A wrap around asyncore.loop(); starts the asyncore polling
-        loop.
-
-        The keyword arguments in kwargs are the same expected by
-        asyncore.loop() function: timeout, use_poll, map and count.
-        """
-        if not 'count' in kwargs:
-            log("Serving FTP on %s:%s" %self.socket.getsockname()[:2])
-
-        # backward compatibility for python < 2.4
-        if not hasattr(self, '_map'):
-            if not 'map' in kwargs:
-                map = asyncore.socket_map
-            else:
-                map = kwargs['map']
-            self._map = self.handler._map = map
-
-        try:
-            # FIX #16, #26
-            # use_poll specifies whether to use select module's poll()
-            # with asyncore or whether to use asyncore's own poll()
-            # method Python versions < 2.4 need use_poll set to False
-            # This breaks on OS X systems if use_poll is set to True.
-            # All systems seem to work fine with it set to False
-            # (tested on Linux, Windows, and OS X platforms)
-            if kwargs:
-                asyncore.loop(**kwargs)
-            else:
-                asyncore.loop(timeout=1.0, use_poll=False)
-        except (KeyboardInterrupt, SystemExit, asyncore.ExitNow):
-            log("Shutting down FTPd.")
-            self.close_all()
-
-    def handle_accept(self):
-        """Called when remote client initiates a connection."""
-        sock_obj, addr = self.accept()
-        log("[]%s:%s Connected." %addr[:2])
-
-        handler = self.handler(sock_obj, self)
-        ip = addr[0]
-        self.ip_map.append(ip)
-
-        # For performance and security reasons we should always set a
-        # limit for the number of file descriptors that socket_map
-        # should contain.  When we're running out of such limit we'll
-        # use the last available channel for sending a 421 response
-        # to the client before disconnecting it.
-        if self.max_cons:
-            if len(self._map) > self.max_cons:
-                handler.handle_max_cons()
-                return
-
-        # accept only a limited number of connections from the same
-        # source address.
-        if self.max_cons_per_ip:
-            if self.ip_map.count(ip) > self.max_cons_per_ip:
-                handler.handle_max_cons_per_ip()
-                return
-
-        handler.handle()
-
-    def writable(self):
-        return 0
-
-    def handle_error(self):
-        """Called to handle any uncaught exceptions."""
-        try:
-            raise
-        except (KeyboardInterrupt, SystemExit, asyncore.ExitNow):
-            raise
-        logerror(traceback.format_exc())
-        self.close()
-
-    def close_all(self, map=None, ignore_all=False):
-        """Stop serving; close all existent connections disconnecting
-        clients.
-
-         - (dict) map:
-            A dictionary whose items are the channels to close.
-            If map is omitted, the default asyncore.socket_map is used.
-
-         - (bool) ignore_all:
-            having it set to False results in raising exception in case
-            of unexpected errors.
-
-        Implementation note:
-
-        Instead of using the current asyncore.close_all() function
-        which only close sockets, we iterate over all existent channels
-        calling close() method for each one of them, avoiding memory
-        leaks.
-
-        This is how asyncore.close_all() function should work in
-        Python 2.6.
-        """
-        if map is None:
-            map = self._map
-        for x in map.values():
-            try:
-                x.close()
-            except OSError, x:
-                if x[0] == errno.EBADF:
-                    pass
-                elif not ignore_all:
-                    raise
-            except (asyncore.ExitNow, KeyboardInterrupt, SystemExit):
-                raise
-            except:
-                if not ignore_all:
-                    raise
-        map.clear()
-
-
-def test():
-    # cmd line usage (provide a read-only anonymous ftp server):
-    # python -m pyftpdlib.FTPServer
-    authorizer = DummyAuthorizer()
-    authorizer.add_anonymous(os.getcwd(), perm='elradfmw')
-    FTPHandler.authorizer = authorizer
-    address = ('', 8021)
-    ftpd = FTPServer(address, FTPHandler)
-    ftpd.serve_forever()
-
-if __name__ == '__main__':
-    test()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/i18n/ar.po b/addons/document_ftp/i18n/ar.po
deleted file mode 100644
index f6e1a3ab95d..00000000000
--- a/addons/document_ftp/i18n/ar.po
+++ /dev/null
@@ -1,158 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-01 18:32+0000\n"
-"Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "قم بضبط الخادم FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "التهيئة التلقائية للمسار"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"يشير عنوان الشبكة التي لديك على الخادم OpenERP ينبغي أن تكون قابلة للوصول "
-"للمستخدمين النهائيين. هذا يعتمد على هيكل الشبكة الخاصة بك والتكوين، وسو� "
-"تؤثر �قط على الروابط المعروضة للمستخدمين. والشكل هو مضي�: من�ذ والمضي� "
-"الا�تراضي (المضي� المحلي) وهي مناسبة �قط للوصول من جهاز الخادم ن�سه .."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "استعراض المل�ات"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "اضغط على الرابط لتص�ح المستندات"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "خادم FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "ضبط خدمة FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "تص�ح المستندات"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_تص�ح"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"عنوان الخادم أو الملكية ال�كرية والمن�ذ الذي يجب على المستخدمين الاتصال به "
-"للحصول DMS"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "مستودع مشترك (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "العنوان"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "تص�ح وثيقة FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "الاعدادات لنظام أدارة الوثائق"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "متص�ح الوثيقة"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "أو"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "تص�ح الوثيقة"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "الصورة"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "سير الإعدادات"
-
-#~ msgid "title"
-#~ msgstr "الاسم"
-
-#~ msgid "_Cancel"
-#~ msgstr "ال_غاء"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "ربط خدمة FTP مع نظام ادارة الوثائق"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "هذا هو واجهة دعم بروتوكول نقل المل�ات مع نظام إدارة الوثائق.\n"
-#~ "مع هذه الوحدة �إنك لن تكون قادرا على الوصول إلى المستندات من خلال OpenERP\n"
-#~ "ولكن هل ستكون أيضا قادرا على الاتصال معهم من خلال نظام المل�ات باستخدام\n"
-#~ "بروتوكول نقل المل�ات العملاء.\n"
diff --git a/addons/document_ftp/i18n/bg.po b/addons/document_ftp/i18n/bg.po
deleted file mode 100644
index 1bf7cf4c7b2..00000000000
--- a/addons/document_ftp/i18n/bg.po
+++ /dev/null
@@ -1,146 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-02 09:48+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "�а�тройване на FTP �ървър"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "�втоматично на�тройване на категори�"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Показва мрежови� адре�, на който ваши�т OpenErp  �ървър �ледва да бъде "
-"до�тъпен за крайни потребители.  Зави�и от топологи�та на вашата мрежа и "
-"на�тройки, и ще вли�е �амо на връзките показвани на потребителите. Форматът "
-"е HOST:PORT и по подразбиране  (localhost) един�твено е подход�щ за до�тъп "
-"от �ами� �ървър."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Преглед на файловете"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP �ървър"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "�а�тройки на FTP �ървър"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Разглеждане"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"�дре� на �ървъра или IP и порта, към който потребителите тр�бва да �е �върже "
-"за DMS за до�тъп"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Споделено храниилище (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "�дре�"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Преглед на FTP документи"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "�а�тройки на приложение З���ИЯ"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Преглед на документ"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Преглед на Документ"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Прогре� на на�тройките"
-
-#~ msgid "title"
-#~ msgstr "заглавие"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Интегриран FTP �ървър �ъ� �и�тема за управление на �ъдържанието"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Отказ"
diff --git a/addons/document_ftp/i18n/ca.po b/addons/document_ftp/i18n/ca.po
deleted file mode 100644
index f20d3846aa5..00000000000
--- a/addons/document_ftp/i18n/ca.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-15 16:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configura servidor FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuració automàtica de directoris"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indiqueu l'adreça de xarxa en la que el vostre servidor d'OpenERP hauria "
-"d'estar accessible per als usuaris finals. Això depèn de la vostra topologia "
-"de xarxa i configuració, i només afectara als enllaços mostrats als usuaris. "
-"El formato és SERVIDOR:PORT i el servidor per defecte (localhost) només és "
-"adequat per a l'accés des de la pròpia màquina del servidor."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Navega pels fitxers"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuració del servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Navega"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Adreça del servidor o IP i el port per accedir al sistema de gestió de "
-"documents."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Directorio compartido de documentos (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adreça"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Navega pels documents per FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuració aplicació del coneixement"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Navega pels documents"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Navega pels documents"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_continguts"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Proporciona una interfície FTP per al sistema de gestió de documents.\n"
-#~ "        A més de l'accés als documents a través d'OpenERP, aquest mòdul\n"
-#~ "        permet accedir als mateixos a través del sistema de fitxers "
-#~ "utilitzant un\n"
-#~ "        client FTP.\n"
-
-#~ msgid "Image"
-#~ msgstr "Imatge"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progrés de la configuració"
-
-#~ msgid "title"
-#~ msgstr "títol"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP integrado al sistema de gestión de documentos"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancel·la"
diff --git a/addons/document_ftp/i18n/cs.po b/addons/document_ftp/i18n/cs.po
deleted file mode 100644
index bef912784de..00000000000
--- a/addons/document_ftp/i18n/cs.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-04-06 06:13+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Konfigurovat FTP server"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Automatická konfigurace adresářů"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Zna�í adresu sítě, na které by měl být pro koncové uživatel dostupný váš "
-"OpenERP server. To závisí na vaší síťové topologii a nastavení a ovlivní to "
-"pouze odkazy zobrazené uživatelům. Formát je POĆ�TAČ:PORT a výchozí po�íta� "
-"(localhost) je vhodný pouze pro přístup ze samotného serveru."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Procházet soubory"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Konfigurace FTP serveru"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Procházet"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Adresa serveru nebo IP a port, ke kterému by se měli uživatelé připojit pro "
-"přístup DMS"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Sdílené úložiště (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresa"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Procházení FTP dokumentů"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Nastavení aplikace znalostí"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Procházení dokumentů"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Procházet dokument"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "Obrázek"
-
-#~ msgid "title"
-#~ msgstr "název"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "FTP server integrovaný s Document Management Systémem"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Storno"
diff --git a/addons/document_ftp/i18n/da.po b/addons/document_ftp/i18n/da.po
deleted file mode 100644
index 380ae5501a5..00000000000
--- a/addons/document_ftp/i18n/da.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-27 08:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr ""
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr ""
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
deleted file mode 100644
index 6f2b721af9c..00000000000
--- a/addons/document_ftp/i18n/de.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-18 06:50+0000\n"
-"Last-Translator: Ferdinand <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "FTP Server konfigurieren"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Auto Konfigurator Verzeichnisse"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Zeigt die Netzwerk IP Adresse über die der OpenERP Server für Endbenutzer "
-"erreicht werden kann. Diese Adresse hängt ab von der Architektur des "
-"Netzwerks und wird lediglich einen Einfluss auf die Anzeige der Adresse beim "
-"Benutzer haben. Das Format der Adresse ist HOST:PORT, wobei der Standard "
-"Host (localhost) lediglich gültig ist für einen direkten Zugriff vom Server "
-"selbst."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "Wissensdatenbank.Konfiguration.Einstellungen"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Dateien durchsuchen"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "URL klicken, um die Dokumente anzuzeigen"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP-Server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Konfiguration FTP-Server"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Dokumente anzeigen"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "Suchen"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Servername oder IP und Port über den Benutzer per FTP auf Dokumente zugreifen"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresse"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Suche per FTP-Dokument"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Knowledge-Anwendung konfigurieren"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Dokument suchen"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "oder"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Dokument suchen"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "_Cancel"
-#~ msgstr "Abbrechen"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Abfolge Konfiguration"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "title"
-#~ msgstr "Bezeichnung"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Diese Anwendung unterstützt einen Zugriff per FTP auf das "
-#~ "Dokumentenmanagement.\n"
-#~ "Hierdurch können Sie nicht nur durch OpenERP auf Dokumente zugreifen. \n"
-#~ "Sie können auch über den FTP Client Ihres Betriebssystems oder durch FTP "
-#~ "Anwendungen auf diese Dokumente zugreifen.\n"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Integration FTP Server in Dokumentenmanagement"
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
deleted file mode 100644
index 969bf4254b0..00000000000
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ /dev/null
@@ -1,117 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* document_ftp
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 17:05+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr ""
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr ""
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid "Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
-
diff --git a/addons/document_ftp/i18n/el.po b/addons/document_ftp/i18n/el.po
deleted file mode 100644
index a8eef082d25..00000000000
--- a/addons/document_ftp/i18n/el.po
+++ /dev/null
@@ -1,136 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-12 17:13+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Πε�ιήγηση στα Α�χεία"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Εξυπη�ετητής FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Πα�αμετ�οποίηση Διακομιστή FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Πε�ιήγηση"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Διε�θυνση"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
-
-#~ msgid "Image"
-#~ msgstr "Εικόνα"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Π�όοδος Πα�αμετ�οποίησης"
-
-#~ msgid "title"
-#~ msgstr "τίτλος"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Άκυ�ο"
diff --git a/addons/document_ftp/i18n/en_GB.po b/addons/document_ftp/i18n/en_GB.po
deleted file mode 100644
index 7cbc0e9457b..00000000000
--- a/addons/document_ftp/i18n/en_GB.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-08-25 17:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configure FTP Server"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Auto Directory Configuration"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Browse Files"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Click the url to browse the documents"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP Server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP Server Configuration"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Browse Documents"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Browse"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Server address or IP and port to which users should connect to for DMS access"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Shared Repository (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Address"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Cancel"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Document FTP Browse"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Knowledge Application Configuration"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Document Browse"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "or"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Browse Document"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configuration Progress"
-
-#~ msgid "title"
-#~ msgstr "title"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Integrated FTP Server with Document Management System"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancel"
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
deleted file mode 100644
index cffa3dcf7fa..00000000000
--- a/addons/document_ftp/i18n/es.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 22:05+0000\n"
-"Last-Translator: lambdasoftware <development@lambdasoftware.net>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuración automática de directorios"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indique la dirección de red en la cual su servidor de OpenERP debería estar "
-"accesible para los usuarios finales. Esto depende de su topología de red y "
-"configuración, y sólo afectará a los enlaces mostrados a los usuarios. El "
-"formato es SERVIDOR:PUERTO y el servidor por defecto (localhost) sólo es "
-"adecuado para el acceso desde la propia máquina del servidor."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "Parámetros de configuración de la base de conocimiento"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Navegar por los archivos"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Pulse sobre el enlace para acceder a los documentos"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración del servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Navegue por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Navegar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Dirección del servidor o IP y el puerto para acceder al sistema de gestión "
-"de documentos."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Directorio compartido de documentos (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Navegar por los documentos por FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuración aplicación del conocimiento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "o"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP integrado al sistema de gestión de documentos"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de la configuración"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Proporciona un interfaz FTP para el sistema de gestión de documentos.\n"
-#~ "        Además del acceso a los documentos a través de OpenERP, este módulo\n"
-#~ "        permite acceder a los mismos a través del sistema de archivos "
-#~ "utilizando un\n"
-#~ "        cliente FTP.\n"
diff --git a/addons/document_ftp/i18n/es_CR.po b/addons/document_ftp/i18n/es_CR.po
deleted file mode 100644
index 07f73dcde1e..00000000000
--- a/addons/document_ftp/i18n/es_CR.po
+++ /dev/null
@@ -1,162 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-13 19:19+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-"Language: es\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuración automática de directorios"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indique la dirección de red en la cual su servidor de OpenERP debería estar "
-"accesible para los usuarios finales. Esto depende de su topología de red y "
-"configuración, y sólo afectará a los enlaces mostrados a los usuarios. El "
-"formato es SERVIDOR:PUERTO y el servidor por defecto (localhost) sólo es "
-"adecuado para el acceso desde la propia máquina del servidor."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Navegar por los archivos"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración del servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Navegar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Dirección del servidor o IP y el puerto para acceder al sistema de gestión "
-"de documentos."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Directorio compartido de documentos (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Navegar por los documentos por FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuración aplicación del conocimiento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP integrado al sistema de gestión de documentos"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de la configuración"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Proporciona un interfaz FTP para el sistema de gestión de documentos.\n"
-#~ "        Además del acceso a los documentos a través de OpenERP, este módulo\n"
-#~ "        permite acceder a los mismos a través del sistema de archivos "
-#~ "utilizando un\n"
-#~ "        cliente FTP.\n"
diff --git a/addons/document_ftp/i18n/es_EC.po b/addons/document_ftp/i18n/es_EC.po
deleted file mode 100644
index bd175516183..00000000000
--- a/addons/document_ftp/i18n/es_EC.po
+++ /dev/null
@@ -1,158 +0,0 @@
-# Spanish (Ecuador) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-13 04:17+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
-"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuración automática de directorios"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indique la dirección de red en la cual su servidor de OpenERP debería estar "
-"disponible para los usuarios finales. Esto depende de su topología de red y "
-"configuración, y sólo afectará a los enlaces mostrados a los usuarios. El "
-"formato es ANFITRIÓN:PUERTO y el anfitrión por defecto (localhost) sólo es "
-"adecuado para acceso desde la propia máquina del servidor."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Examinar archivos"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración de Servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Examinar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr "Dirección del servidor o IP y el puerto para acceder al DMS."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Biblioteca compartida de módulos (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Examinar documento por FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuración aplicación del conocimiento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Examinar documento"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Examinar documento"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "Configurar Contenidos"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Un Interfaz FTP para el sistema de gestión de documentos.\n"
-#~ "        Además del acceso a documentos a través de OpenERP\n"
-#~ "        éste módulo permite acceder a los mismos a través del sistema de "
-#~ "archivos utilizando el\n"
-#~ "        Cliente FTP.\n"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de Configuración"
-
-#~ msgid "title"
-#~ msgstr "Título"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP integrado al sistema de gestión de documentos"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
diff --git a/addons/document_ftp/i18n/es_MX.po b/addons/document_ftp/i18n/es_MX.po
deleted file mode 100644
index 4c568d4513e..00000000000
--- a/addons/document_ftp/i18n/es_MX.po
+++ /dev/null
@@ -1,148 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 22:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuración automática de directorios"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indique la dirección de red en la cual su servidor de OpenERP debería estar "
-"accesible para los usuarios finales. Esto depende de su topología de red y "
-"configuración, y sólo afectará a los enlaces mostrados a los usuarios. El "
-"formato es SERVIDOR:PUERTO y el servidor por defecto (localhost) sólo es "
-"adecuado para el acceso desde la propia máquina del servidor."
-
-#. module: document_ftp
-#: field:document.ftp.configuration,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
-
-#. module: document_ftp
-#: model:ir.actions.url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Navegar por los archivos"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración del servidor FTP"
-
-#. module: document_ftp
-#: model:ir.module.module,description:document_ftp.module_meta_information
-msgid ""
-"This is a support FTP Interface with document management system.\n"
-"    With this module you would not only be able to access documents through "
-"OpenERP\n"
-"    but you would also be able to connect with them through the file system "
-"using the\n"
-"    FTP client.\n"
-msgstr ""
-"Proporciona un interfaz FTP para el sistema de gestión de documentos.\n"
-"        Además del acceso a los documentos a través de OpenERP, este módulo\n"
-"        permite acceder a los mismos a través del sistema de archivos "
-"utilizando un\n"
-"        cliente FTP.\n"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Navegar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Dirección del servidor o IP y el puerto para acceder al sistema de gestión "
-"de documentos."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Directorio compartido de documentos (FTP)"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor FTP"
-
-#. module: document_ftp
-#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
-msgid "Integrated FTP Server with Document Management System"
-msgstr "Servidor FTP integrado al sistema de gestión de documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "title"
-msgstr "título"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Navegar por los documentos por FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuración aplicación del conocimiento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
diff --git a/addons/document_ftp/i18n/es_PY.po b/addons/document_ftp/i18n/es_PY.po
deleted file mode 100644
index fe4663cb7da..00000000000
--- a/addons/document_ftp/i18n/es_PY.po
+++ /dev/null
@@ -1,155 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-21 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuración automática de carpetas"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Navegar por los archivos"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración del servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Navegar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Dirección del servidor o IP y el puerto para acceder al sistema de gestión "
-"de documentos."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Directorio compartido de documentos (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Navegar por los documentos por FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuración de la aplicación de conocimiento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Proporciona un interfaz FTP para el sistema de gestión de documentos.\n"
-#~ "        Además del acceso a los documentos a través de OpenERP, este módulo\n"
-#~ "        permite acceder a los mismos a través del sistema de archivos "
-#~ "utilizando un\n"
-#~ "        cliente FTP.\n"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de la configuración"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP integrado al sistema de gestión de documentos"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
diff --git a/addons/document_ftp/i18n/es_VE.po b/addons/document_ftp/i18n/es_VE.po
deleted file mode 100644
index 4c568d4513e..00000000000
--- a/addons/document_ftp/i18n/es_VE.po
+++ /dev/null
@@ -1,148 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 22:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuración automática de directorios"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indique la dirección de red en la cual su servidor de OpenERP debería estar "
-"accesible para los usuarios finales. Esto depende de su topología de red y "
-"configuración, y sólo afectará a los enlaces mostrados a los usuarios. El "
-"formato es SERVIDOR:PUERTO y el servidor por defecto (localhost) sólo es "
-"adecuado para el acceso desde la propia máquina del servidor."
-
-#. module: document_ftp
-#: field:document.ftp.configuration,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
-
-#. module: document_ftp
-#: model:ir.actions.url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Navegar por los archivos"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración del servidor FTP"
-
-#. module: document_ftp
-#: model:ir.module.module,description:document_ftp.module_meta_information
-msgid ""
-"This is a support FTP Interface with document management system.\n"
-"    With this module you would not only be able to access documents through "
-"OpenERP\n"
-"    but you would also be able to connect with them through the file system "
-"using the\n"
-"    FTP client.\n"
-msgstr ""
-"Proporciona un interfaz FTP para el sistema de gestión de documentos.\n"
-"        Además del acceso a los documentos a través de OpenERP, este módulo\n"
-"        permite acceder a los mismos a través del sistema de archivos "
-"utilizando un\n"
-"        cliente FTP.\n"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Navegar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Dirección del servidor o IP y el puerto para acceder al sistema de gestión "
-"de documentos."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Directorio compartido de documentos (FTP)"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor FTP"
-
-#. module: document_ftp
-#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
-msgid "Integrated FTP Server with Document Management System"
-msgstr "Servidor FTP integrado al sistema de gestión de documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "title"
-msgstr "título"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Navegar por los documentos por FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuración aplicación del conocimiento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Navegar por los documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
diff --git a/addons/document_ftp/i18n/et.po b/addons/document_ftp/i18n/et.po
deleted file mode 100644
index 71ce3cdb6c9..00000000000
--- a/addons/document_ftp/i18n/et.po
+++ /dev/null
@@ -1,133 +0,0 @@
-# Estonian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-10-11 18:05+0000\n"
-"Last-Translator: Aare Vesi <Unknown>\n"
-"Language-Team: Estonian <et@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Failide sirvimine"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP serveri konfiguratsioon"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Sirvi"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Aadress"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
-
-#~ msgid "Image"
-#~ msgstr "Pilt"
-
-#~ msgid "title"
-#~ msgstr "pealkiri"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Tühista"
diff --git a/addons/document_ftp/i18n/fi.po b/addons/document_ftp/i18n/fi.po
deleted file mode 100644
index 21154021e30..00000000000
--- a/addons/document_ftp/i18n/fi.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-06-27 06:20+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Konfiguroi FTP palvelin"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Automaattinen hakemistojen konfigurointi"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Selaa tiedostoja"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP-palvelin"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP palvelimen konfiguraatio"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "Selaa"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Palvelimen osoite tai IP ja portti mihin käyttäjien tulisi ottaa yhteyttä "
-"DMS:n käyttöä varten"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Jaettu tietolähde (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Osoite"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Dokumenttien FTP selailu"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Tiedonhallintaohjelmiston konfiguraatio"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Dokumenttien selailu"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Selaa dokumenttia"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfiguraation eteneminen"
-
-#~ msgid "title"
-#~ msgstr "otsikko"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr ""
-#~ "Integroitu FTP palvelin dokumenttienhallintajärjestelmällä varustettuna"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Peruuta"
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
deleted file mode 100644
index 67cd72ff873..00000000000
--- a/addons/document_ftp/i18n/fr.po
+++ /dev/null
@@ -1,163 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-29 10:19+0000\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurer le serveur FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuration automatique des répertoires"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indiquez l'adresse réseau sur laquelle votre serveur OpenERP doit être "
-"accessible pour les utilisateurs finaux. Ceci dépend de la topologie de "
-"votre réseau et de votre configuration, et il affectera seulement les liens "
-"affiché aux utilisateurs. Le format est HÔTE:PORT et l'hôte par défaut "
-"(localhost) est seulement approprié pour des accès depuis la machine du "
-"serveur."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Parcourir les fichiers"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Cliquer sur l'url pour parcourir les documents"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Serveur FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuration du serveur FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Parcourir les documents"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Parcourir"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Adresse du serveur ou adresse IP et port auquel les utilisateurs devraient "
-"se connecter pour l'accès au GED."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Répertoire partagé (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresse"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Parcourir les documents FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuration de l'application de gestion des connaissances"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Parcourez le document"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "ou"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Parcourir le document"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "title"
-#~ msgstr "Titre :"
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Avancement de la configuration"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Annuler"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Ce module est une interface compatible FTP ainsi qu'un système de gestion "
-#~ "documentaire.\n"
-#~ "    Avec ce module, vous pourrez non seulement accéder à des documents "
-#~ "partout dans OpenERP\n"
-#~ "    mais aussi vous connecter à ces documents à travers le système de "
-#~ "fichier en utilisant le \n"
-#~ "    client FTP.\n"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Serveur FTP intégré au système de gestion documentaire"
diff --git a/addons/document_ftp/i18n/gl.po b/addons/document_ftp/i18n/gl.po
deleted file mode 100644
index 907aae1db12..00000000000
--- a/addons/document_ftp/i18n/gl.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-24 01:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuración automática de directorios"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indique a dirección de rede na que o seu servidor de OpenERP debería estar "
-"dispoñible para os usuarios finais. Isto depende da topoloxía de rede e da "
-"configuración, e só afectará aos enlaces mostrados aos usuarios. O formato é "
-"ANFITRIÓN:PORTO e o anfitrión por defecto (localhost) só é adecuado para "
-"acceso desde a propia máquina do servidor."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Procurar arquivos"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuración de servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Explorar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Dirección do servidor ou IP e porto para que os usuarios podan conectar ao "
-"acceso DMS."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Repositorio compartido (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Enderezo"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Examinar documento por FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuración da aplicación do coñecemento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Examinar documento"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Examinar documento"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Esta é unha Interfaz FTP para o sistema de xestión de documentos.\n"
-#~ "        Con este módulo non podrías acceder aos documentos a través de "
-#~ "OpenERP\n"
-#~ "        sen embargo pódese conectar con el a través do sistema de arquivos "
-#~ "usando o cliente FTP\n"
-
-#~ msgid "Image"
-#~ msgstr "Imaxe"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso da Configuración"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP integrado con sistema de xestión de documentos"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
diff --git a/addons/document_ftp/i18n/hr.po b/addons/document_ftp/i18n/hr.po
deleted file mode 100644
index f72569a43d4..00000000000
--- a/addons/document_ftp/i18n/hr.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-28 20:42+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Postavke FTP poslužitelja"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Automatska postava mapa"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Predstavlja adresu na mreži, na kojoj bi OpenERP trebao biti dostupan "
-"krajnjim korisnicima. Ona ovisi o Vašoj topologiji mreže kao i postavkama, i "
-"utje�e jedino na linkove prikazane krajnjim korisnicima. Format zapisa je "
-"HOST:PORT a zadani host (localhost) korisi se jedino za pristup sa samog "
-"poslužitelja."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Pretraži datoteke"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Kliknite na poveznicu za pregled dokumenata"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP poslužitelj"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Postave FTP poslužitelja"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Pregled dokumenata"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Pregledaj"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"IP adresa i port na koji se korisnici spajaju na DMS (sustav upravljana "
-"dokumentima)"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Dijeljeni repozitorij (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "IP adresa"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Pregled dokumenata na FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Pregled dokumenta"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "ili"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Pregled dokumenta"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Odustani"
diff --git a/addons/document_ftp/i18n/hu.po b/addons/document_ftp/i18n/hu.po
deleted file mode 100644
index dce7675359f..00000000000
--- a/addons/document_ftp/i18n/hu.po
+++ /dev/null
@@ -1,136 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * document_ftp
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-03 12:46+0000\n"
-"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "FTP szerver beállítása"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Automatikus könyvtárbeállítás"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Hálózati címek megjelenítése melyen az OpenERP szervere elérhető a vég-"
-"felhasználók részére. Ez a hálózati beállítások topológiájától függ, és csak "
-"a felhasználóknak megjelenített elérési utakkat befolyásolja. A HOST:PORT "
-"forma és az alapértelmezett host (localhost) csak akkor megfelelő, ha a "
-"szerver maga az alapgép."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Fájlok böngészése"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Kattintson az URL elérési útra a dokumentum böngészéséhez"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP szerver"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP szerver konfiguráció"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Dokumantumok böngészése"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Böngészés"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Szerver cím vagy IP és port amelyen a felhasználónak kapcsolódnia kell a DMS "
-"eléréshez"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Megosztott (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Cím"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Documentum FTP böngészése"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Tudáskezelő programok beállítása"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Dokumentum böngészése"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "vagy"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Dokumentum böngészése"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "Kép"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Beállítás előrehaladása"
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
deleted file mode 100644
index 1c38e9ab6b9..00000000000
--- a/addons/document_ftp/i18n/it.po
+++ /dev/null
@@ -1,161 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-15 23:09+0000\n"
-"Last-Translator: Sergio Corato <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configura FTP server"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configurazione automatica Directory"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indica l'indirizzo di rete su cui i vostri server OpenERP possono essere "
-"disponibili all'utente finale. Questo dipende dalla topologia di rete e "
-"dalla configurazione, e interessa solamente i link visualizzati dagli "
-"utenti. Il formato è HOST:PORTA e il default host (localhost) è adatto "
-"solamente per l'accesso dal server su se stesso.."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Sfoglia files"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Cliccare l'url per sfogliare i documenti"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Server FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configurazione server FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Sfoglia Documenti"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Sfoglia"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Indirizzo Server o IP e porta a cui gli utenti dovrebbero connettersi per "
-"l'accesso al DMS"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Deposito condiviso (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Indirizzo"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Browse FTP documenti"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configurazione applicazione know how"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Sfoglia documento"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "o"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Sfoglia documento"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "title"
-#~ msgstr "titolo"
-
-#~ msgid "Image"
-#~ msgstr "Immagine"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Annulla"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Questo è un supporto all'interfaccia FTP con il Sistema di Gestione "
-#~ "Documentale.\n"
-#~ "    Con questo modulo non solo è possibile accedere ai documenti da OpenERP\n"
-#~ "    ma è altresì possibile connettersi ad esso tramite l'accesso ai files "
-#~ "direttamente\n"
-#~ "    via client FTP.\n"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "FTP server integrato con il Sistema di Gestione Documentale"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Avanzamento Configurazione"
diff --git a/addons/document_ftp/i18n/ja.po b/addons/document_ftp/i18n/ja.po
deleted file mode 100644
index c1cc07d3a1d..00000000000
--- a/addons/document_ftp/i18n/ja.po
+++ /dev/null
@@ -1,136 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-04-21 16:39+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "FTPサー�を設定�る"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "自動ディレクト�設定"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"ユーザ�アクセス�るOpenERPサー���ットワークアドレスを指定��下��。�れ��ットワークト�ロジ���設定�よ��決�り�ユーザ�表示�れるリン"
-"ク��り��。\r\n"
-"指定�形�� HOST:PORT ��り�デフォルト�ホスト（ローカルホスト）�サー��ら�アクセス�最も������。"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "ファイルをブラウズ�る"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTPサー�"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTPサー��設定"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_ブラウズ(_B)"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr "サー�アドレス�る��DMSアクセス����接続�るIP��ート"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "共有リプジトリ（FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "�所"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "FTP文書をブラウズ�る"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "知識アプリケーション�設定"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "文書をブラウズ�る"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "文書をブラウズ�る"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "画�"
-
-#~ msgid "title"
-#~ msgstr "タイトル"
-
-#~ msgid "_Cancel"
-#~ msgstr "キャンセル(_C)"
diff --git a/addons/document_ftp/i18n/mk.po b/addons/document_ftp/i18n/mk.po
deleted file mode 100644
index 49a929fbe89..00000000000
--- a/addons/document_ftp/i18n/mk.po
+++ /dev/null
@@ -1,130 +0,0 @@
-# Macedonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-07 07:50+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Macedonian <mk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Конфигурирај FTP �ервер"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "�втомат�ка конфигурација на директориум"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Ја покажува адре�ата на која OpenERP ќе биде до�тапен за крајните кори�ници. "
-"Ова зави�и од мрежната топологија и конфигурација и има влијание �амо врз "
-"линковите прикажани на кори�ниците. Форматот е HOST:PORT и �тандардниот хо�т "
-"(localhost) е за при�тап �амо преку �амиот �ервер.."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Прели�тување фајлови"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Кликни на url-то за прели�тување на документите"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP �ервер"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Конфигурација на FTP �ерверот"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Прели�тување документи"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Прегледај"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"�дре�а на �ерверот или IP и порт на кои кори�ниците �е поврзуваат за при�тап "
-"до DMS"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Заеднички магацин (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "�дре�а"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Откажи"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Прели�тување на документи преку FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Конфигурација за апликација Знаење"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Прели�тување на документи"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "или"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Прели�тај документ"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
diff --git a/addons/document_ftp/i18n/mn.po b/addons/document_ftp/i18n/mn.po
deleted file mode 100644
index d0c91660d1c..00000000000
--- a/addons/document_ftp/i18n/mn.po
+++ /dev/null
@@ -1,138 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-08-22 03:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "FTP Серв�р тохируулах"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "�втомат Директорын Тохиргоо"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Эц�ийн х�р�гл�гчидийн OpenERP-руу хандаж чадах �үлж��ний ха�гийг ил�рхийлн�. "
-"Эн� танай �үлж��ний бүт�ц, тохиргооноо� хамаарах бөгөөд зөвхөн х�р�гл�гчд�д "
-"харагдах холбоо�т л нөлөөт�й. Формат нь HOST:PORT г���н загвартай бөгөөд "
-"анхын host нь (localhost) г�ж байдаг нь зөвхөн �ервер машин д��р��� хандахад "
-"л тохирно."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Файлуудыг тольдох"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP Сервер"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP Серверийн тохиргоо"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Тольдох"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr "DMS хандалтаар хандах �ерверийн ха�г ��в�л IP болон порт."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "�гуулахыг хуваалцах (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Ха�г"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "FTP-��р баримт оруулах"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "М�дл�гийн Програмын Тохиргоо"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Баримт оруулах"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Оруулах баримт"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "title"
-#~ msgstr "гарчиг"
-
-#~ msgid "Image"
-#~ msgstr "Зураг"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Цуцлах"
diff --git a/addons/document_ftp/i18n/nb.po b/addons/document_ftp/i18n/nb.po
deleted file mode 100644
index ea35c028cb3..00000000000
--- a/addons/document_ftp/i18n/nb.po
+++ /dev/null
@@ -1,140 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-09-06 14:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Konfigurer FTP serveren"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Automatisk Katalog Konfigurasjon."
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indikere nettverksadressen som din OpenERP server bør være tilgjengelige for "
-"sluttbrukerne. Dette avhenger av nettverkstopologi og konfigurasjon, og vil "
-"bare påvirke lenker som vises til brukerne. Formatet er HOST: PORT og "
-"standard verten (lokalhost) er bare egnet for tilgang fra serveren maskinen "
-"selv .."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Bla i filer"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP-tjener"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP Serverkonfigurasjon"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Bla gjennom"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Server adresse eller IP og port til hvilke brukere som skal koble seg til "
-"for DMS tilgang"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Wikimedia Commons (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresse"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Document FTP Bla i."
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Kunnskap Programkonfigurasjon"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Dokument Bla i."
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Bla igjennom dokument"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_konfig_innhold"
-
-#~ msgid "Image"
-#~ msgstr "Bilde"
-
-#~ msgid "title"
-#~ msgstr "tittel"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Avbryt"
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
deleted file mode 100644
index af4b2c87b4a..00000000000
--- a/addons/document_ftp/i18n/nl.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-11-24 21:49+0000\n"
-"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "FTP Server configureren"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Auto map configuratie"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Geeft het netwerkadres aan waarop uw OpenERP server te vinden zou moeten "
-"zijn voor eindgebruikers. Dit hangt af van netwerk topologie en configuratie "
-"en zal alleen de link beïnvloeden die wordt getoond aan de gebruikers. Het "
-"formaat HOST:PORT en standaard host (localhost) zijn allen geschikt voor "
-"toegang vanaf de server machine zelf."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Bestanden bladeren"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Klik op de url om door de documenten te bladeren"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP server configuratie"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Blader door documenten"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Bladeren"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Server adres of IP en poort waarmee gebruikers moeten verbinden voor DMS "
-"toegang"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Gedeelde repository (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adres"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Document FTP bladeren"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Kennis applicatie configuratie"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Document bladeren"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "of"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Document bladeren"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Image"
-#~ msgstr "Afbeelding"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configuratie voortgang"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Annuleren"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Dit is een support FTP interface met documentbeheer systeem.\n"
-#~ "    Met deze module kunt u niet alleen documenten vanuit OpenERP benaderen,\n"
-#~ "    maar u kunt ze ook via bestandsbeheer benaderen met gebruikmaking van "
-#~ "een\n"
-#~ "    FTP client.\n"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Geïntegreerde FTP server met documentbeheer systeem"
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
deleted file mode 100644
index e1ffd17c130..00000000000
--- a/addons/document_ftp/i18n/pl.po
+++ /dev/null
@@ -1,142 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-07 20:16+0000\n"
-"Last-Translator: Andrzej Król <andrzej.krol@poczta.onet.eu>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Konfiguruj Serwer FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Autokonfiguracja katalogu"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Wskazuje adres sieciowy na którym twój serwer OpenERP powinien być dostępny "
-"dla użytkowników końcowych. To zależy od topologii sieci i ustawień i ma "
-"efekt tylko w odniesieniu do linków wyświetlanych użytkownikom. Format to "
-"HOST:PORT i domyślny (localhost) jest do użytku tylko z poziomu serwera."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "PrzeglÄ…daj pliki"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Kliknij adres url żeby przeglądać dokumenty"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Serwer FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Konfiguracja serwera FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "PrzeglÄ…daj Dokumenty"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_PrzeglÄ…daj"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Adres serwera lub IP i port do którego użytkownik powinien się podłączyć dla "
-"dostępu do DMS (System Zarządzania Dokumentami)."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Współdzielone repozytorium (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresy"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "FTP PrzeglÄ…daj dokument"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Konfiguracja aplikacji wiedzy"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Przeglądanie dokumentów"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "lub"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "PrzeglÄ…daj dokumenty"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "title"
-#~ msgstr "tytuł"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Postęp konfiguracji"
-
-#~ msgid "Image"
-#~ msgstr "Obraz"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Anuluj"
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
deleted file mode 100644
index 60d4a649ea4..00000000000
--- a/addons/document_ftp/i18n/pt.po
+++ /dev/null
@@ -1,159 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 17:33+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar servidor de FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuração automática de diretórios"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indicar o endereço de rede em que o servidor OpenERP deve ser acedido por "
-"utilizadores finais. Isso depende da topologia da rede e configuração, e só "
-"vai afectar os links exibidos aos utilizadores. O formato é HOST:PORT e o "
-"host padrão (localhost) só é adequado para o acesso da máquina do servidor "
-"em si.."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Procurar Ficheiros"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Carregue no URL para percorrer os documentos"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuração do servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Percorrer os documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Procurar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Endereço do servidor ou IP e a porta à qual os utilizadores devem se conetar "
-"para acesso DMS"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Repositório Partilhado (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Endereço"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Procurar Documento FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuração da Aplicação do conhecimento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Pesquisar Documento"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "ou"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Procurar Documento"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Processo de configuração"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP integrado com sistema de gestão documental"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Isto é um interface entre o FTP e a gestão documental\n"
-#~ "    Com este módulo, não só será possível aceder a dcoumentos através do "
-#~ "openERP\n"
-#~ "    como também será possível ligar-se aos mesmos através de um cliente FTP\n"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "title"
-#~ msgstr "Título"
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
deleted file mode 100644
index a1e1d7ee159..00000000000
--- a/addons/document_ftp/i18n/pt_BR.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# Renato Lima <renatonlima@gmail.com>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-10 15:06+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configurar Servidor de FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configuração Automática de Diretório"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indique o endereço em que seu servidor OpenERP deve ser acessível para  os "
-"usuários finais. Isso depende da sua topologia de rede e configuração. O "
-"formato é HOST:PORT e o host padrão (localhost) é adequado apenas para  "
-"acesso a partir  da máquina própria maquina.."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Navegar pelos Arquivos"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Clique na url para navegar pelos documentos"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Servidor FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configuração do Servidor FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Navegar pelos Documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "(_B) Navegar"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"O endereço do servidor ou IP e porta que o usuário deve conectar para acesso "
-"DMS."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Repositório Compartilhado (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Endereço"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Navegador FTP de Documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configuração da Aplicação de Conhecimento"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Navegador de Documentos"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "ou"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Navegar por Documentos"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Esta é uma interface de suporte a FTP com Sistema de Gestão de Documentos.\n"
-#~ "    Com este módulo você não só seria capaz de acessar documentos através do "
-#~ "OpenERP\n"
-#~ "    mas você também poderia acessar os documentos através do sistema de "
-#~ "arquivos usando o\n"
-#~ "    cliente FTP.\n"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configuração em Progresso"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Servidor FTP Integrado com Sistema de Gestão de Documentos"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "title"
-#~ msgstr "título"
diff --git a/addons/document_ftp/i18n/ro.po b/addons/document_ftp/i18n/ro.po
deleted file mode 100644
index 3925b0bf006..00000000000
--- a/addons/document_ftp/i18n/ro.po
+++ /dev/null
@@ -1,161 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-04 13:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Configureaza Serverul FTP"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Configurare Director Automata"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Indica adresa retelei la care serverul OpenERP ar trebui sa fie accesibil "
-"utilizatorilor finali. Aceasta depinde de topologia si configurarea retelei "
-"dumneavoastra, si va afecta doar link-urile afisate utilizatorilor. Formatul "
-"este HOST:PORT, iar gazda predenifinta (localhost) (gazda locala) este "
-"potrivita doar pentru accesul de la server.."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "cunostinte.config.setari"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Rasfoieste fisiere"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Faceti click pe url pentru a cauta documentele"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Server FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Configurare Server FTP"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Cautare Documente"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Rasfoieste"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Adresa serverului sau IP-ul si portul la care utilizatorii ar trebui sa se "
-"conecteze pentru acces DMS"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Depozit comun (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresa"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Anuleaza"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Rasfoieste Documentul FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Configurare Aplicare Cunostinte"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Rasfoire document"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "sau"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Rasfoieste Documentul"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_continuturi"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Aceasta este o Interfata FTP suport cu sistemul managementului "
-#~ "documentelor.\n"
-#~ "    Cu acest modul veti putea nu doar sa accesati documente prin OpenERP, "
-#~ "ci\n"
-#~ "    va veti putea si conecta la ele prin sistemul de fisiere folosind\n"
-#~ "    clientul FTP.\n"
-
-#~ msgid "Image"
-#~ msgstr "Imagine"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progres configurare"
-
-#~ msgid "title"
-#~ msgstr "titlu"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Server FTP integrat cu Sistemul Managementului Documentelor"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Anuleaza"
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
deleted file mode 100644
index d800bc2ccc6..00000000000
--- a/addons/document_ftp/i18n/ru.po
+++ /dev/null
@@ -1,160 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 12:44+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "�а�тройка FTP �ервера"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "�втоматиче�ка� на�тройка каталога"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Указывает �етевой адре�, на котором �ервер OpenERP должен быть до�тупен дл� "
-"конечных пользователей. Это зави�ит от конфигурации и топологии �ети и "
-"вли�ет только на отображение ��ылок. Формат �ДРЕС:ПОРТ и адре� по умолчанию "
-"(localhost) подходит только дл� до�тупа � �амого �ервера."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Про�мотр файлов"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Щелкните URL-адре� дл� про�мотра документов"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP Сервер"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "�а�тройка FTP �ервера"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Про�мотр документов"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Обзор"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"�дре� �ервера или IP и порт дл� �оединени� пользовател� и до�тупа к "
-"документам"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Общее хранилище (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "�дре�"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Про�мотр документа через FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "�а�тройка приложени� Знани�"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Про�мотр документа"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "или"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Про�мотр документа"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Выполнение на�тройки"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Сервер FTP интегрированный  � �и�темой управлени� документами"
-
-#~ msgid "title"
-#~ msgstr "title"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Отмена"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Это поддержка интерфей�а FTP к �и�теме управлени� документами.\n"
-#~ "    С помощью �того модул� вы не только получите до�туп к документам через "
-#~ "OpenERP,\n"
-#~ "    но вы также �можете �оедин�ть�� � ней через файловую �и�тему, и�пользу� "
-#~ "\n"
-#~ "    FTP-клиент.\n"
diff --git a/addons/document_ftp/i18n/sk.po b/addons/document_ftp/i18n/sk.po
deleted file mode 100644
index 658a361ecd1..00000000000
--- a/addons/document_ftp/i18n/sk.po
+++ /dev/null
@@ -1,127 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-06-09 09:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Prehľadávať súbory"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP Server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Nastavenia FTP Servera"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr ""
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresa"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
-
-#~ msgid "Image"
-#~ msgstr "Obrázok"
diff --git a/addons/document_ftp/i18n/sl.po b/addons/document_ftp/i18n/sl.po
deleted file mode 100644
index 3b245ddc09f..00000000000
--- a/addons/document_ftp/i18n/sl.po
+++ /dev/null
@@ -1,139 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-10-19 07:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Konfiguriraj FTP strežnik"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Avto konfiguracija map"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Dolo�a omrežni naslov, na katerem bo dosegljiv vaš OpenERP server za kon�ne "
-"uporabnike. To je odvisno od topologije in nastavitev vašega omrežja. Vpliva "
-"samo na povezavo, ki se izpiše uporabniku. Format je HOST:PORT in privzeti "
-"strežnik (localhost) je primeren samo za dostop iz serverja samega."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Brskanje Datoteke"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Potrdite url za brskanje po dokumentih"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "Strežnik FTP"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Konfiguracija FTP strežnika"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "brskanje po dokumentih"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Prebrskaj"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Naslov strežnika ali IP in vrata, na katerega se bodo uporabniki povezali za "
-"DMS dostop"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Deljeni repozitorij (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Naslov"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Preklic"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "FTP brskanje po dokumentih"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Nastavitev aplikacije znanja"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Brskanje po dokumentih"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "ali"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Brskanje po dokumentu"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Prekli�i"
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
deleted file mode 100644
index 347d5aa9218..00000000000
--- a/addons/document_ftp/i18n/sr.po
+++ /dev/null
@@ -1,156 +0,0 @@
-# Serbian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-11-14 08:02+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Auto Podesavanje dIrektorijuma"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Pretrazi fajlove"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP Server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "KOnfiguracija FTP Servera"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Browse"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Adresa Servera ili IP i Port na koji bi korisnik trebalo da se konektuje za "
-"DMS pristup"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Deljeno skladiste (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "FTP pretrazi Dokumente"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Pretrazi Dokumente"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Pretrazi Dokument"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "title"
-#~ msgstr "Naslov"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfiguracioni Proces"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancel"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Ovo podrzava FTP Interfejs sa dokument menadzment sistemom.\n"
-#~ "    Sa ovim modulom necete biti u mogucnosti da samo pristupite dokumentima "
-#~ "kroz OpenERP\n"
-#~ "    nego ce te takodje moci da se konektujete uz pomoc modula kroz fajl "
-#~ "sistem koristeci\n"
-#~ "    FTP klijenta.\n"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Integrisani FTP Server sa Dokument Menadzment Sistemom"
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
deleted file mode 100644
index aea6e2f32bc..00000000000
--- a/addons/document_ftp/i18n/sr@latin.po
+++ /dev/null
@@ -1,161 +0,0 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-04-05 15:29+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Podesi FTP server"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Auto-podešavanje direktorijuma"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Odredite adresu mreže na koju bi Vaši OpenERP server trebalo da bude "
-"dostupan za kona�ne korisnike. Ovo zavisi od Vaše mrežne toplogije i "
-"podešavanja, i neće imati uticaja na linkove prikazane korisnicima. Format "
-"je HOST:PORT i domaćin po defaultu (localhost) je jedino prikladan za "
-"pristup na server sa same mašine."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Pretraži datoteke"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP Server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "Podešavanje FTP servera"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Pretraži"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Adresa Servera ili IP i Port na koji bi korisnik trebalo da se konektuje za "
-"DMS pristup"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Deljeno skladište"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adresa"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Pretraži FTP dokumente"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Podešavanje aplikacije znanja"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Pretrazi Dokumente"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Pretraži dokumenta"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfiguracioni Proces"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Ovo podrzava FTP Interfejs sa dokument menadzment sistemom.\n"
-#~ "    Sa ovim modulom necete biti u mogucnosti da samo pristupite dokumentima "
-#~ "kroz OpenERP\n"
-#~ "    nego ce te takodje moci da se konektujete uz pomoc modula kroz fajl "
-#~ "sistem koristeci\n"
-#~ "    FTP klijenta.\n"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Integrisani FTP Server sa Dokument Menadzment Sistemom"
-
-#~ msgid "title"
-#~ msgstr "naslov"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Otkaži"
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
deleted file mode 100644
index c3ccbceeb70..00000000000
--- a/addons/document_ftp/i18n/sv.po
+++ /dev/null
@@ -1,143 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-15 11:23+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "Konfigurera FTP-servern"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Automatisk katalogkonfiguration"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"Ange nätverksadressen som din OpenERP servern ska vara nåbar på för "
-"slutanvändare. Det beror på ditt nätverk topologi och konfiguration, och "
-"kommer endast att påverka hur länkarna visas för användarna. Formatet är "
-"värd: PORT och förvald värd (localhost) är endast lämplig för åtkomst från "
-"servern själva maskinen .."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Bläddra bland filer"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP-server"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP-serverkonfiguration"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Bläddra"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"Serveradress eller IP och den port som användarna ska ansluta till för DMS-"
-"tillgång"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Delat arkiv (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adress"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "Bläddra bland dokumenten via FTP"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Konfiguration av kunskapshanteringsapplikationen"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Dokumentbläddring"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Bläddra bland dokument"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfigurationsförlopp"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Avbryt"
diff --git a/addons/document_ftp/i18n/tr.po b/addons/document_ftp/i18n/tr.po
deleted file mode 100644
index 8da0245b745..00000000000
--- a/addons/document_ftp/i18n/tr.po
+++ /dev/null
@@ -1,158 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-06-23 19:32+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "FTP Sunucusunu Yapılandır"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "Otomatik Klasör Yapılandırması"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"OpenERP sunucusunda son kullanıcıların erişebileceği ağ adresini belirtir. "
-"Bu, ağ yapınıza ve yapılandırmasına bağlıdır ve yalnızca kullanıcılara "
-"gösterilen ağları etkiler. Formatı HOST:PORT şeklindedir ve varsayılan "
-"sunucu (localhost) yalnızca sunucu cihazından erişim için uygundur."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "Dosyalara Gözat"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "Dökümanları incelemek için adrese tıklayın"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP Sunucusu"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP Sunucusu Yapılandırması"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "Dökümanları İncele"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "_Gözat"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-"DMS erişimi için kullanıcıların bağlanacağı sunucu adresi ya da IP ve "
-"bağlantı noktasıdır."
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "Paylaşılan Havuz (FTP)"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "Adres"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "Ä°ptal"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "FTP BelgeTaraması"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "Bilgi Birikimi Uygulama Ayarları"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "Belge Tarama"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "ya da"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "Belge Tara"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr ""
-#~ "Bu bir belge yönetim sistemli destek FTP Arayüzüdür.\n"
-#~ "    Bu modül ile yalnızca OpenERP nin içinden belgelere erişmekle kalmayıp \n"
-#~ "    FTP istemcisini kullanarak dosya sistemi içinden de \n"
-#~ "    baÄŸlanabileceksiniz.\n"
-
-#~ msgid "Image"
-#~ msgstr "Resim"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Yapılandırma Gelişimi"
-
-#~ msgid "title"
-#~ msgstr "unvan"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "Belge Yönetim Sistemi ile entegre FTP Sunucusu"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Vazgeç"
diff --git a/addons/document_ftp/i18n/vi.po b/addons/document_ftp/i18n/vi.po
deleted file mode 100644
index 143fb382ba5..00000000000
--- a/addons/document_ftp/i18n/vi.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-17 09:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr ""
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr ""
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr ""
diff --git a/addons/document_ftp/i18n/zh_CN.po b/addons/document_ftp/i18n/zh_CN.po
deleted file mode 100644
index 321cf5115e5..00000000000
--- a/addons/document_ftp/i18n/zh_CN.po
+++ /dev/null
@@ -1,150 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-21 15:11+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "�置 FTP �务器"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "自动目录设置"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"输入你的最终用户用于连接你OpenERP�务器的网�。基于你的网络�置，会影�客户端显示的链接。格�是：主机:端�。注�localhost�是在�务器本机"
-"�有用的。"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr "knowledge.config.settings"
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "�览文件"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr "点击 urk ��览文档"
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP �务器"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP �务器设置"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr "�览文档"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "�览(_B)"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr "�务器地�或IP地�，以�端�。用于用户连接文档管�系统。"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "共享仓库（FTP）"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "地�"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr "�消"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "文档 FTP �览"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "知识管�应用设置"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "文档�览"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr "或"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "�览文档"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "图�"
-
-#~ msgid "title"
-#~ msgstr "标题"
-
-#~ msgid "Integrated FTP Server with Document Management System"
-#~ msgstr "整� FTP �务器与文档管�系统"
-
-#~ msgid "_Cancel"
-#~ msgstr "�消(_C)"
-
-#~ msgid ""
-#~ "This is a support FTP Interface with document management system.\n"
-#~ "    With this module you would not only be able to access documents through "
-#~ "OpenERP\n"
-#~ "    but you would also be able to connect with them through the file system "
-#~ "using the\n"
-#~ "    FTP client.\n"
-#~ msgstr "此模�为文档管�增加了FTP支�。安装了这个模�你�仅�以在OpenERP里访问文档还能通过FTP客户端在文件系统上访问这些文件。\n"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "设置进度"
diff --git a/addons/document_ftp/i18n/zh_TW.po b/addons/document_ftp/i18n/zh_TW.po
deleted file mode 100644
index b78383f24a4..00000000000
--- a/addons/document_ftp/i18n/zh_TW.po
+++ /dev/null
@@ -1,135 +0,0 @@
-# Chinese (Traditional) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-08-29 09:46+0000\n"
-"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:43+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Configure FTP Server"
-msgstr "設置FTP 伺�器"
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_configuration
-msgid "Auto Directory Configuration"
-msgstr "自動目錄�置"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid ""
-"Indicate the network address on which your OpenERP server should be "
-"reachable for end-users. This depends on your network topology and "
-"configuration, and will only affect the links displayed to the users. The "
-"format is HOST:PORT and the default host (localhost) is only suitable for "
-"access from the server machine itself.."
-msgstr ""
-"說明OpenERP的�務器上的網絡地�應該為最終用戶訪�。這�決於您的網絡拓撲和�置，而且�會影響顯示給用戶的�接。的格�為HOST：PORT和�設的主機"
-"（localhost）的訪�從�務器本身���.."
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_knowledge_config_settings
-msgid "knowledge.config.settings"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.actions.act_url,name:document_ftp.action_document_browse
-msgid "Browse Files"
-msgstr "�覽檔案"
-
-#. module: document_ftp
-#: help:knowledge.config.settings,document_ftp_url:0
-msgid "Click the url to browse the documents"
-msgstr ""
-
-#. module: document_ftp
-#: field:document.ftp.browse,url:0
-msgid "FTP Server"
-msgstr "FTP 伺�器"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
-msgid "FTP Server Configuration"
-msgstr "FTP Server Configuration"
-
-#. module: document_ftp
-#: field:knowledge.config.settings,document_ftp_url:0
-msgid "Browse Documents"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "_Browse"
-msgstr "�覽(_B)"
-
-#. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid ""
-"Server address or IP and port to which users should connect to for DMS access"
-msgstr "�務器地�或IP地�和端�，用戶應該連接到DMS訪�"
-
-#. module: document_ftp
-#: model:ir.ui.menu,name:document_ftp.menu_document_browse
-msgid "Shared Repository (FTP)"
-msgstr "供享的儲存庫"
-
-#. module: document_ftp
-#: field:document.ftp.configuration,host:0
-msgid "Address"
-msgstr "地�"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Cancel"
-msgstr ""
-
-#. module: document_ftp
-#: model:ir.model,name:document_ftp.model_document_ftp_browse
-msgid "Document FTP Browse"
-msgstr "�覽FTP文件"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
-msgstr "知識應用�置"
-
-#. module: document_ftp
-#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
-msgid "Document Browse"
-msgstr "文件�覽"
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "or"
-msgstr ""
-
-#. module: document_ftp
-#: view:document.ftp.browse:0
-msgid "Browse Document"
-msgstr "�覽文件"
-
-#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#~ msgid "Image"
-#~ msgstr "圖�"
-
-#~ msgid "title"
-#~ msgstr "標題"
-
-#~ msgid "_Cancel"
-#~ msgstr "�消(_C)"
diff --git a/addons/document_ftp/res_config_view.xml b/addons/document_ftp/res_config_view.xml
deleted file mode 100644
index b571a4bb004..00000000000
--- a/addons/document_ftp/res_config_view.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_document_ftp_configuration" model="ir.ui.view">
-            <field name="name">Knowledge Application</field>
-            <field name="model">knowledge.config.settings</field>
-            <field name="inherit_id" ref="knowledge.view_knowledge_configuration"/>
-            <field name="arch" type="xml">
-                 <xpath expr="//div[@name='module_document_ftp']" position="after">
-                    <field name="document_ftp_url" widget="url"/>
-                 </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/document_ftp/security/ir.model.access.csv b/addons/document_ftp/security/ir.model.access.csv
deleted file mode 100644
index 4a08a4aa60d..00000000000
--- a/addons/document_ftp/security/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/document_ftp/test/document_ftp_test.yml b/addons/document_ftp/test/document_ftp_test.yml
deleted file mode 100644
index fafd5026ebf..00000000000
--- a/addons/document_ftp/test/document_ftp_test.yml
+++ /dev/null
@@ -1,87 +0,0 @@
--   |
-    In order to test the document_ftp module in OpenERP, I will try different operations on the FTP interface and check their impacts on OpenERP's documents and vice-versa.
--
-    In order to test the behaviour of resource Directory, I will make one resource Directory "Labels" in OpenERP having type "Other Resources" and Directory mapped to object "Partner"
--
-    !record {model: 'document.directory', id: dir_label}:
-        name : "Labels"
-        storage_id : document.storage_default
-        type : ressource
-        content_ids:
-            - name: "Label"
-              report_id :  base.res_partner_address_report
--
-    Assign "res.partner" object to ressource_type_id. 
--
-    !python {model: document.directory}: |
-        ids = self.pool.get('ir.model').search(cr, uid, [('model','=','res.partner')])
-        id = self.write(cr, uid, [ref("dir_label")], {'ressource_type_id' : ids[0]}, context)
--
-    In order to check static directory in OpenERP which is the real directory just like system's local folders, 
-    First I create a directory in OpenERP named "Directory 1" with storage as "Default File storage" and type as "Static Directory"
--
-    !record {model: 'document.directory', id: directory_file}:
-        name : "File"
-        storage_id : document.storage_default
-        type : directory
--
-    I am create one Document name "Document" and select "File" as its Directory,
--
-    When I am creating the record, "Resource Title" is filled automatic with "Document".
--
-    !record {model: 'ir.attachment', id: document_1}:
-        name : "Document"
-        parent_id : directory_file
--
-    In order to connect FTP server and set "File" path,
-    I create one directory "New" in "File" directory from FTP and check its effect in OpenERP.
--
-    Also Rename the directory name "New" to "New Directory".
--
-    Remove directory "New Directory" and remove file "Document".
--
-    !python {model: ir.attachment}: |
-        from ftplib import FTP
-        from openerp.tools.misc import detect_ip_addr
-        from openerp.tools import config
-        ftp = FTP()
-        if detect_ip_addr:
-            host = config.get('ftp_server_host', detect_ip_addr())
-        else:
-            host = config.get('ftp_server_host', '127.0.0.1')
-        port = config.get('ftp_server_port','8021')
-        ftp.connect(host,port)
-        user = self.pool.get('res.users').read(cr, uid, uid, context)        
-        ftp.login(user.get('login',''),user.get('password',''))
-        ftp.cwd("/" + cr.dbname+"/Documents/File/")
-        ftp.mkd("New")
-        ftp.rename('New','New Directory')
-        ftp.cwd("/" + cr.dbname+"/Documents/File/")
-        ftp.rmd('New Directory')
-        ftp.delete('Document')
-        ftp.quit()
--
-    In order to check directory created from FTP is working perfectly
--
-    Now I will test the same for Resource directory which is mapped with OpenERP object. 
-    When you open this directory from FTP clients, it displays each record of mapped resource object as directory.
--
-    Now I test FTP client and Open the "Labels" Directory to check Resource Directory in FTP.
-    I can see that all Labels of OpenERP are shown as children of "Labels" in FTP client as Directories.
--
-    !python {model: ir.attachment}: |
-        from ftplib import FTP
-        from openerp.tools.misc import detect_ip_addr
-        from openerp.tools import config
-        ftp = FTP()
-        if detect_ip_addr:
-            host = config.get('ftp_server_host', detect_ip_addr())
-        else:
-            host = config.get('ftp_server_host', '127.0.0.1')
-        port = config.get('ftp_server_port','8021')
-        ftp.connect(host,port)
-        user = self.pool.get('res.users').read(cr, uid, uid, context)        
-        ftp.login(user.get('login',''),user.get('password',''))
-        ftp.cwd("/" + cr.dbname+"/Documents/Labels/")
--
-    I make sure that I Open Labels Directory successfully.
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
deleted file mode 100644
index ce8e25906d2..00000000000
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ /dev/null
@@ -1,289 +0,0 @@
--
-    In order to test the document_ftp functionality
--
-    I open the 8021 port and see for ftp presence there
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_plain_ftp(timeout=2.0)
-        assert ftp.sock and (ftp.lastresp == '220'), ftp.lastresp
-        ftp.close()
--
-    I read the list of databases at port 8021 and confirm our db is
-    there
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_login(cr, uid, self)
-        assert cr.dbname in ftp.nlst("/")
-        ftp.close()
--
-    I try to locate the default "Documents" folder in the db.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_login(cr, uid, self)
-        ftp.cwd('Documents')
-        ftp.close()
--
-    I create a "test.txt" file at the server (directly). The file
-    should have the "abcd" content
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        fdata = StringIO('abcd')
-        ftp.storbinary('STOR test.txt', fdata)
-        ftp.close()
--
-    I look for the "test.txt" file at the server
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        assert ftp.nlst("test.txt") == ['test.txt']
-        ftp.close()
--
-    I check that the content of "test.txt" is "abcd"
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        gotdata = te.get_ftp_fulldata(ftp, "test.txt")
-        ftp.close()
-        assert gotdata == 'abcd', 'Data: %r' % gotdata
--
-    I append the string 'defgh' to "test.txt"
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        fdata = StringIO('defgh')
-        ftp.storbinary('APPE test.txt', fdata)
-        ftp.close()
--
-    I check that the content of "text.txt" is 'abcddefgh'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        gotdata = te.get_ftp_fulldata(ftp, "test.txt")
-        ftp.close()
-        assert gotdata == 'abcddefgh', 'Data: %r' % gotdata
--
-    I try to cd into an non-existing folder 'Not-This'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        import ftplib
-        ftp = te.get_ftp_login(cr, uid, self)
-        try:
-            ftp.cwd('/Not-This')
-            assert False, "We should't be able to change here"
-        except ftplib.error_perm:
-            pass
-        except OSError, err:
-            ftp.close()
-            assert err.errno == 2, err.errno
-        ftp.close()
--
-    I create a "test2.txt" file through FTP.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        fdata = StringIO('abcd')
-        ftp.storbinary('STOR test2.txt', fdata)
-        ftp.close()
--
-    I look for the "test2.txt" file at the server
--
-    !python {model: ir.attachment }: |
-        cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
-        ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
-        assert ids, "No test2.txt file found."
--
-    I delete the "test2.txt" file using FTP.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.delete('test2.txt')
-        ftp.close()
--
-    I check at the server that test2.txt is deleted
--
-    !python {model: ir.attachment }: |
-        cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
-        ids = self.search(cr, uid, [('name', '=', 'test2.txt')])
-        assert not ids, "test2.txt file can still be found."
--
-    I create a test2.txt file again.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        fdata = StringIO('abcd')
-        ftp.storbinary('STOR test2.txt', fdata)
-        ftp.close()
-        cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
--
-    I delete the test2.txt from the server (RPC).
--
-    !delete { model: ir.attachment, id:,  search: "[('name','=','test2.txt')]" }
--
-    I also commit, because ftp would run in a different transaction.
--
-    !python {model: ir.attachment}: |
-        cr.commit()
--
-    I check through FTP that test2.txt does not appear.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        import ftplib
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        try:
-            nlst_result = ftp.nlst("test2.txt")
-        except ftplib.error_perm: # 550 error: 'path not exists'
-            nlst_result = []
-        assert "test2.txt" not in nlst_result, "Files: %r" % nlst_result
-        ftp.close()
--
-    I create a "test-name.txt" file
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        fdata = StringIO('abcd')
-        ftp.storbinary('STOR test-name.txt', fdata)
-        ftp.close()
--
-    I rename the "test-name.txt" file through ftp.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.rename("test-name.txt", "test-renamed.txt")
-        ftp.close()
--
-    I check that test-name.txt has been renamed.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from ftplib import error_perm
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        try:
-            res = ftp.nlst("test-name.txt")
-            assert res == [], "File has not been renamed!"
-        except error_perm, e:
-            pass
-        assert ftp.nlst("test-renamed.txt") == ['test-renamed.txt']
-        ftp.close()
--
-    I create a new folder 'Test-Folder2' through FTP
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.mkd("Test-Folder2")
-        ftp.close()
--
-    I create a file 'test3.txt' at the 'Test-Folder2'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
-        fdata = StringIO('abcd')
-        ftp.storbinary('STOR test3.txt', fdata)
-        ftp.close()
--
-    I try to retrieve test3.txt
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
-        assert ftp.nlst("test3.txt") == ['test3.txt'], "File test3.txt is not there!"
-        ftp.close()
--
-    I create a new folder, 'Test-Folder3', through FTP
-    I try to move test3.txt to 'Test-Folder3'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.mkd("Test-Folder3")
-        ftp.close()
-        # TODO move
--
-    I remove the 'Test-Folder3'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.rmd("Test-Folder3")
-        ftp.close()
--
-    I check that test3.txt is removed.
--
-    I create 5 files through FTP
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
-        fdata = StringIO('abcd')
-        for i in range(0, 5):
-            fdata.seek(0)
-            ftp.storbinary('STOR test-name%s.txt' %i, fdata)
-        ftp.close()
--
-    I list the 5 files, check speed
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
-        assert len(ftp.nlst()) >= 5, "We haven't managed to store 5 files!"
--
-    I read the 5 files, check speed
--
-    I move the 5 files to 'Test-Folder2'
--
-    I delete the 5 files
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Test-Folder2')
-        ftp.delete('test3.txt')
-        for i in range(0, 5):
-            ftp.delete('test-name%s.txt' %i)
-        ftp.close()
- 
--
-    I delete the "test.txt" and "test-renamed.txt" file        
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.delete('test.txt')
-        ftp.delete('test-renamed.txt')
-        ftp.close()
--
-    I remove the 'Test-Folder2'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.rmd("Test-Folder2")
-        ftp.close()
diff --git a/addons/document_ftp/test/document_ftp_test3.yml b/addons/document_ftp/test/document_ftp_test3.yml
deleted file mode 100644
index a51f259f44e..00000000000
--- a/addons/document_ftp/test/document_ftp_test3.yml
+++ /dev/null
@@ -1,92 +0,0 @@
--
-    In order to check international character functionality
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_plain_ftp(timeout=1.0)
--
-    I create in the server a folder called 'Äïêéìáóôéêüò ÖÜêåëëïò'
--
-    !record {model: document.directory, id: dir_itests }:
-        name: 'Äïêéìáóôéêüò ÖÜêåëëïò'
-        parent_id: document.dir_root
--
-    And then I create another folder, under it, through FTP
--
-    !python {model: ir.attachment}: |
-        cr.commit()
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò')
-        ftp.mkd("ÖÜêåëëïò áðü êÜôù")
--
-    I check that this folder exists at the server
--
-    !assert {model: document.directory, id: , search: "[('name','=','ÖÜêåëëïò áðü êÜôù')]" }:
-      - parent_id != False
--
-    I login with FTP and check that 'Äïêéìáóôéêüò ÖÜêåëëïò' is there
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
--
-    I create a file named 'ÄïêéìÞ' into that folder
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
-        fdata = StringIO('êåßìåíï ìå utf-8')
-        ftp.storbinary('STOR ÄïêéìÞ.txt', fdata)
--
-    I remove the 'ÄïêéìÞ.txt' file
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/ÖÜêåëëïò áðü êÜôù')
-        ftp.delete('ÄïêéìÞ.txt')
--
-    I rename 'ÖÜêåëëïò áðü êÜôù' into 'Üëëïò'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò')
-        ftp.rename("ÖÜêåëëïò áðü êÜôù", "Üëëïò")
--
-    I place a file 'file Ö3' in 'Üëëïò'
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
-        fdata = StringIO('êé Üëëï êåßìåíï')
-        ftp.storbinary('STOR file Ö3.txt', fdata)
--
-    I rename the file into file+range(1..200) (large filename)
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
-        vuvuzela = 'b'+''.join('z' * 200)+'!'
-        ftp.rename("file Ö3.txt", vuvuzela)
--
-    I delete the file with the large name
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
-        vuvuzela = 'b'+''.join('z' * 200)+'!'
-        ftp.delete(vuvuzela)
-
--
-    I delete the testing folders
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.rmd('Äïêéìáóôéêüò ÖÜêåëëïò/Üëëïò')
-        ftp.rmd('Äïêéìáóôéêüò ÖÜêåëëïò')
diff --git a/addons/document_ftp/test/document_ftp_test4.yml b/addons/document_ftp/test/document_ftp_test4.yml
deleted file mode 100644
index 9b311f64605..00000000000
--- a/addons/document_ftp/test/document_ftp_test4.yml
+++ /dev/null
@@ -1,187 +0,0 @@
--
-    In order to check dynamic folder functionality of document + FTP
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_plain_ftp(timeout=1.0)
-- |
-    I create two partners 'Partner1' and 'Partner2'.
-    I create three partner categories: 'none', 'pat1' and 'all'
-    I attach Partner1 to pat1, Partner1+Partner2 to 'all'
--
-    !record {model: res.partner.category, id: tpat_categ_none }:
-        name: 'No partners'
--
-    !record {model: res.partner.category, id: tpat_categ_pat1 }:
-        name: 'Pat 1'
--
-    !record {model: res.partner.category, id: tpat_categ_all }:
-        name: 'All Partner1+2'
--
-    !record {model: res.partner, id: tpartner1 }:
-        name: Partner 1
-        category_id:
-            - tpat_categ_pat1
-            - tpat_categ_all
--
-    !record {model: res.partner, id: tpartner_2 }:
-        name: 'Partner 2'
-        category_id:
-            - tpat_categ_all
--
-    I create a resource folder of partners, by the (none, pat1, all) 
-    categories.
--
-    !record {model: document.directory, id: dir_tests2 }:
-        name: Partners Testing
-        parent_id: document.dir_root
-        type: ressource
-        ressource_type_id: base.model_res_partner_category
-        domain: [] # TODO
--
-    I commit (because FTP operations are on different transaction)
--
-    !python {model: document.directory, id: }: |
-        cr.commit()
--
-    I browse through ftp in the resource folder, checking that three
-    categories are there.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
-        dirs = ftp.nlst()
-        for dir in [ 'All Partner1+2', 'No partners', 'Pat 1' ]:
-            assert dir in dirs, "Dir %s not in folder" % dir
--
-    I create a 'partners' folder by the first resource one.
--
-    !record {model: document.directory, id: dir_respart1 }:
-        name: Partners of Test
-        parent_id: dir_tests2
-        type: ressource
-        ressource_type_id: base.model_res_partner
-        domain: "[('category_id','in',[active_id])]"
-        ressource_parent_type_id : base.model_res_partner_category
--
-    I commit (because FTP operations are on different transaction)
--
-    !python {model: document.directory, id: }: |
-        cr.commit()
--
-    I check through FTP that the correct partners are listed at each
-    'partners' folder.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
-        correct = { 'All Partner1+2': [ 'Partner 1', 'Partner 2' ],
-                'No partners': [],
-                'Pat 1': ['Partner 1',] }
-        for dir in correct:
-            res = ftp.nlst(dir+'/Partners of Test')
-            assert res == correct[dir], "Dir %s falsely contains %s" %(dir, res)
--
-    I create an ir.attachment, attached (not related) to Partner1
--
-    !record {model: ir.attachment, id: file_test1}:
-        name: File of pat1
-        res_model: res.partner
-        res_id:  !eval ref("tpartner1")
--
-    I commit (because FTP operations are on different transaction)
--
-    !python {model: document.directory, id: }: |
-        cr.commit()
--
-    I check that pat1/Partner1 folder has the file.
-    I check that all/Partner1 folder has the file
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
-        dirs = [ 'All Partner1+2', 'Pat 1' ]
-        for dir in dirs:
-            res = ftp.nlst(dir+'/Partners of Test/Partner 1')
-            assert 'File of pat1' in res, "Dir %s contains only %s" %(dir, res)
--
-    I place a file at the 'pat1'/Partner1 folder, through FTP
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
-        fdata = StringIO('abcd')
-        ftp.storbinary('STOR pat1-dynamic.txt', fdata)
-        cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
--
-    I check at the server that the file is attached to Partner1
--
-    !assert {model: ir.attachment, id: , search: "[('name','=','pat1-dynamic.txt')]" }:
-      - parent_id.name == 'Documents'
-      - res_model == 'res.partner'
-      - res_id !=  False
--
-    I try to create a file directly under the Partners Testing folder
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        import ftplib
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
-        fdata = StringIO('abcd')
-        try:
-            ftp.storbinary('STOR stray.txt', fdata)
-            assert False, "We should't be able to create files here"
-        except ftplib.error_perm:
-            # That's what should happen
-            pass
--
-    I try to create a folder directly under the Partners Testing folder
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        import ftplib
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing')
-        try:
-            ftp.mkd('Weird folder')
-            assert False, "We should't be able to create folders here"
-        except ftplib.error_perm:
-            # That's what should happen
-            pass
--
-    I check that all/Partner1 also has the file
-- |
-    Bonus Piste:
-    I create a 'Partner3' under 'all'
-    
--
-   I delete "pat1-dynamic.txt" File.
--
-    !python {model: ir.attachment}: |
-        from document_ftp import test_easyftp as te
-        from cStringIO import StringIO
-        ftp = te.get_ftp_folder(cr, uid, self, 'Documents/Partners Testing/Pat 1/Partners of Test/Partner 1')
-        ftp.delete('pat1-dynamic.txt')
-        ftp.close()
-        cr.rollback() # restart transaction to see changes (FTP-FS uses its own cursor)
-    
--
-    I delete the Partners Testing folder,  "File of pat1" file, Partner and Partner category.
--
-    !python {model: document.directory}: |
-        attach_pool = self.pool.get('ir.attachment')
-        partner_categ_pool = self.pool.get('res.partner.category')
-        partner_pool =  self.pool.get('res.partner')
-        
-        self.unlink(cr, uid, [ref('dir_tests2')])
-        self.unlink(cr, uid, [ref('dir_respart1')])
-        attach_pool.unlink(cr, uid, [ref('file_test1')])
-        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_none')])
-        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_pat1')])
-        partner_categ_pool.unlink(cr, uid, [ref('tpat_categ_all')])
-        partner_pool.unlink(cr, uid, [ref('tpartner1')])
-        partner_pool.unlink(cr, uid, [ref('tpartner_2')])
-        cr.commit() #required because all the operations via FTP were committed
-    
diff --git a/addons/document_ftp/test/document_ftp_test5.yml b/addons/document_ftp/test/document_ftp_test5.yml
deleted file mode 100644
index a66f409905b..00000000000
--- a/addons/document_ftp/test/document_ftp_test5.yml
+++ /dev/null
@@ -1,30 +0,0 @@
--
-  In order to check the permissions setup and functionality of the
-  document module:
--
-  I create a testing user for the documents
--
-  I assign some ... group to the testing user
--
-  I create a "group testing" user, which also belongs to the same ... group
--
-  I create a "blocked" user.
--
-  I create (as root) a testing folder in the document hierarchy, and
-  assign ownership to the testing user, groups to the ... group.
--
-  I create a "private" folder inside the testing folder.
--
-  I try to read the testing folder as the testing user
--
-  I try to read the folder as the group user, it should fail.
--
-  I try to read the folder as the blocked user.
--
-  I create a "group" folder, with the ... group.
--
-  I try to read the "group" folder as the testing user
--
-  I try to read the "group" folder as the group user
--
-  I try to read the "group" folder as the blocked user
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
deleted file mode 100644
index 1ab808c3acc..00000000000
--- a/addons/document_ftp/test_easyftp.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-""" This is a testing module, which exports some functions for the YAML tests.
-    Instead of repeating the same FTP code all over, we prefer to have
-    it in this file
-"""
-
-from ftplib import FTP
-from openerp.tools import config
-
-def get_plain_ftp(timeout=10.0):
-    ftp = FTP()
-    host = config.get('ftp_server_host', '127.0.0.1')
-    port = config.get('ftp_server_port', '8021')
-    ftp.connect(host, port,timeout)
-    return ftp
-
-def get_ftp_login(cr, uid, ormobj):
-    ftp = get_plain_ftp()
-    user = ormobj.pool.get('res.users').browse(cr, uid, uid)
-    passwd = user.password or ''
-    if passwd.startswith("$1$"):
-        # md5 by base crypt. We cannot decode, wild guess
-        # that passwd = login
-        passwd = user.login
-    ftp.login(user.login, passwd)
-    ftp.cwd("/" + cr.dbname)
-    return ftp
-
-def get_ftp_anonymous(cr):
-    ftp = get_plain_ftp()
-    ftp.login('anonymous', 'the-test')
-    ftp.cwd("/")
-    return ftp
-
-def get_ftp_folder(cr, uid, ormobj, foldername):
-    ftp = get_ftp_login(cr, uid, ormobj)
-    ftp.cwd("/" + cr.dbname+"/"+foldername)
-    return ftp
-
-def get_ftp_fulldata(ftp, fname, limit=8192):
-    from functools import partial
-    data = []
-    def ffp(data, ndata):
-        if len(data)+ len(ndata) > limit:
-            raise IndexError('Data over the limit.')
-        data.append(ndata)
-    ftp.retrbinary('RETR %s' % fname, partial(ffp,data))
-    return ''.join(data)
-
-#eof
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
deleted file mode 100644
index ee8f897ca20..00000000000
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-# from openerp.tools.translate import _
-from .. import ftpserver
-
-class document_ftp_browse(osv.osv_memory):
-    _name = 'document.ftp.browse'
-    _description = 'Document FTP Browse'
-
-    _columns = {
-        'url' : fields.char('FTP Server', size=64, required=True),
-    }
-
-    def default_get(self, cr, uid, fields, context=None):
-        res = {}
-        if 'url' in fields:
-            user_pool = self.pool.get('res.users')
-            current_user = user_pool.browse(cr, uid, uid, context=context)
-            data_pool = self.pool.get('ir.model.data')
-            aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
-            aid = data_pool.browse(cr, uid, aid, context=context).res_id
-            ftp_url = self.pool.get('ir.actions.act_url').browse(cr, uid, aid, context=context)
-            url = ftp_url.url and ftp_url.url.split('ftp://') or []
-            if url:
-                url = url[1]
-                if url[-1] == '/':
-                    url = url[:-1]
-            else:
-                url = '%s:%s' %(ftpserver.HOST, ftpserver.PORT)
-            res['url'] = 'ftp://%s@%s'%(current_user.login, url)
-        return res
-
-    def browse_ftp(self, cr, uid, ids, context=None):
-        data_id = ids and ids[0] or False
-        data = self.browse(cr, uid, data_id, context=context)
-        final_url = data.url
-        return {
-        'type': 'ir.actions.act_url',
-        'url':final_url,
-        'target': 'new'
-        }
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
deleted file mode 100644
index c1613b29a70..00000000000
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<openerp>
-  <data>
-
-    <record id="ftp_browse_form" model="ir.ui.view">
-            <field name="name">Document FTP Browse</field>
-            <field name="model">document.ftp.browse</field>
-            <field name="arch" type="xml">
-                <form string="Browse Document" version="7.0">
-                    <group>
-                        <field name="url" widget="url"/>
-                    </group>
-                    <footer>
-                        <button name="browse_ftp" string="_Browse" type="object" icon="gtk-ok" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_ftp_browse" model="ir.actions.act_window">
-            <field name="name">Document Browse</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">document.ftp.browse</field>
-            <field name="view_id" ref="ftp_browse_form"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem
-        name="Shared Repository (FTP)"
-        action="action_ftp_browse"
-        id="menu_document_browse"
-        icon="STOCK_EXECUTE"
-        parent="document.menu_document_doc" sequence="1"/>
-
-</data>
-</openerp>
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
deleted file mode 100644
index 1dee9495a95..00000000000
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-from openerp.tools import config
-
-class document_ftp_configuration(osv.osv_memory):
-
-    _name='document.ftp.configuration'
-    _description = 'Auto Directory Configuration'
-    _inherit = 'res.config'
-    _rec_name = 'host'
-    _columns = {
-        'host': fields.char('Address', size=64,
-                            help="Server address or IP and port to which users should connect to for DMS access",
-                            required=True),
-    }
-
-    _defaults = {
-        'host': config.get('ftp_server_host', 'localhost') + ':' + config.get('ftp_server_port', '8021'),
-    }
-
-    def execute(self, cr, uid, ids, context=None):
-        conf = self.browse(cr, uid, ids[0], context=context)
-        data_pool = self.pool.get('ir.model.data')
-        # Update the action for FTP browse.
-        aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
-        aid = data_pool.browse(cr, uid, aid, context=context).res_id
-        self.pool.get('ir.actions.act_url').write(cr, uid, [aid], 
-                {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/' + cr.dbname+'/'})
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
deleted file mode 100644
index 9e05fba986e..00000000000
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-  <data>
-    <record model="ir.actions.act_url" id="action_document_browse">
-        <field name="name">Browse Files</field>
-        <field name="url">ftp://localhost:8021/</field>
-    </record>
-
-
-
-    <record id="view_auto_config_form" model="ir.ui.view">
-        <field name="name">FTP Server Configuration</field>
-        <field name="model">document.ftp.configuration</field>
-        <field name="inherit_id" ref="base.res_config_view_base"/>
-        <field name="arch" type="xml">
-          <data>
-            <form position="attributes">
-              <attribute name="string">Knowledge Application Configuration</attribute>
-            </form>
-            <group string="res_config_contents" position="replace">
-                <separator string="Configure FTP Server" />
-                <label string="Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."/>
-                <field name="host"/>
-            </group>
-          </data>
-        </field>
-    </record>
-
-    <record id="action_config_auto_directory" model="ir.actions.act_window">
-        <field name="name">FTP Server Configuration</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">document.ftp.configuration</field>
-        <field name="view_id" ref="view_auto_config_form"/>
-        <field name="view_type">form</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
-
-    <record model="ir.actions.todo" id="config_auto_directory">
-        <field name="action_id" ref="action_config_auto_directory"/>
-        <field name="type">automatic</field>
-    </record>
-  </data>
-</openerp>
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
deleted file mode 100644
index befb87829ed..00000000000
--- a/addons/document_webdav/__openerp__.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2004 TINY SPRL. (http://tiny.be), 2009 P. Christeas
-#               All Rights Reserved.
-#                    Fabien Pinckaers <fp@tiny.Be>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-#
-##############################################################################
-
-{
-    'name': 'Shared Repositories (WebDAV)',
-    'version': '2.3',
-    'author': 'OpenERP SA',
-    'category': 'Knowledge Management',
-    'website': 'http://www.openerp.com',
-    'description': """
-With this module, the WebDAV server for documents is activated.
-===============================================================
-
-You can then use any compatible browser to remotely see the attachments of OpenObject.
-
-After installation, the WebDAV server can be controlled by a [webdav] section in 
-the server's config.
-
-Server Configuration Parameter:
--------------------------------
-[webdav]:
-+++++++++ 
-    * enable = True ; Serve webdav over the http(s) servers
-    * vdir = webdav ; the directory that webdav will be served at
-    * this default val means that webdav will be
-    * on "http://localhost:8069/webdav/
-    * verbose = True ; Turn on the verbose messages of webdav
-    * debug = True ; Turn on the debugging messages of webdav
-    * since the messages are routed to the python logging, with
-    * levels "debug" and "debug_rpc" respectively, you can leave
-    * these options on
-
-Also implements IETF RFC 5785 for services discovery on a http server,
-which needs explicit configuration in openerp-server.conf too.
-""",
-    'depends': ['base', 'document'],
-    'data': ['security/ir.model.access.csv',
-            'webdav_view.xml',
-            'webdav_setup.xml',
-    ],
-    'demo': [],
-    'test': [ #'test/webdav_test1.yml',
-    ],
-    'auto_install': False,
-    'installable': True,
-    'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/cache.py b/addons/document_webdav/cache.py
deleted file mode 100644
index 95ff9d31f62..00000000000
--- a/addons/document_webdav/cache.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import time
-import heapq
-
-def memoize(maxsize):
-    """decorator to 'memoize' a function - caching its results"""
-    def decorating_function(f):
-        cache = {}  # map from key to value
-        heap = []   # list of keys, in LRU heap
-        cursize = 0 # because len() is slow
-        def wrapper(*args):
-            key = repr(args)
-            # performance crap
-            _cache=cache
-            _heap=heap
-            _heappop = heapq.heappop
-            _heappush = heapq.heappush
-            _time = time.time
-            _cursize = cursize
-            _maxsize = maxsize
-            if not _cache.has_key(key):
-                if _cursize == _maxsize:
-                    # pop oldest element
-                    (_,oldkey) = _heappop(_heap)
-                    _cache.pop(oldkey)
-                else:
-                    _cursize += 1
-                # insert this element
-                _cache[key] = f(*args)
-                _heappush(_heap,(_time(),key))
-                wrapper.misses += 1
-            else:
-                wrapper.hits += 1
-            return cache[key]
-        wrapper.__doc__ = f.__doc__
-        wrapper.__name__ = f.__name__
-        wrapper.hits = wrapper.misses = 0
-        return wrapper 
-    return decorating_function
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
deleted file mode 100644
index fef7d7b5940..00000000000
--- a/addons/document_webdav/dav_fs.py
+++ /dev/null
@@ -1,1052 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import os
-import time
-import errno
-import re
-import urlparse
-import urllib
-
-try:
-    from pywebdav.lib.constants import COLLECTION  # , OBJECT
-    from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-    from pywebdav.lib.iface import dav_interface
-    from pywebdav.lib.davcmd import copyone, copytree, moveone, movetree, delone, deltree
-except ImportError:
-    from DAV.constants import COLLECTION  #, OBJECT
-    from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-    from DAV.iface import dav_interface
-    from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
-
-import openerp
-from openerp import sql_db
-import openerp.service
-from openerp.tools import misc
-
-from cache import memoize
-from webdav import mk_lock_response
-
-CACHE_SIZE=20000
-
-#hack for urlparse: add webdav in the net protocols
-urlparse.uses_netloc.append('webdav')
-urlparse.uses_netloc.append('webdavs')
-
-day_names = { 0: 'Mon', 1: 'Tue' , 2: 'Wed', 3: 'Thu', 4: 'Fri', 5: 'Sat', 6: 'Sun' }
-month_names = { 1: 'Jan', 2: 'Feb', 3: 'Mar', 4: 'Apr', 5: 'May', 6: 'Jun',
-        7: 'Jul', 8: 'Aug', 9: 'Sep', 10: 'Oct', 11: 'Nov', 12: 'Dec' }
-
-def dict_merge2(*dicts):
-    """ Return a dict with all values of dicts.
-        If some key appears twice and contains iterable objects, the values
-        are merged (instead of overwritten).
-    """
-    res = {}
-    for d in dicts:
-        for k in d.keys():
-            if k in res and isinstance(res[k], (list, tuple)):
-                res[k] = res[k] + d[k]
-            elif k in res and isinstance(res[k], dict):
-                res[k].update(d[k])
-            else:
-                res[k] = d[k]
-    return res
-
-class DAV_NotFound2(DAV_NotFound):
-    """404 exception, that accepts our list uris
-    """
-    def __init__(self, *args):
-        if len(args) and isinstance(args[0], (tuple, list)):
-            path = ''.join([ '/' + x for x in args[0]])
-            args = (path, )
-        DAV_NotFound.__init__(self, *args)
-
-
-def _str2time(cre):
-    """ Convert a string with time representation (from db) into time (float)
-    """
-    if not cre:
-        return time.time()
-    frac = 0.0
-    if isinstance(cre, basestring) and '.' in cre:
-        fdot = cre.find('.')
-        frac = float(cre[fdot:])
-        cre = cre[:fdot]
-    return time.mktime(time.strptime(cre,'%Y-%m-%d %H:%M:%S')) + frac
-
-class BoundStream2(object):
-    """Wraps around a seekable buffer, reads a determined range of data
-
-        Note that the supplied stream object MUST support a size() which
-        should return its data length (in bytes).
-
-        A variation of the class in websrv_lib.py
-    """
-
-    def __init__(self, stream, offset=None, length=None, chunk_size=None):
-        self._stream = stream
-        self._offset = offset or 0
-        self._length = length or self._stream.size()
-        self._rem_length = length
-        assert length and isinstance(length, (int, long))
-        assert length and length >= 0, length
-        self._chunk_size = chunk_size
-        if offset is not None:
-            self._stream.seek(offset)
-
-    def read(self, size=-1):
-        if not self._stream:
-            raise IOError(errno.EBADF, "read() without stream.")
-
-        if self._rem_length == 0:
-            return ''
-        elif self._rem_length < 0:
-            raise EOFError()
-
-        rsize = self._rem_length
-        if size > 0 and size < rsize:
-            rsize = size
-        if self._chunk_size and self._chunk_size < rsize:
-            rsize = self._chunk_size
-
-        data = self._stream.read(rsize)
-        self._rem_length -= len(data)
-
-        return data
-
-    def __len__(self):
-        return self._length
-
-    def tell(self):
-        res = self._stream.tell()
-        if self._offset:
-            res -= self._offset
-        return res
-
-    def __iter__(self):
-        return self
-
-    def next(self):
-        return self.read(65536)
-
-    def seek(self, pos, whence=os.SEEK_SET):
-        """ Seek, computing our limited range
-        """
-        if whence == os.SEEK_SET:
-            if pos < 0 or pos > self._length:
-                raise IOError(errno.EINVAL,"Cannot seek.")
-            self._stream.seek(pos - self._offset)
-            self._rem_length = self._length - pos
-        elif whence == os.SEEK_CUR:
-            if pos > 0:
-                if pos > self._rem_length:
-                    raise IOError(errno.EINVAL,"Cannot seek past end.")
-                elif pos < 0:
-                    oldpos = self.tell()
-                    if oldpos + pos < 0:
-                        raise IOError(errno.EINVAL,"Cannot seek before start.")
-                self._stream.seek(pos, os.SEEK_CUR)
-                self._rem_length -= pos
-        elif whence == os.SEEK_END:
-            if pos > 0:
-                raise IOError(errno.EINVAL,"Cannot seek past end.")
-            else:
-                if self._length + pos < 0:
-                    raise IOError(errno.EINVAL,"Cannot seek before start.")
-            newpos = self._offset + self._length + pos
-            self._stream.seek(newpos, os.SEEK_SET)
-            self._rem_length = 0 - pos
-
-class openerp_dav_handler(dav_interface):
-    """
-    This class models a OpenERP interface for the DAV server
-    """
-    PROPS={'DAV:': dav_interface.PROPS['DAV:'],}
-
-    M_NS={ "DAV:" : dav_interface.M_NS['DAV:'],}
-
-    def __init__(self,  parent, verbose=False):
-        self.db_name_list=[]
-        self.parent = parent
-        self.baseuri = parent.baseuri
-        self.verbose = verbose
-
-    def get_propnames(self, uri):
-        props = self.PROPS
-        self.parent.log_message('get propnames: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            # TODO: maybe limit props for databases..?
-            return props
-        node = self.uri2object(cr, uid, pool, uri2)
-        if node:
-            props = dict_merge2(props, node.get_dav_props(cr))
-        cr.close()
-        return props
-
-    def _try_function(self, funct, args, opname='run function', cr=None,
-            default_exc=DAV_Forbidden):
-        """ Try to run a function, and properly convert exceptions to DAV ones.
-
-            @objname the name of the operation being performed
-            @param cr if given, the cursor to close at exceptions
-        """
-
-        try:
-            return funct(*args)
-        except DAV_Error:
-            if cr: cr.close()
-            raise
-        except NotImplementedError, e:
-            if cr: cr.close()
-            import traceback
-            self.parent.log_error("Cannot %s: %s", opname, str(e))
-            self.parent.log_message("Exc: %s",traceback.format_exc())
-            # see par 9.3.1 of rfc
-            raise DAV_Error(403, str(e) or 'Not supported at this path.')
-        except EnvironmentError, err:
-            if cr: cr.close()
-            import traceback
-            self.parent.log_error("Cannot %s: %s", opname, err.strerror)
-            self.parent.log_message("Exc: %s",traceback.format_exc())
-            raise default_exc(err.strerror)
-        except Exception, e:
-            import traceback
-            if cr: cr.close()
-            self.parent.log_error("Cannot %s: %s", opname, str(e))
-            self.parent.log_message("Exc: %s",traceback.format_exc())
-            raise default_exc("Operation failed.")
-
-    def _get_dav_lockdiscovery(self, uri):
-        """ We raise that so that the node API is used """
-        raise DAV_NotFound
-
-    def _get_dav_supportedlock(self, uri):
-        """ We raise that so that the node API is used """
-        raise DAV_NotFound
-
-    def match_prop(self, uri, match, ns, propname):
-        if self.M_NS.has_key(ns):
-            return match == dav_interface.get_prop(self, uri, ns, propname)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_NotFound
-        node = self.uri2object(cr, uid, pool, uri2)
-        if not node:
-            cr.close()
-            raise DAV_NotFound
-        res = node.match_dav_eprop(cr, match, ns, propname)
-        cr.close()
-        return res
-
-    def prep_http_options(self, uri, opts):
-        """see HttpOptions._prep_OPTIONS """
-        self.parent.log_message('get options: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
-
-        if not dbname:
-            if cr: cr.close()
-            return opts
-        node = self.uri2object(cr, uid, pool, uri2[:])
-
-        if not node:
-            if cr: cr.close()
-            return opts
-        else:
-            if hasattr(node, 'http_options'):
-                ret = opts.copy()
-                for key, val in node.http_options.items():
-                    if isinstance(val, basestring):
-                        val = [val, ]
-                    if key in ret:
-                        ret[key] = ret[key][:]  # copy the orig. array
-                    else:
-                        ret[key] = []
-                    ret[key].extend(val)
-
-                self.parent.log_message('options: %s' % ret)
-            else:
-                ret = opts
-            cr.close()
-            return ret
-
-    def reduce_useragent(self):
-        ua = self.parent.headers.get('User-Agent', False)
-        ctx = {}
-        if ua:
-            if 'iPhone' in ua:
-                ctx['DAV-client'] = 'iPhone'
-            elif 'Konqueror' in ua:
-                ctx['DAV-client'] = 'GroupDAV'
-        return ctx
-
-    def get_prop(self, uri, ns, propname):
-        """ return the value of a given property
-
-            uri        -- uri of the object to get the property of
-            ns        -- namespace of the property
-            pname        -- name of the property
-         """
-        if self.M_NS.has_key(ns):
-            try:
-                # if it's not in the interface class, a "DAV:" property
-                # may be at the node class. So shouldn't give up early.
-                return dav_interface.get_prop(self, uri, ns, propname)
-            except DAV_NotFound:
-                pass
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_NotFound
-        try:
-            node = self.uri2object(cr, uid, pool, uri2)
-            if not node:
-                raise DAV_NotFound
-            res = node.get_dav_eprop(cr, ns, propname)
-        finally:
-            cr.close()
-        return res
-
-    def get_db(self, uri, rest_ret=False, allow_last=False):
-        """Parse the uri and get the dbname and the rest.
-           Db name should be the first component in the unix-like
-           path supplied in uri.
-
-           @param rest_ret Instead of the db_name, return (db_name, rest),
-                where rest is the remaining path
-           @param allow_last If the dbname is the last component in the
-                path, allow it to be resolved. The default False value means
-                we will not attempt to use the db, unless there is more
-                path.
-
-           @return db_name or (dbname, rest) depending on rest_ret,
-                will return dbname=False when component is not found.
-        """
-
-        uri2 = self.uri2local(uri)
-        if uri2.startswith('/'):
-            uri2 = uri2[1:]
-        names=uri2.split('/',1)
-        db_name=False
-        rest = None
-        if allow_last:
-            ll = 0
-        else:
-            ll = 1
-        if len(names) > ll and names[0]:
-            db_name = names[0]
-            names = names[1:]
-
-        if rest_ret:
-            if len(names):
-                rest = names[0]
-            return db_name, rest
-        return db_name
-
-
-    def urijoin(self,*ajoin):
-        """ Return the base URI of this request, or even join it with the
-            ajoin path elements
-        """
-        return self.parent.get_baseuri(self) + '/'.join(ajoin)
-
-    @memoize(4)
-    def _all_db_list(self):
-        """return all databases who have module document_webdav installed"""
-        s = openerp.service.db
-        result = s.exp_list()
-        self.db_name_list=[]
-        for db_name in result:
-            cr = None
-            try:
-                db = sql_db.db_connect(db_name)
-                cr = db.cursor()
-                cr.execute("SELECT id FROM ir_module_module WHERE name = 'document_webdav' AND state='installed' ")
-                res=cr.fetchone()
-                if res and len(res):
-                    self.db_name_list.append(db_name)
-            except Exception, e:
-                self.parent.log_error("Exception in db list: %s" % e)
-            finally:
-                if cr:
-                    cr.close()
-        return self.db_name_list
-
-    def db_list(self, uri):
-        # import pudb;pudb.set_trace()
-        u = urlparse.urlsplit(uri)
-        h = u.hostname
-        d = h.split('.')[0]
-        r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d',d)
-        dbs = [i for i in self._all_db_list() if re.match(r, i)]
-        return dbs
-
-    def get_childs(self,uri, filters=None):
-        """ return the child objects as self.baseuris for the given URI """
-        self.parent.log_message('get children: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
-
-        if not dbname:
-            if cr: cr.close()
-            res = map(lambda x: self.urijoin(x), self.db_list(uri))
-            return res
-        result = []
-        node = self.uri2object(cr, uid, pool, uri2[:])
-
-        try:
-            if not node:
-                raise DAV_NotFound2(uri2)
-            else:
-                fp = node.full_path()
-                if fp and len(fp):
-                    fp = '/'.join(fp)
-                    self.parent.log_message('children for: %s' % fp)
-                else:
-                    fp = None
-                domain = None
-                if filters:
-                    domain = node.get_domain(cr, filters)
-
-                    if hasattr(filters, 'getElementsByTagNameNS'):
-                        hrefs = filters.getElementsByTagNameNS('DAV:', 'href')
-                        if hrefs:
-                            ul = self.parent.davpath + self.uri2local(uri)
-                            for hr in hrefs:
-                                turi = ''
-                                for tx in hr.childNodes:
-                                    if tx.nodeType == hr.TEXT_NODE:
-                                        turi += tx.data
-                                if not turi.startswith('/'):
-                                    # it may be an absolute URL, decode to the
-                                    # relative part, because ul is relative, anyway
-                                    uparts=urlparse.urlparse(turi)
-                                    turi=uparts[2]
-                                    if uparts[3]:
-                                        turi += ';' + uparts[3]
-                                if turi.startswith(ul):
-                                    result.append( turi[len(self.parent.davpath):])
-                                else:
-                                    self.parent.log_error("ignore href %s because it is not under request path %s", turi, ul)
-                            return result
-                            # We don't want to continue with the children found below
-                            # Note the exceptions and that 'finally' will close the
-                            # cursor
-                for d in node.children(cr, domain):
-                    self.parent.log_message('child: %s' % d.path)
-                    if fp:
-                        result.append( self.urijoin(dbname,fp,d.path) )
-                    else:
-                        result.append( self.urijoin(dbname,d.path) )
-        except DAV_Error:
-            raise
-        except Exception, e:
-            self.parent.log_error("Cannot get_children: "+str(e)+".")
-            raise
-        finally:
-            if cr: cr.close()
-        return result
-
-    def uri2local(self, uri):
-        uparts=urlparse.urlparse(uri)
-        reluri=uparts[2]
-        if uparts[3]:
-            reluri += ';'+uparts[3]
-        if reluri and reluri[-1]=="/":
-            reluri=reluri[:-1]
-        return reluri
-
-    #
-    # pos: -1 to get the parent of the uri
-    #
-    def get_cr(self, uri, allow_last=False):
-        """ Split the uri, grab a cursor for that db
-        """
-        pdb = self.parent.auth_provider.last_auth
-        dbname, uri2 = self.get_db(uri, rest_ret=True, allow_last=allow_last)
-        uri2 = (uri2 and uri2.split('/')) or []
-        if not dbname:
-            return None, None, None, False, uri2
-        # if dbname was in our uri, we should have authenticated
-        # against that.
-        assert pdb == dbname, " %s != %s" %(pdb, dbname)
-        res = self.parent.auth_provider.auth_creds.get(dbname, False)
-        if not res:
-            self.parent.auth_provider.checkRequest(self.parent, uri, dbname)
-            res = self.parent.auth_provider.auth_creds[dbname]
-        user, passwd, dbn2, uid = res
-        registry = openerp.registry(dbname)
-        cr = registery.db.cursor()
-        return cr, uid, registry, dbname, uri2
-
-    def uri2object(self, cr, uid, pool, uri):
-        if not uid:
-            return None
-        context = self.reduce_useragent()
-        return pool.get('document.directory').get_object(cr, uid, uri, context=context)
-
-    def get_data(self,uri, rrange=None):
-        self.parent.log_message('GET: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        try:
-            if not dbname:
-                raise DAV_Error, 409
-            node = self.uri2object(cr, uid, pool, uri2)
-            if not node:
-                raise DAV_NotFound2(uri2)
-            # TODO: if node is a collection, for some specific set of
-            # clients ( web browsers; available in node context),
-            # we may return a pseydo-html page with the directory listing.
-            try:
-                res = node.open_data(cr,'r')
-                if rrange:
-                    assert isinstance(rrange, (tuple,list))
-                    start, end = map(long, rrange)
-                    if not start:
-                        start = 0
-                    assert start >= 0
-                    if end and end < start:
-                        self.parent.log_error("Invalid range for data: %s-%s" %(start, end))
-                        raise DAV_Error(416, "Invalid range for data.")
-                    if end:
-                        if end >= res.size():
-                            raise DAV_Error(416, "Requested data exceeds available size.")
-                        length = (end + 1) - start
-                    else:
-                        length = res.size() - start
-                    res = BoundStream2(res, offset=start, length=length)
-
-            except TypeError,e:
-                # for the collections that return this error, the DAV standard
-                # says we'd better just return 200 OK with empty data
-                return ''
-            except IndexError,e :
-                self.parent.log_error("GET IndexError: %s", str(e))
-                raise DAV_NotFound2(uri2)
-            except Exception,e:
-                import traceback
-                self.parent.log_error("GET exception: %s",str(e))
-                self.parent.log_message("Exc: %s", traceback.format_exc())
-                raise DAV_Error, 409
-            return res
-        finally:
-            if cr: cr.close()
-
-    @memoize(CACHE_SIZE)
-    def _get_dav_resourcetype(self, uri):
-        """ return type of object """
-        self.parent.log_message('get RT: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        try:
-            if not dbname:
-                return COLLECTION
-            node = self.uri2object(cr, uid, pool, uri2)
-            if not node:
-                raise DAV_NotFound2(uri2)
-            try:
-                return node.get_dav_resourcetype(cr)
-            except NotImplementedError:
-                if node.type in ('collection','database'):
-                    return ('collection', 'DAV:')
-                return ''
-        finally:
-            if cr: cr.close()
-
-    def _get_dav_displayname(self,uri):
-        self.parent.log_message('get DN: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            # at root, dbname, just return the last component
-            # of the path.
-            if uri2 and len(uri2) < 2:
-                return uri2[-1]
-            return ''
-        node = self.uri2object(cr, uid, pool, uri2)
-        if not node:
-            if cr: cr.close()
-            raise DAV_NotFound2(uri2)
-        cr.close()
-        return node.displayname
-
-    @memoize(CACHE_SIZE)
-    def _get_dav_getcontentlength(self, uri):
-        """ return the content length of an object """
-        self.parent.log_message('get length: %s' % uri)
-        result = 0
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            return str(result)
-        node = self.uri2object(cr, uid, pool, uri2)
-        if not node:
-            if cr: cr.close()
-            raise DAV_NotFound2(uri2)
-        result = node.content_length or 0
-        cr.close()
-        return str(result)
-
-    @memoize(CACHE_SIZE)
-    def _get_dav_getetag(self,uri):
-        """ return the ETag of an object """
-        self.parent.log_message('get etag: %s' % uri)
-        result = 0
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            return '0'
-        node = self.uri2object(cr, uid, pool, uri2)
-        if not node:
-            cr.close()
-            raise DAV_NotFound2(uri2)
-        result = self._try_function(node.get_etag ,(cr,), "etag %s" %uri, cr=cr)
-        cr.close()
-        return str(result)
-
-    @memoize(CACHE_SIZE)
-    def get_lastmodified(self, uri):
-        """ return the last modified date of the object """
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            return time.time()
-        try:
-            node = self.uri2object(cr, uid, pool, uri2)
-            if not node:
-                raise DAV_NotFound2(uri2)
-            return _str2time(node.write_date)
-        finally:
-            if cr: cr.close()
-
-    def _get_dav_getlastmodified(self,uri):
-        """ return the last modified date of a resource
-        """
-        d=self.get_lastmodified(uri)
-        # format it. Note that we explicitly set the day, month names from
-        # an array, so that strftime() doesn't use its own locale-aware
-        # strings.
-        gmt = time.gmtime(d)
-        return time.strftime("%%s, %d %%s %Y %H:%M:%S GMT", gmt ) % \
-                    (day_names[gmt.tm_wday], month_names[gmt.tm_mon])
-
-    @memoize(CACHE_SIZE)
-    def get_creationdate(self, uri):
-        """ return the last modified date of the object """
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            raise DAV_Error, 409
-        try:
-            node = self.uri2object(cr, uid, pool, uri2)
-            if not node:
-                raise DAV_NotFound2(uri2)
-
-            return _str2time(node.create_date)
-        finally:
-            if cr: cr.close()
-
-    @memoize(CACHE_SIZE)
-    def _get_dav_getcontenttype(self,uri):
-        self.parent.log_message('get contenttype: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            return 'httpd/unix-directory'
-        try:
-            node = self.uri2object(cr, uid, pool, uri2)
-            if not node:
-                raise DAV_NotFound2(uri2)
-            result = str(node.mimetype)
-            return result
-            #raise DAV_NotFound, 'Could not find %s' % path
-        finally:
-            if cr: cr.close()
-
-    def mkcol(self,uri):
-        """ create a new collection
-            see par. 9.3 of rfc4918
-        """
-        self.parent.log_message('MKCOL: %s' % uri)
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not uri2[-1]:
-            if cr: cr.close()
-            raise DAV_Error(409, "Cannot create nameless collection.")
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_Error, 409
-        node = self.uri2object(cr,uid,pool, uri2[:-1])
-        if not node:
-            cr.close()
-            raise DAV_Error(409, "Parent path %s does not exist" % uri2[:-1])
-        nc = node.child(cr, uri2[-1])
-        if nc:
-            cr.close()
-            raise DAV_Error(405, "Path already exists.")
-        self._try_function(node.create_child_collection, (cr, uri2[-1]),
-                    "create col %s" % uri2[-1], cr=cr)
-        cr.commit()
-        cr.close()
-        return True
-
-    def put(self, uri, data, content_type=None):
-        """ put the object into the filesystem """
-        self.parent.log_message('Putting %s (%d), %s'%( misc.ustr(uri), data and len(data) or 0, content_type))
-        cr, uid, pool,dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_Forbidden
-        try:
-            node = self.uri2object(cr, uid, pool, uri2[:])
-        except Exception:
-            node = False
-
-        objname = misc.ustr(uri2[-1])
-
-        ret = None
-        if not node:
-            dir_node = self.uri2object(cr, uid, pool, uri2[:-1])
-            if not dir_node:
-                cr.close()
-                raise DAV_NotFound('Parent folder not found.')
-            newchild = self._try_function(dir_node.create_child, (cr, objname, data),
-                    "create %s" % objname, cr=cr)
-            if not newchild:
-                cr.commit()
-                cr.close()
-                raise DAV_Error(400, "Failed to create resource.")
-
-            uparts=urlparse.urlparse(uri)
-            fileloc = '/'.join(newchild.full_path())
-            if isinstance(fileloc, unicode):
-                fileloc = fileloc.encode('utf-8')
-            # the uri we get is a mangled one, where the davpath has been removed
-            davpath = self.parent.get_davpath()
-
-            surl = '%s://%s' % (uparts[0], uparts[1])
-            uloc = urllib.quote(fileloc)
-            hurl = False
-            if uri != ('/'+uloc) and uri != (surl + '/' + uloc):
-                hurl = '%s%s/%s/%s' %(surl, davpath, dbname, uloc)
-            etag = False
-            try:
-                etag = str(newchild.get_etag(cr))
-            except Exception, e:
-                self.parent.log_error("Cannot get etag for node: %s" % e)
-            ret = (str(hurl), etag)
-        else:
-            self._try_function(node.set_data, (cr, data), "save %s" % objname, cr=cr)
-
-        cr.commit()
-        cr.close()
-        return ret
-
-    def rmcol(self,uri):
-        """ delete a collection """
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_Error, 409
-
-        node = self.uri2object(cr, uid, pool, uri2)
-        self._try_function(node.rmcol, (cr,), "rmcol %s" % uri, cr=cr)
-
-        cr.commit()
-        cr.close()
-        return 204
-
-    def rm(self,uri):
-        cr, uid, pool,dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_Error, 409
-        node = self.uri2object(cr, uid, pool, uri2)
-        res = self._try_function(node.rm, (cr,), "rm %s"  % uri, cr=cr)
-        if not res:
-            if cr: cr.close()
-            raise OSError(1, 'Invalid Action!')
-        cr.commit()
-        cr.close()
-        return 204
-
-    ### DELETE handlers (examples)
-    ### (we use the predefined methods in davcmd instead of doing
-    ### a rm directly
-    ###
-
-    def delone(self, uri):
-        """ delete a single resource
-
-        You have to return a result dict of the form
-        uri:error_code
-        or None if everything's ok
-
-        """
-        if uri[-1]=='/':uri=uri[:-1]
-        res=delone(self,uri)
-        # parent='/'.join(uri.split('/')[:-1])
-        return res
-
-    def deltree(self, uri):
-        """ delete a collection
-
-        You have to return a result dict of the form
-        uri:error_code
-        or None if everything's ok
-        """
-        if uri[-1]=='/':uri=uri[:-1]
-        res=deltree(self, uri)
-        # parent='/'.join(uri.split('/')[:-1])
-        return res
-
-
-    ###
-    ### MOVE handlers (examples)
-    ###
-
-    def moveone(self, src, dst, overwrite):
-        """ move one resource with Depth=0
-
-        an alternative implementation would be
-
-        result_code=201
-        if overwrite:
-            result_code=204
-            r=os.system("rm -f '%s'" %dst)
-            if r: return 412
-        r=os.system("mv '%s' '%s'" %(src,dst))
-        if r: return 412
-        return result_code
-
-        (untested!). This would not use the davcmd functions
-        and thus can only detect errors directly on the root node.
-        """
-        res=moveone(self, src, dst, overwrite)
-        return res
-
-    def movetree(self, src, dst, overwrite):
-        """ move a collection with Depth=infinity
-
-        an alternative implementation would be
-
-        result_code=201
-        if overwrite:
-            result_code=204
-            r=os.system("rm -rf '%s'" %dst)
-            if r: return 412
-        r=os.system("mv '%s' '%s'" %(src,dst))
-        if r: return 412
-        return result_code
-
-        (untested!). This would not use the davcmd functions
-        and thus can only detect errors directly on the root node"""
-
-        res=movetree(self, src, dst, overwrite)
-        return res
-
-    ###
-    ### COPY handlers
-    ###
-
-    def copyone(self, src, dst, overwrite):
-        """ copy one resource with Depth=0
-
-        an alternative implementation would be
-
-        result_code=201
-        if overwrite:
-            result_code=204
-            r=os.system("rm -f '%s'" %dst)
-            if r: return 412
-        r=os.system("cp '%s' '%s'" %(src,dst))
-        if r: return 412
-        return result_code
-
-        (untested!). This would not use the davcmd functions
-        and thus can only detect errors directly on the root node.
-        """
-        res=copyone(self, src, dst, overwrite)
-        return res
-
-    def copytree(self, src, dst, overwrite):
-        """ copy a collection with Depth=infinity
-
-        an alternative implementation would be
-
-        result_code=201
-        if overwrite:
-            result_code=204
-            r=os.system("rm -rf '%s'" %dst)
-            if r: return 412
-        r=os.system("cp -r '%s' '%s'" %(src,dst))
-        if r: return 412
-        return result_code
-
-        (untested!). This would not use the davcmd functions
-        and thus can only detect errors directly on the root node"""
-        res=copytree(self, src, dst, overwrite)
-        return res
-
-    ###
-    ### copy methods.
-    ### This methods actually copy something. low-level
-    ### They are called by the davcmd utility functions
-    ### copytree and copyone (not the above!)
-    ### Look in davcmd.py for further details.
-    ###
-
-    def copy(self, src, dst):
-        src=urllib.unquote(src)
-        dst=urllib.unquote(dst)
-        ct = self._get_dav_getcontenttype(src)
-        data = self.get_data(src)
-        self.put(dst, data, ct)
-        return 201
-
-    def copycol(self, src, dst):
-        """ copy a collection.
-
-        As this is not recursive (the davserver recurses itself)
-        we will only create a new directory here. For some more
-        advanced systems we might also have to copy properties from
-        the source to the destination.
-        """
-        return self.mkcol(dst)
-
-
-    def exists(self, uri):
-        """ test if a resource exists """
-        result = False
-        cr, uid, pool,dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            return True
-        try:
-            node = self.uri2object(cr, uid, pool, uri2)
-            if node:
-                result = True
-        except Exception:
-            pass
-        cr.close()
-        return result
-
-    def unlock(self, uri, token):
-        """ Unlock a resource from that token
-
-        @return True if unlocked, False if no lock existed, Exceptions
-        """
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_Error, 409
-
-        node = self.uri2object(cr, uid, pool, uri2)
-        try:
-            node_fn = node.dav_unlock
-        except AttributeError:
-            # perhaps the node doesn't support locks
-            cr.close()
-            raise DAV_Error(400, 'No locks for this resource.')
-
-        res = self._try_function(node_fn, (cr, token), "unlock %s" % uri, cr=cr)
-        cr.commit()
-        cr.close()
-        return res
-
-    def lock(self, uri, lock_data):
-        """ Lock (may create) resource.
-            Data is a dict, may contain:
-                depth, token, refresh, lockscope, locktype, owner
-        """
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        created = False
-        if not dbname:
-            if cr: cr.close()
-            raise DAV_Error, 409
-
-        try:
-            node = self.uri2object(cr, uid, pool, uri2[:])
-        except Exception:
-            node = False
-
-        objname = misc.ustr(uri2[-1])
-
-        if not node:
-            dir_node = self.uri2object(cr, uid, pool, uri2[:-1])
-            if not dir_node:
-                cr.close()
-                raise DAV_NotFound('Parent folder not found.')
-
-            # We create a new node (file) but with empty data=None,
-            # as in RFC4918 p. 9.10.4
-            node = self._try_function(dir_node.create_child, (cr, objname, None),
-                    "create %s" % objname, cr=cr)
-            if not node:
-                cr.commit()
-                cr.close()
-                raise DAV_Error(400, "Failed to create resource.")
-
-            created = True
-
-        try:
-            node_fn = node.dav_lock
-        except AttributeError:
-            # perhaps the node doesn't support locks
-            cr.close()
-            raise DAV_Error(400, 'No locks for this resource.')
-
-        # Obtain the lock on the node
-        lres, pid, token = self._try_function(node_fn, (cr, lock_data), "lock %s" % objname, cr=cr)
-
-        if not lres:
-            cr.commit()
-            cr.close()
-            raise DAV_Error(423, "Resource already locked.")
-
-        assert isinstance(lres, list), 'lres: %s' % repr(lres)
-
-        try:
-            data = mk_lock_response(self, uri, lres)
-            cr.commit()
-        except Exception:
-            cr.close()
-            raise
-
-        cr.close()
-        return created, data, token
-
-    @memoize(CACHE_SIZE)
-    def is_collection(self, uri):
-        """ test if the given uri is a collection """
-        cr, uid, pool, dbname, uri2 = self.get_cr(uri)
-        try:
-            if not dbname:
-                return True
-            node = self.uri2object(cr,uid,pool, uri2)
-            if not node:
-                raise DAV_NotFound2(uri2)
-            if node.type in ('collection','database'):
-                return True
-            return False
-        finally:
-            if cr: cr.close()
-
-#eof
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/doc/well-known.rst b/addons/document_webdav/doc/well-known.rst
deleted file mode 100644
index ce7dbd7c9cf..00000000000
--- a/addons/document_webdav/doc/well-known.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-=================
-Well-known URIs
-=================
-
-In accordance to IETF RFC 5785 [1], we shall publish a few locations
-on the root of our http server, so that clients can discover our 
-services (CalDAV, eg.).
-
-This module merely installs a special http request handler, that will
-redirect the URIs from "http://our-server:port/.well-known/xxx' to 
-the correct path for each xxx service.
-
-Note that well-known URIs cannot have a database-specific behaviour, 
-they are server-wide. So, we have to explicitly chose one of our databases
-to serve at them. By default, the database of the configuration file
-is chosen
-
-Example config:
-
-[http-well-known]
-num_services = 2
-db_name = openerp-main ; must define that for path_1 below
-service_1 = caldav
-path_1 = /webdav/%(db_name)s/Calendars/
-service_2 = foo
-path_2 = /other_db/static/Foo.html
-
-
-[1] http://www.rfc-editor.org/rfc/rfc5785.txt
\ No newline at end of file
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
deleted file mode 100644
index 7c93e735c69..00000000000
--- a/addons/document_webdav/document_webdav.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-from openerp.tools import config
-
-import nodes
-
-class document_davdir(osv.osv):
-    _inherit = 'document.directory'
-
-    _columns = {
-        # Placed here just for a reference
-        'dav_prop_ids': fields.one2many('document.webdav.dir.property', 'dir_id', 'DAV properties'),
-        }
-
-    def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
-        # Note: in this function, nodes come from document_webdav/nodes.py !
-        if dbro is None:
-            dbro = self.browse(cr, uid, ids, context=context)
-
-        if dynamic:
-            return nodes.node_res_obj
-        elif dbro.type == 'directory':
-            return nodes.node_dir
-        elif dbro.type == 'ressource':
-            return nodes.node_res_dir
-        else:
-            raise ValueError("Directory node for %s type.", dbro.type)
-
-    def _prepare_context(self, cr, uid, nctx, context=None):
-        nctx.node_file_class = nodes.node_file
-        # We can fill some more fields, but avoid any expensive function
-        # that might be not worth preparing.
-        nctx.extra_ctx['webdav_path'] = '/'+config.get_misc('webdav','vdir','webdav')
-        usr_obj = self.pool.get('res.users')
-        res = usr_obj.read(cr, uid, uid, ['login','lang'])
-        if res:
-            nctx.extra_ctx['username'] = res['login']
-            nctx.extra_ctx['lang'] = res['lang']
-        # TODO group
-        return
-
-    def _locate_child(self, cr, uid, root_id, uri, nparent, ncontext):
-        """ try to locate the node in uri,
-            Return a tuple (node_dir, remaining_path)
-        """
-        return (nodes.node_database(context=ncontext), uri)
-
-class dav_dir_property(osv.osv):
-    """ Arbitrary WebDAV properties, attached to document.directories.
-
-    Some DAV properties have to be settable at directories, depending
-    on the database directory structure.
-
-    Example would be the principal-URL.
-
-    There _can_ be properties without a directory, which means that they
-    globally apply to all the directories (aka. collections) of the
-    present database.
-    """
-    _name = 'document.webdav.dir.property'
-
-    _columns = {
-        'create_date': fields.datetime('Date Created', readonly=True),
-        'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
-        'write_date': fields.datetime('Date Modified', readonly=True),
-        'write_uid':  fields.many2one('res.users', 'Last Modification User', readonly=True),
-        'dir_id': fields.many2one('document.directory', 'Directory', required=False, select=1),
-        'namespace': fields.char('Namespace', size=127, required=True),
-        'name': fields.char('Name', size=64, required=True),
-        'value': fields.text('Value'),
-        'do_subst': fields.boolean('Substitute', required=True),
-        }
-
-    _defaults = {
-        'do_subst': False,
-        }
-
-class dav_file_property(osv.osv):
-    """ Arbitrary WebDAV properties, attached to ir.attachments.
-
-    A special case is the locks that can be applied on file nodes.
-
-    There _can_ be properties without a file (RFC?), which means that they
-    globally apply to all the attachments of the present database.
-
-    TODO access permissions, per property.
-    """
-    _name = 'document.webdav.file.property'
-
-    _columns = {
-        'create_date': fields.datetime('Date Created', readonly=True),
-        'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
-        'write_date': fields.datetime('Date Modified', readonly=True),
-        'write_uid':  fields.many2one('res.users', 'Last Modification User', readonly=True),
-        'file_id': fields.many2one('ir.attachment', 'Document', required=False, select=1),
-        'namespace': fields.char('Namespace', size=127, required=True),
-        'name': fields.char('Name', size=64, required=True),
-        'value': fields.text('Value'),
-        'do_subst': fields.boolean('Substitute', required=True),
-        }
-
-    _defaults = {
-        'do_subst': False,
-        }
-
-#eof
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/i18n/ar.po b/addons/document_webdav/i18n/ar.po
deleted file mode 100644
index 3c941c4280e..00000000000
--- a/addons/document_webdav/i18n/ar.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-01 18:19+0000\n"
-"Last-Translator: gehad shaat <gehad.shaath@gmail.com>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:25+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "تاريخ الإنشاء"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "مستندات"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "خصائص الوثيقة"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "ابحث عن خصائص الوثيقة"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "نطاق أسماء"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "خصائص DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "الوثيق.ويبDAV.المل�.الخاصية"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "تجميع حسب..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "ستضا� هذه الخصائص إلى طلبات ص�حة الويب DAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "خصائص DAV للوثائق"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "مستند"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "مجلدات"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "خصائص الويبDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "خصائص DAV  للمجلدات"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "خصائص"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "الاسم"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "الوثيقة.الويبDAV.مباشر.الخاصية"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "قيمة"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "مسار"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "اخر مستخدم قام بالتعديل"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "مسار"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "تاريخ التعديل"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "الم�نش�ئ"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "خصائص الوثيقة"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "خصائص DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "استبدال"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "خطأ ! لايمكنك إنشاء مسارات متداخلة."
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "لا يمكن أن يكون المسار رئيسي لن�سه!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "اسم المسار يجب ان يكون �ريدا !"
-
-#~ msgid "Dynamic context"
-#~ msgstr "النص المتحرك"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "المسار يجب ان يكون له مسار رئيسي أو مخزن"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "خصائص DAV للمل�ات"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "خصائصDAV للوثائق"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "خدمة الويبDAV لإدارة الوثائق"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "الرجاء تثبيت PyWebDAV من "
-#~ "http://code.google.com/p/pywebdav/downloads/detailØŸname=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "خطأ استيراد PyWebDAV"
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
deleted file mode 100644
index 997527b3f2e..00000000000
--- a/addons/document_webdav/i18n/bg.po
+++ /dev/null
@@ -1,173 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-01 20:38+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Дата на �ъздаване"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Про�тран�тво на имената"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Групирай по"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Документ"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Свой�тва"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Име"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Стойно�т"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Директори�"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "По�ледна пром�на потребител"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "По�ока"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Дата на пром�на"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Създател"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Заме�ти"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Грешка! �е мжете да �ъздавате директории реур�ивно."
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Името на директори�та тр�бва да бъде уникално"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Директори�та не може да на�лед�ва �ама �ебе �и!"
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
deleted file mode 100644
index 310fa836ef0..00000000000
--- a/addons/document_webdav/i18n/ca.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-08-17 20:43+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Data de creació"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Cerca propietats del document"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espai de noms"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propietats DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar per..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Aquestes propietats s'afegiran a les peticions WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Document"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propietats WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propietats"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.propietat"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directori"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuari de l'última modificació"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Adr"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Data de modificació"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Creador/a"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substitut"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "Error d'importació PyWebDAV!"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Error! No podeu crear directoris recursius."
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Propietats DAV per a documents"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Propietats DAV per a carpetes"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "El directori no pot ser el seu propi pare!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "El nom de directori ha de ser únic!"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Instal·leu PyWebDAV des de "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Context dinàmic"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Servidor WebDAV per a gestió de documents"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "El directori ha de tenir un pare o un emmagatzematge."
diff --git a/addons/document_webdav/i18n/cs.po b/addons/document_webdav/i18n/cs.po
deleted file mode 100644
index 6daf586ef42..00000000000
--- a/addons/document_webdav/i18n/cs.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-03 03:52+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
deleted file mode 100644
index 9babfd37596..00000000000
--- a/addons/document_webdav/i18n/da.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-11-08 21:52+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Gruppér efter..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
deleted file mode 100644
index 2c46ed76ccc..00000000000
--- a/addons/document_webdav/i18n/de.po
+++ /dev/null
@@ -1,204 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-18 06:49+0000\n"
-"Last-Translator: Ferdinand <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Erstellungsdatum"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Dokumente"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Dokumenteigenschaft"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Dokumenteigenschaften suchen"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Namensbereich"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV Eigenschaften"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Gruppierung..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Diese Eigenschaften werden bei WebDav-Anfragen angefügt"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV Eigenschaften für Dokumente"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Dokument"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Verzeichnisse"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDav Eigenschaften"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV Eigenschaften für Verzeichnisse"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Bezeichnung"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Wert"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Letzte Änderung Benutzer"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Verzeichnis"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Änderungsdatum"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Ersteller"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Dokumenteneigenschaft"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV Eigenschaften"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituiere"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Fehler ! Sie können keine rekursiven Verzeichnisse anlegen."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "WebDAV Server für Dokumentenmanagement"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dyn. Kontext"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV Eigenschaften für Verzeichnisse"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Das Verzeichnis muss eindeutig sein"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Das Verzeichnis kann nicht sich selbst übergeordnet werden"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr ""
-#~ "Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
-#~ "haben"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Bitte installieren Sie PyWebDAV von hier:  "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV Import Fehler!"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "DAV Eigenschaften für Dokumente"
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
deleted file mode 100644
index 6df42c7fc8e..00000000000
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ /dev/null
@@ -1,163 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* document_webdav
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 17:05+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
-
diff --git a/addons/document_webdav/i18n/el.po b/addons/document_webdav/i18n/el.po
deleted file mode 100644
index 5b9cc4758e0..00000000000
--- a/addons/document_webdav/i18n/el.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-03 06:09+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/en_GB.po b/addons/document_webdav/i18n/en_GB.po
deleted file mode 100644
index 704d2bdeb48..00000000000
--- a/addons/document_webdav/i18n/en_GB.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-23 15:26+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Date Created"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documents"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Document property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Search Document properties"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Namespace"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV properties"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Group By..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "These properties will be added to WebDAV requests"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV Properties for Documents"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Document"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Folders"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV properties"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV Properties for Folders"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Properties"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Name"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Value"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directory"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Last Modification User"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Date Modified"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Creator"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Document Property"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV Properties"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substitute"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Error! You can not create recursive Directories."
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Directory cannot be parent of itself!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "The directory name must be unique !"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV Import Error!"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dynamic context"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Directory must have a parent or a storage"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "WebDAV server for Document Management"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV properties for folders"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "DAV properties for documents"
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
deleted file mode 100644
index 08953f7c55e..00000000000
--- a/addons/document_webdav/i18n/es.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-12 10:42+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Propiedad del documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Buscar propiedades del documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propiedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Propiedades DAV para los documentos"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Carpetas"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propiedades WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Propiedades DAV para las carpetas"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "documento.webdav.dir.propiedad"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuario última modificación"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Fecha de Modificación"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Autor"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Propiedad del documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "Propiedades DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituir"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "¡El nombre de directorio debe ser único!"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "¡Error de importación PyWebDAV!"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "¡Error! No puede crear directorios recursivos."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Servidor WebDAV para gestión de documentos"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Propiedades DAV para carpetas"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "¡El directorio no puede ser su propio padre!"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Instale PyWebDAV desde "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contexto dinámico"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Propiedades DAV para documentos"
diff --git a/addons/document_webdav/i18n/es_CR.po b/addons/document_webdav/i18n/es_CR.po
deleted file mode 100644
index aadb8755d6e..00000000000
--- a/addons/document_webdav/i18n/es_CR.po
+++ /dev/null
@@ -1,203 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-02-15 20:44+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-"Language: es\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Buscar propiedades del documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propiedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV Propiedades para Documentos"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Directorios"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propiedades WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV Propiedades para carpetas"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "documento.webdav.dir.propiedad"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuario última modificación"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Fecha de Modificación"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Autor"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV Propiedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituir"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "¡Error! No puede crear directorios recursivos."
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "¡Error de importación PyWebDAV!"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "¡El directorio no puede ser su propio padre!"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contexto dinámico"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "¡El nombre de directorio debe ser único!"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Instale PyWebDAV desde "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Servidor WebDAV para gestión de documentos"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Propiedades DAV para carpetas"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Propiedades DAV para documentos"
diff --git a/addons/document_webdav/i18n/es_EC.po b/addons/document_webdav/i18n/es_EC.po
deleted file mode 100644
index bc7602a94d5..00000000000
--- a/addons/document_webdav/i18n/es_EC.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-17 19:10+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/es_MX.po b/addons/document_webdav/i18n/es_MX.po
deleted file mode 100644
index 980373d3850..00000000000
--- a/addons/document_webdav/i18n/es_MX.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 09:01+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:43+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: document_webdav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Buscar propiedades del documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propiedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_file_props
-msgid "DAV properties for documents"
-msgstr "Propiedades DAV para documentos"
-
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "¡Error de importación PyWebDAV!"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.module.module,description:document_webdav.module_meta_information
-msgid ""
-" With this module, the WebDAV server for the documents is activated.\n"
-"        You can then use any compatible browser to remotely see the "
-"attachments of OpenObject.\n"
-"\n"
-"        After installation, the webDAV server can be controlled by a "
-"[webdav] section in the server's config.\n"
-"        Server Configuration Parameter:\n"
-"        [webdav]\n"
-"        ; enable = True ; Serve webdav over the http(s) servers\n"
-"        ; vdir = webdav ; the directory that webdav will be served at\n"
-"          ; this default val means that webdav will be\n"
-"          ; on \"http://localhost:8069/webdav/\n"
-"        ; verbose = True ; Turn on the verbose messages of webdav\n"
-"        ; debug = True ; Turn on the debugging messages of webdav\n"
-"          ; since the messages are routed to the python logging, with\n"
-"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
-"          ; these options on\n"
-msgstr ""
-" Con este módulo se activa el servidor WebDAV para los documentos.\n"
-"    Puede utilizar cualquier navegador compatible para ver los archivos "
-"adjuntos de forma remota OpenObject.\n"
-"\n"
-"    Después de la instalación, el servidor WebDAV puede ser controlado en la "
-"sección [webdav] de la configuración del servidor.\n"
-"    Parámetros de configuración del servidor:\n"
-"        [webdav]\n"
-"        ; enable = True ; Serve webdav over the http(s) servers\n"
-"        ; vdir = webdav ; the directory that webdav will be served at\n"
-"          ; this default val means that webdav will be\n"
-"          ; on \"http://localhost:8069/webdav/\n"
-"        ; verbose = True ; Turn on the verbose messages of webdav\n"
-"        ; debug = True ; Turn on the debugging messages of webdav\n"
-"          ; since the messages are routed to the python logging, with\n"
-"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
-"          ; these options on\n"
-
-#. module: document_webdav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinámico"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propiedades WebDAV"
-
-#. module: document_webdav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de directorio debe ser único!"
-
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Instale PyWebDAV desde "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_dir_props
-msgid "DAV properties for folders"
-msgstr "Propiedades DAV para carpetas"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "documento.webdav.dir.propiedad"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuario última modificación"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Fecha de Modificación"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Autor"
-
-#. module: document_webdav
-#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
-msgid "WebDAV server for Document Management"
-msgstr "Servidor WebDAV para gestión de documentos"
-
-#. module: document_webdav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituir"
diff --git a/addons/document_webdav/i18n/es_PY.po b/addons/document_webdav/i18n/es_PY.po
deleted file mode 100644
index 1abd3318f11..00000000000
--- a/addons/document_webdav/i18n/es_PY.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-21 16:13+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Buscar propiedades del documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propiedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propiedades WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "documento.webdav.dir.propiedad"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Carpeta"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuario de la última modificación"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Carp"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Fecha de modificación"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Autor"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituir"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "¡Error de importación PyWebDAV!"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "¡Error! No puede crear carpetas recursivos."
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Propiedades DAV para documentos"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Propiedades DAV para carpetas"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "¡El directorio no puede ser su propio padre!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "¡El nombre de carpeta debe ser único!"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Instale PyWebDAV desde "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contexto dinámico"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "La Carpeta debe tener un padre o un almacenamiento."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Servidor WebDAV para gestión de documentos"
diff --git a/addons/document_webdav/i18n/es_VE.po b/addons/document_webdav/i18n/es_VE.po
deleted file mode 100644
index 980373d3850..00000000000
--- a/addons/document_webdav/i18n/es_VE.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 09:01+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:43+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: document_webdav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Buscar propiedades del documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propiedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propiedades se añadirán a las peticiones WebDAV"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_file_props
-msgid "DAV properties for documents"
-msgstr "Propiedades DAV para documentos"
-
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr "¡Error de importación PyWebDAV!"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.module.module,description:document_webdav.module_meta_information
-msgid ""
-" With this module, the WebDAV server for the documents is activated.\n"
-"        You can then use any compatible browser to remotely see the "
-"attachments of OpenObject.\n"
-"\n"
-"        After installation, the webDAV server can be controlled by a "
-"[webdav] section in the server's config.\n"
-"        Server Configuration Parameter:\n"
-"        [webdav]\n"
-"        ; enable = True ; Serve webdav over the http(s) servers\n"
-"        ; vdir = webdav ; the directory that webdav will be served at\n"
-"          ; this default val means that webdav will be\n"
-"          ; on \"http://localhost:8069/webdav/\n"
-"        ; verbose = True ; Turn on the verbose messages of webdav\n"
-"        ; debug = True ; Turn on the debugging messages of webdav\n"
-"          ; since the messages are routed to the python logging, with\n"
-"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
-"          ; these options on\n"
-msgstr ""
-" Con este módulo se activa el servidor WebDAV para los documentos.\n"
-"    Puede utilizar cualquier navegador compatible para ver los archivos "
-"adjuntos de forma remota OpenObject.\n"
-"\n"
-"    Después de la instalación, el servidor WebDAV puede ser controlado en la "
-"sección [webdav] de la configuración del servidor.\n"
-"    Parámetros de configuración del servidor:\n"
-"        [webdav]\n"
-"        ; enable = True ; Serve webdav over the http(s) servers\n"
-"        ; vdir = webdav ; the directory that webdav will be served at\n"
-"          ; this default val means that webdav will be\n"
-"          ; on \"http://localhost:8069/webdav/\n"
-"        ; verbose = True ; Turn on the verbose messages of webdav\n"
-"        ; debug = True ; Turn on the debugging messages of webdav\n"
-"          ; since the messages are routed to the python logging, with\n"
-"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
-"          ; these options on\n"
-
-#. module: document_webdav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "Dynamic context"
-msgstr "Contexto dinámico"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propiedades WebDAV"
-
-#. module: document_webdav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de directorio debe ser único!"
-
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid ""
-"Please install PyWebDAV from "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-"Instale PyWebDAV desde "
-"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-"0.9.4.tar.gz&can=2&q=/"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_dir_props
-msgid "DAV properties for folders"
-msgstr "Propiedades DAV para carpetas"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "documento.webdav.dir.propiedad"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuario última modificación"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Fecha de Modificación"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Autor"
-
-#. module: document_webdav
-#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
-msgid "WebDAV server for Document Management"
-msgstr "Servidor WebDAV para gestión de documentos"
-
-#. module: document_webdav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituir"
diff --git a/addons/document_webdav/i18n/et.po b/addons/document_webdav/i18n/et.po
deleted file mode 100644
index 0bdcabf4967..00000000000
--- a/addons/document_webdav/i18n/et.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Estonian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-03 06:12+0000\n"
-"Last-Translator: lyyser <Unknown>\n"
-"Language-Team: Estonian <et@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
deleted file mode 100644
index 34ba223e20d..00000000000
--- a/addons/document_webdav/i18n/eu.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Basque translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-10-08 07:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Basque <eu@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/fi.po b/addons/document_webdav/i18n/fi.po
deleted file mode 100644
index 0165aa7580d..00000000000
--- a/addons/document_webdav/i18n/fi.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-07-20 10:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Luontipäivä"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Asiakirjat"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Hae dokumentin ominaisuuksia"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Nimiavaruus"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV ominaisuudet"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Ryhmittely.."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Nämä ominaisuudet lisätään WebDAV pyyntöihin"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Dokumenttien DAV ominaisuudet"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Dokumentti"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Hakemistot"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV ominaisuudet"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Hakemistojen DAV ominaisuudet"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Ominaisuudet"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nimi"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Arvo"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Hakemisto"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Viimeksi muuttanut käyttäjä"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Hakemisto"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Muokkauspäivä"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Tekijä"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV ominaisuudet"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Korvaa"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Virhe! Et voi luoda rekursiivisia kansioita."
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "DAV ominaisuudet dokumenteille"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Hakemisto ei voi olla itsensä ylähakemisto!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Hakemiston nimen tulee olla uniikki !"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV tuontivirhe !"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dynaaminen konteksti"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "WebDAV palvelin dokumenttienhallinnalle"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Hakemistolla täytyy olla ylätason hakemisto tai tietovarasto"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV ominaisuudet hakemistoille"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Asenna PyWebDAV osoitteesta "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
diff --git a/addons/document_webdav/i18n/fr.po b/addons/document_webdav/i18n/fr.po
deleted file mode 100644
index b3f218be952..00000000000
--- a/addons/document_webdav/i18n/fr.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 13:47+0000\n"
-"Last-Translator: Florian Hatat <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Date de création"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documents"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Propriétés du document"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Rechercher dans les propriétés du document"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espace de noms"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propriétés du DAV (Distributed Authoring and Versioning)"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Groupé par ..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Ces propriétés seront ajoutées aux requêtes WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Propriétés DAV pour les documents"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Document"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Répertoires"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propriétés WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Propriétés DAV pour les répertoires"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propriétés"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valeur"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Répertoire"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Utilisateur de la dernière modification"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Répertoire"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Date de modification"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Créateur"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Propriétés du document"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "Propriétés DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Remplacer"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erreur! Vous ne pouvez pas créer de répertoires récursifs."
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contexte dynamique"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Propriétés DAV pour les classeurs"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Un répertoire ne peut pas être son propre parent !"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Le nom du répertoire doit être unique !"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Installer PyWebDAV à partir de l'URL : "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Le répertoire doit avoir un parent ou un espace de stockage"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "Erreur d'import PyWebDAV !"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Propriétés DAV (Distributed Authoring and Versioning) du document"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Serveur WebDAV pour le module de Gestion Documentaire"
diff --git a/addons/document_webdav/i18n/gl.po b/addons/document_webdav/i18n/gl.po
deleted file mode 100644
index fa71b913b61..00000000000
--- a/addons/document_webdav/i18n/gl.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-02-24 01:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Data de creación"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Búsqueda de propiedades do documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Espazo de nomes"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propiedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar por ..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propiedades engadiranse as peticións WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propiedades WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "documento.webdav.dir.propiedad"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuario última modificación"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Data de modificación"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Creador"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituto"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "Erro de importación PyWebDAV!"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erro! Non se pode crear directorios recursivos."
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Propiedades DAV para documentos"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "O nome do directorio debe ser único!"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Instale PyWebDAV desde "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "O directorio non pode ser o seu propio pai!"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contexto dinámico"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Propiedades DAV para cartafois"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Servidor WebDAV para xestión de documentos"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "O directorio debe ter un pai ou un almacenamento."
diff --git a/addons/document_webdav/i18n/gu.po b/addons/document_webdav/i18n/gu.po
deleted file mode 100644
index 115c85051df..00000000000
--- a/addons/document_webdav/i18n/gu.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Gujarati translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-04-23 09:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Gujarati <gu@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "બનાવ�યાની તારીખ"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "દસ�તાવેજો"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "ગ�ર�પ દ�વારા..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "દસ�તાવેજ"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "ફોલ�ડર�સ"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "ગ�ણધર�મો"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "નામ"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "મૂલ�ય"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "ડિરેક�ટરી"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "ફેરફાર કર�યાની તારીખ"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "રચનાર"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/hr.po b/addons/document_webdav/i18n/hr.po
deleted file mode 100644
index d0388f2da0a..00000000000
--- a/addons/document_webdav/i18n/hr.po
+++ /dev/null
@@ -1,176 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-01-27 10:29+0000\n"
-"Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Datum stvaranja"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Dokumenti"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Svojstva dokumenta"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Pretraži svojstva dokumenta"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Imenski prostor"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV svojstva"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupiraj po..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Ova svojstva će biti dodana DAV upitima"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV svojstva za dokumente"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Dokument"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Mape"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WEB DAV svojstva"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV svojstva za mape"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Svojstva"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Naziv"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Vrijednost"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Mapa"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Korisnik posljednje promjene"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Datum izmjene"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Autor"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Svojstva dokumenta"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV svojstva"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Zamijeni"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Pogreška! Ne možete stvarati rekurzivne mape."
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Mapa ne može biti sama sebi nadređena!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Naziv mape mora biti jedinstven!"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Mapa mora imati roditelja ili pohranu (storage)"
diff --git a/addons/document_webdav/i18n/hu.po b/addons/document_webdav/i18n/hu.po
deleted file mode 100644
index ba8d5dea690..00000000000
--- a/addons/document_webdav/i18n/hu.po
+++ /dev/null
@@ -1,172 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * document_webdav
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-28 23:29+0000\n"
-"Last-Translator: krnkris <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Létrehozás dátuma"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Dokumentumok"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Dokumentum tulajdonsága"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Dokumentum tulajdonságok keresése"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Név helye"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV tulajdonságai"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Ezek a tulajdonságok hozzá lesznek adva a WebDAV igényhez"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV tulajdonságok a dokumetumokhoz"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Dokumentum"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Könyvtárak"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV tulajdonságok"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV tulajdonságok a könyvtárakhoz"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Tulajdonságok"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Név"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Érték"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Könyvtár"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Utolsó módosítást végzó felhasználó"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Mappa"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Módosítás dátuma"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Létrehozó"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Dokument tulajdonság"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV tuajdonság"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Helyettesítés"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Hiba! Nem hozhat létre körkörös mappahivatkozást."
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "A könyvtár nevének egyedinek kell lennie !"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dinamikus környezet"
diff --git a/addons/document_webdav/i18n/id.po b/addons/document_webdav/i18n/id.po
deleted file mode 100644
index 71cd66255f1..00000000000
--- a/addons/document_webdav/i18n/id.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Indonesian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-17 09:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Indonesian <id@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr ""
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
deleted file mode 100644
index ba97f135b89..00000000000
--- a/addons/document_webdav/i18n/it.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-01-12 13:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Data di creazione"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documenti"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Proprietà documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Cerca proprietà documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Namespace"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Proprietà DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Queste proprietà verranno aggiunte alle richieste WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Proprietà DAV per Documenti"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Cartelle"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Proprietà WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Proprietà DAV per Cartelle"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Proprietà"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valore"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directory"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Ultimo utente modificatore"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Data ultima modifica"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Creatore"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Proprietà Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "Proprietà DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Sostituire"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Errore! Non è possibile creare directory ricorsive."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "server WebDAV per Gestione Documentale"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contesto dinamico"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Proprietà DAV per cartelle"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "La cartella non può essere padre di sè stessa!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Il nome della cartella deve essere univoco!"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Per favore installare PyWebDAV dall'indirizzo: "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV: errore importazione!"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "La Cartella deve avere un padre o uno storage"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Proprietà DAV per documenti"
diff --git a/addons/document_webdav/i18n/ja.po b/addons/document_webdav/i18n/ja.po
deleted file mode 100644
index ccffd490882..00000000000
--- a/addons/document_webdav/i18n/ja.po
+++ /dev/null
@@ -1,193 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-04-21 00:03+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "作�日"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "文書"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "文書�特性を検索�る"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "�ームスペース"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV特性"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "グループ化…"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "�れら�特性�WebDAV�求�追加�れ��。"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "文書�DAV特性"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "文書"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "フォルダ"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV特性"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "フォルダ�DAV特性"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "特性"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "��"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "値"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "ディレクトリ"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "�回�修正��ユーザ"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "ディレクトリ"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "変更日"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "作�者"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV特性"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "代替"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "エラー：ディレクトリを�複��作る�������ん。"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "ディレクトリ��固有���れ�����ん。"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "下記�サイト�ら PyWebDAV をインストール������。 "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV��込�エラー"
-
-#~ msgid "Dynamic context"
-#~ msgstr "ダイナミック�文脈"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "ディレクトリ��れ自身�親レベル��れ��ん。"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "ディレクトリ�親�る��ストレージを������れ�����ん。"
diff --git a/addons/document_webdav/i18n/mk.po b/addons/document_webdav/i18n/mk.po
deleted file mode 100644
index 23cce809236..00000000000
--- a/addons/document_webdav/i18n/mk.po
+++ /dev/null
@@ -1,164 +0,0 @@
-# Macedonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-07 12:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Macedonian <mk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Датумот е креиран"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Документи"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Свој�тво на документ"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Барај �вој�тва на документ"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Про�тор за имиња"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV �вој�тва"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Групирај по..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Овие �вој�тва ќе бидат додадени на WebDAV барањата"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV �вој�тва за документи"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Документ"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Папки"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV �вој�тва"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV �вој�тва за папки"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Свој�тва"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Име"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Вредно�т"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Директориум"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Кори�ник на по�ледна измена"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Дир."
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Изменет датум"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Креатор"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Свој�тво на документ"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV �вој�тва"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Замена"
diff --git a/addons/document_webdav/i18n/mn.po b/addons/document_webdav/i18n/mn.po
deleted file mode 100644
index d69bf245091..00000000000
--- a/addons/document_webdav/i18n/mn.po
+++ /dev/null
@@ -1,173 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-29 11:14+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Үү�г���н огноо"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Баримтууд"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Баримтыг төлөвөөр хайх"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "��рийн муж"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Бүл�гл�в�л..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Баримт"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Хавт�ууд"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Үзүүл�лтүүд"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "��р"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Орлуулах"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "�лдаа! Тойрч холбогд�он хавта� үү�г�ж болохгүй."
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Хавта�ны н�р давхцаж болохгүй!"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Динамик контек�т"
diff --git a/addons/document_webdav/i18n/nb.po b/addons/document_webdav/i18n/nb.po
deleted file mode 100644
index ba87993ea5e..00000000000
--- a/addons/document_webdav/i18n/nb.po
+++ /dev/null
@@ -1,193 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-09-07 17:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Dato opprettet"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Dokumenter"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Søk Dokumentegenskaper."
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Navnerom"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV egenskaper"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "Dokumentet.WebDAV.fil.egenskap"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupper etter ..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Disse egenskapene vil bli lagt til WebDAV-forespørsler"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV Eiendommer for Dokumenter."
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Dokument"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Mapper"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV egenskaper."
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV egenskaper for mapper."
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Egenskaper"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Navn"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "Dokumentet.WebDAV.dir.eiendom"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Verdi"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Katalog"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Siste endring Bruker"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Retn"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Dato endret"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Opprettet av"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV Egenskaper."
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Erstatte"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Feil! Du kan opprette rekursive kataloger."
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Vennligst installer PyWebDAV fra "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Katalogen kan ikke være overordnede av seg selv!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Katalogen Navnet må være unikt!"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV importere Feil!"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dynamisk sammenheng"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Katalog må ha en overordnede eller en lagringsplass."
diff --git a/addons/document_webdav/i18n/nl.po b/addons/document_webdav/i18n/nl.po
deleted file mode 100644
index 783df9fdb70..00000000000
--- a/addons/document_webdav/i18n/nl.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-11-25 21:00+0000\n"
-"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Aanmaakdatum"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documenten"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Document eigenschap"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Document eigenschappen zoeken"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Naamruimte"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV eigenschappen"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Groepeer op..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Deze eigenschappen worden toegevoegd bij WebDAV aanvragen"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV instellingen voor documenten"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Document"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Mappen"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV eigenschappen"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV instellingen voor documenten"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Waarde"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Map"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Gebruiker laatste wijziging"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Map"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Datum gewijzigd"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Gemaakt door"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Document eigenschap"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV instellingen"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Vervangen"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Fout ! U kunt geen recursieve mappen maken."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "WebDAV server voor documentbeheer"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dynamische context"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV eigenschappen voor mappen"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Map kan niet bovenliggend aan zichzelf zijn!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "De mapnaam moet uniek zijn!"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Map moet een bovenliggende map hebben of opslag zijn"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Installeer aub PyWebDAV vanaf "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV import fout!"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "DAV eigenschappen voor documenten"
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
deleted file mode 100644
index 7a68242fb68..00000000000
--- a/addons/document_webdav/i18n/pl.po
+++ /dev/null
@@ -1,189 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-28 09:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Przestrzeń nazw"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Właściwiości DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupuj wg..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Te właściwości zostaną dodane do zgłoszeń WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Właściwości WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Właściwości"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nazwa"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Wartość"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Katalog"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Kat"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Subsytut"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Katalog nie może być nadrzędny dla samego siebie !"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "BÅ‚Ä…d importu PyWebDAV"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych katalogów."
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dynamiczny kontekst"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Właściwości DAV dla katalogów"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Nazwa katalogu musi być unikalna !"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Serwer WebDAV do ZarzÄ…dzania dokumentami"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Katalog musi mieć katalog nadrzędny lub nazwę napędu."
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
deleted file mode 100644
index 732196f47de..00000000000
--- a/addons/document_webdav/i18n/pt.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-17 14:02+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Data da Criação"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Propriedade do documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Procurar propriedades de documentos"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Namespace"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propriedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupo por..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propriedades serão adicionadas às solicitações WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Propriedades DAV para documentos"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Pastas"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV propriedades"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Propriedades DAV para documentos"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propriedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Directório"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Última Modificação do Utilizador"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Data Modificada"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Criador"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Propriedade do documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "Propriedades DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituir"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "DAV propriedades de documentos"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV Erro de importação!"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Uma pasta não pode ser ascendente de sí própria"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contexto dinâmico"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "O nome da pasta tem de ser único !"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Por favor instale PyWebDAV de "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV propriedades de pastas"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "WebDAV servidor para Gestão de Documentos"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "A pasta tem de ter um ascendente ou um armazenamento"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erro! Não é possível criar Pastas recursivas."
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
deleted file mode 100644
index 13fa0f2a10a..00000000000
--- a/addons/document_webdav/i18n/pt_BR.po
+++ /dev/null
@@ -1,193 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-10 18:01+0000\n"
-"Last-Translator: Projetaty Soluções OpenSource <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Dada de Criação"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Propriedade do Documento"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Procurar Propriedades dos Documentos"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Namespace"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Propriedades DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Agrupar Por..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Estas propriedades serão adicionadas para requisições WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Propriedades DAV para Documentos"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Pastas"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Propriedades WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Propriedades DAV para as pastas"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Propriedades"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valor"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Diretório"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Usuário da Última Modificação"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Modificado em"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Criador"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Propriedade do Documento"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "Propriedades DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Substituto"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Erro! Você não pode criar diretórios recursivos."
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Diretório não pode ser pai dele mesmo!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "O nome do diretório deve ser único !"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Contexo dinâmico"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Por favor instale o PyWebDAV de "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "Erro de Iimportação PyWEbDAV!"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "O diretório precisa ter um pai ou um armazenamento"
diff --git a/addons/document_webdav/i18n/ro.po b/addons/document_webdav/i18n/ro.po
deleted file mode 100644
index 3921af3a32d..00000000000
--- a/addons/document_webdav/i18n/ro.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-04 14:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Data Creata"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Documente"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Actul de proprietate"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Cautare Proprietati documente"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Spatiu nume"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "Proprietati DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "proprietate.fisier.document.webdav"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupeaza dupa..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Aceste proprietati vor fi adaugate cererilor WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Proprietati DAV pentru Documente"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Document"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Foldere"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "Proprietari WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Proprietati DAV pentru Foldere"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Proprietati"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Nume"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "proprietate.dir.document.webdav"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Valoare"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Director"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Utilizatorul ultimei modificari"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Director"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Data modificare"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Creator"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Actul de Proprietate"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "Proprietati DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Inlocuitor"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Eroare! Nu puteti crea Directoare recursive."
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "Proprietati DAV pentru documente"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "Proprietăți DAV pentru fisiere"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Directorul nu poate fi parinte lui insusi"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Numele directorului trebuie sa fie unic !"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "Eroare Import PyWebDAV!"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Context dinamic"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Serverul WebDAV pentru Managementul documentelor"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Directorul trebuie sa aiba un parinte sau o arhiva"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Va rugam sa instalati PyWebDAV de la adresa "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
diff --git a/addons/document_webdav/i18n/ru.po b/addons/document_webdav/i18n/ru.po
deleted file mode 100644
index b52b83eb92a..00000000000
--- a/addons/document_webdav/i18n/ru.po
+++ /dev/null
@@ -1,202 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-16 00:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Дата �оздани�"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Документы"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Свой�тво документа"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Пои�к по �вой�твам документа"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Про�тран�тво имён"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "�а�тройки DAV"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Группировать по ..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Эти �вой�тва будут добавлены к запро�ам WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Свой�тва DAV дл� документов"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Документ"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Папки"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "�а�тройки WebDAV"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Свой�тва DAV дл� папок"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Свой�тва"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "�азвание"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Значение"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Каталог"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "�втор по�леднего изменени�"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Кат."
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Дата изменени�"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Создатель"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Свой�тво документа"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "Свой�тва DAV"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Заменить"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "DAV-�вой�тва документа"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Каталог не может быть родитель�ким дл� �амого �еб�!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Им� каталога должно быть уникальным!"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "Ошибка импорта PyWebDAV"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Динамиче�кий контек�т"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Каталог должен иметь родител� или хранилище"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "Сервер WebDAV дл� управлени� документами"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Требует�� у�тановить PyWebDAV � адре�а "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV-�вой�тва папок"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Ошибка! �ельз� �оздавать вложенные директории."
diff --git a/addons/document_webdav/i18n/sl.po b/addons/document_webdav/i18n/sl.po
deleted file mode 100644
index e400dc7d2cd..00000000000
--- a/addons/document_webdav/i18n/sl.po
+++ /dev/null
@@ -1,167 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-08-03 06:12+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Datum nastanka"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Dokumenti"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Lastnost dokumenta"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Iskanje lastnosti dokumenta"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Imenski prostor"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV lasnosti"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Združi po ..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Te lastnosti bodo dodane k WebDAV zahtevkom"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV lastnosti za dokumente"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Dokument"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Mape"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV lastnosti"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV lastnosti za mape"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Lastnosti"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Vrednost"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Mapa"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Zadnja sprememba"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Mapa"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Datum spremembe"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Avtor"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Lastnost dokumenta"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV lastnosti"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Zamenjava"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Napaka! Ne morete izdelati rekurzivnih imenikov."
diff --git a/addons/document_webdav/i18n/sr.po b/addons/document_webdav/i18n/sr.po
deleted file mode 100644
index 69ae3709a62..00000000000
--- a/addons/document_webdav/i18n/sr.po
+++ /dev/null
@@ -1,176 +0,0 @@
-# Serbian translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-11-03 07:58+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Prostor"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV Svojstva"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupisano po..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Ova ce svojstva biti dodana WebDAV zahtevima"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV Svojstva"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Svojstva"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Vrednost"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Direktorijum"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Zamena"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne Direktorijume."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "WebDAV server za Upravljanje Dokumentima"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dinamicki Kontekst"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV svojstva za foldere"
diff --git a/addons/document_webdav/i18n/sr@latin.po b/addons/document_webdav/i18n/sr@latin.po
deleted file mode 100644
index d8f448fc745..00000000000
--- a/addons/document_webdav/i18n/sr@latin.po
+++ /dev/null
@@ -1,176 +0,0 @@
-# Serbian latin translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-12-23 16:24+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Prostor"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV osobine"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupisano po..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Ova ce svojstva biti dodana WebDAV zahtevima"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV Svojstva"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Svojstva"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Vrednost"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Direktorijum"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dir"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr ""
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Zamena"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Greska ! Ne mozes kreirati rekursivne Direktorijume."
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "WebDAV server za Upravljanje Dokumentima"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dinamicki Kontekst"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "DAV svojstva za foldere"
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
deleted file mode 100644
index 82f59f905d2..00000000000
--- a/addons/document_webdav/i18n/sv.po
+++ /dev/null
@@ -1,193 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-11-30 17:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "Skapad datum"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Dokument"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Sök bland dokumentens egenskaper"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Namnrymd"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV-attribut"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Gruppera"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Dessa attribut adderas till WebDAV-anropen"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "DAV-attribut för dokument"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Dokument"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Mappar"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV-attribut"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV-attribut för kataloger"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Attribut"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Namn"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "Värde"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Katalog"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Senaste ändring av användaren"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Katalog"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "Ändringsdatum"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "Författare"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV-attribut"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Ersätt"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Katalogen kan inte ha sig själv som förälder!"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Fel! Ni kan inte skapa rekursiva kataloger"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV importfel!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Katalognamnet måste vara unikt !"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Vänligen installera PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dynamiskt sammanhang"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Katalogen måste ha en förälder eller en lagringsplats"
diff --git a/addons/document_webdav/i18n/tr.po b/addons/document_webdav/i18n/tr.po
deleted file mode 100644
index 5e0cfe6715c..00000000000
--- a/addons/document_webdav/i18n/tr.po
+++ /dev/null
@@ -1,193 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-01-25 17:22+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "OluÅŸturma Tarihi"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "Belgeler"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "Döküman özelliği"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "Belge özelliklerini ara"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "İsimalanı"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV özellikleri"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "belge.webdav.dosya.özellik"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "Grupla..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "Özellikler WebDAV isteklerine aklenecektir"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "Belgeler için DAV Özellikleri"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "Belge"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "Klasörler"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV özellikleri"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "Klasörler için DAV özellikleri"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "Özellikler"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "Adı"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "belge.webdav.diz.özellik"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "DeÄŸer"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "Dizin"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "Son Değiştiren Kullanıcı"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "Dizin"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "DeÄŸiÅŸtirilme Tarihi"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "OluÅŸturan"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "Döküman özelliği"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV Özellikleri"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "Yedek"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "Hata! Yinelenen Dizinler oluşturamazsınız."
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV İçeaktarma Hatası!"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "Dizin kendisinin üstü olamaz!"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "Dizin adı eşsiz olmalı"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "Lütfen PyWebDAV2 "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/ adresinden kurun"
-
-#~ msgid "Dynamic context"
-#~ msgstr "Dinamik içerik"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "Dizinin bir üst dizini ya da depolaması olmalı"
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
deleted file mode 100644
index fbfb09ca78c..00000000000
--- a/addons/document_webdav/i18n/zh_CN.po
+++ /dev/null
@@ -1,201 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* document_ics
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-11-27 16:44+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "创建时间"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "文档"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr "��属性"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "文档属性列表"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "命�空间"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV属性"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "Copy text \t document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "分组..."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "这些属性将被添加到WebDAV请求上"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "文档的DAV属性"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "文件"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "目录"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "webDAV 属性"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "目录的DAV属性"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "属性"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "�称"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "值"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "目录"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "最近修改用户"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "目录"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "修改日期"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "创建人"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr "��属性"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV属性"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "替�"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "错误:你无法建立递归的目录"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV导入错误�"
-
-#~ msgid "DAV properties for documents"
-#~ msgstr "文档的DAV属性"
-
-#~ msgid "DAV properties for folders"
-#~ msgstr "目录的DAV属性"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "目录�必须唯一�"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "请从这里下载安装PyWebDAV \r\n"
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-
-#~ msgid "WebDAV server for Document Management"
-#~ msgstr "文档管�系统的WebDAV�务器"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "目录�能设为自己的父目录。"
-
-#~ msgid "Dynamic context"
-#~ msgstr "动�上下文"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "目录必须有父目录或一个存储区"
diff --git a/addons/document_webdav/i18n/zh_TW.po b/addons/document_webdav/i18n/zh_TW.po
deleted file mode 100644
index 4bf552ce267..00000000000
--- a/addons/document_webdav/i18n/zh_TW.po
+++ /dev/null
@@ -1,192 +0,0 @@
-# Chinese (Traditional) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-08-30 11:51+0000\n"
-"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
-"Language-Team: Cenoq Corp.\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:26+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_date:0
-#: field:document.webdav.file.property,create_date:0
-msgid "Date Created"
-msgstr "建立日期"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_document_props
-msgid "Documents"
-msgstr "文件"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Document property"
-msgstr ""
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Search Document properties"
-msgstr "�尋文件目錄"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: field:document.webdav.dir.property,namespace:0
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,namespace:0
-msgid "Namespace"
-msgstr "Namespace"
-
-#. module: document_webdav
-#: field:document.directory,dav_prop_ids:0
-msgid "DAV properties"
-msgstr "DAV 內容"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_file_property
-msgid "document.webdav.file.property"
-msgstr "document.webdav.file.property"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Group By..."
-msgstr "群組...."
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "These properties will be added to WebDAV requests"
-msgstr "這些內容將被加到 WebDAV 請求"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
-msgid "DAV Properties for Documents"
-msgstr "文件的DAV 內容"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-#: field:document.webdav.file.property,file_id:0
-msgid "Document"
-msgstr "文件"
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_folder_props
-msgid "Folders"
-msgstr "檔案夾"
-
-#. module: document_webdav
-#: view:document.directory:0
-msgid "WebDAV properties"
-msgstr "WebDAV 內容"
-
-#. module: document_webdav
-#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
-msgid "DAV Properties for Folders"
-msgstr "DAV 檔案夾內容"
-
-#. module: document_webdav
-#: view:document.directory:0
-#: view:document.webdav.dir.property:0
-#: view:document.webdav.file.property:0
-msgid "Properties"
-msgstr "內容"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,name:0
-#: field:document.webdav.file.property,name:0
-msgid "Name"
-msgstr "�稱"
-
-#. module: document_webdav
-#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
-msgid "document.webdav.dir.property"
-msgstr "document.webdav.dir.property"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,value:0
-#: field:document.webdav.file.property,value:0
-msgid "Value"
-msgstr "價值"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,dir_id:0
-#: model:ir.model,name:document_webdav.model_document_directory
-msgid "Directory"
-msgstr "目錄"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_uid:0
-#: field:document.webdav.file.property,write_uid:0
-msgid "Last Modification User"
-msgstr "最後修改使用者"
-
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Dir"
-msgstr "路徑"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,write_date:0
-#: field:document.webdav.file.property,write_date:0
-msgid "Date Modified"
-msgstr "修改日期"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,create_uid:0
-#: field:document.webdav.file.property,create_uid:0
-msgid "Creator"
-msgstr "建立者"
-
-#. module: document_webdav
-#: view:document.webdav.file.property:0
-msgid "Document Property"
-msgstr ""
-
-#. module: document_webdav
-#: model:ir.ui.menu,name:document_webdav.menu_properties
-msgid "DAV Properties"
-msgstr "DAV 內容"
-
-#. module: document_webdav
-#: field:document.webdav.dir.property,do_subst:0
-#: field:document.webdav.file.property,do_subst:0
-msgid "Substitute"
-msgstr "替代項目"
-
-#~ msgid "Error! You can not create recursive Directories."
-#~ msgstr "錯誤! 您�能建立循環的目錄"
-
-#, python-format
-#~ msgid "PyWebDAV Import Error!"
-#~ msgstr "PyWebDAV 匯入錯誤!"
-
-#~ msgid "Directory cannot be parent of itself!"
-#~ msgstr "目錄�能�為自己的�目錄!"
-
-#~ msgid "Dynamic context"
-#~ msgstr "動態背景"
-
-#~ msgid "The directory name must be unique !"
-#~ msgstr "目錄��能�覆�"
-
-#, python-format
-#~ msgid ""
-#~ "Please install PyWebDAV from "
-#~ "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/"
-#~ msgstr ""
-#~ "從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
-#~ "0.9.4.tar.gz&can=2&q=/，請安� PyWebDAV"
-
-#~ msgid "Directory must have a parent or a storage"
-#~ msgstr "目錄必須�有�目錄或儲存室"
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
deleted file mode 100644
index 9a35f3cfe1b..00000000000
--- a/addons/document_webdav/nodes.py
+++ /dev/null
@@ -1,416 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import time
-import urllib
-import uuid
-
-from openerp import SUPERUSER_ID
-from openerp.tools.safe_eval import safe_eval as eval
-
-from openerp.addons.document import document as nodes
-
-def dict_filter(srcdic, keys, res=None):
-    ''' Return a copy of srcdic that has only keys set.
-    If any of keys are missing from srcdic, the result won't have them, 
-    either.
-    @param res If given, result will be updated there, instead of a new dict.
-    '''
-    if res is None:
-        res = {}
-    for k in keys:
-        if k in srcdic:
-            res[k] = srcdic[k]
-    return res
-
-class node_acl_mixin(object):
-    def _get_dav_owner(self, cr):
-        return self.uuser
-
-    def _get_dav_group(self, cr):
-        return self.ugroup
-        
-    def _get_dav_supported_privilege_set(self, cr):
-        return '' # TODO
-    
-    def _get_dav_current_user_privilege_set(self, cr):
-        return '' # TODO
-
-    def _get_dav_props_hlpr(self, cr, par_class, prop_model, 
-                            prop_ref_field, res_id):
-        """ Helper for dav properties, usable in subclasses
-        
-        @param par_class The parent class
-        @param prop_model The name of the orm model holding the properties
-        @param prop_ref_field The name of the field at prop_model pointing to us
-        @param res_id the id of self in the corresponing orm table, that should
-                        match prop_model.prop_ref_field
-        """
-        ret = par_class.get_dav_props(self, cr)
-        if prop_model:
-            propobj = self.context._dirobj.pool[prop_model]
-            uid = self.context.uid
-            ctx = self.context.context.copy()
-            ctx.update(self.dctx)
-            # Not really needed because we don't do eval here:
-            # ctx.update({'uid': uid, 'dbname': self.context.dbname })
-            # dict_filter(self.context.extra_ctx, ['username', 'groupname', 'webdav_path'], ctx)
-            sdomain = [(prop_ref_field, '=', False),]
-            if res_id:
-                sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
-            prop_ids = propobj.search(cr, uid, sdomain, context=ctx)
-            if prop_ids:
-                ret = ret.copy()
-                for pbro in propobj.browse(cr, uid, prop_ids, context=ctx):
-                    ret[pbro.namespace] = ret.get(pbro.namespace, ()) + \
-                        (pbro.name,)
-                    # Note that we cannot have properties to conditionally appear
-                    # on the context, yet.
-                
-        return ret
-
-    def _get_dav_eprop_hlpr(self, cr, ns, prop,
-                            par_class, prop_model, 
-                            prop_ref_field, res_id):
-        """ Helper for get dav eprop, usable in subclasses
-        
-        @param namespace the one to search for
-        @param name Name to search for
-        @param par_class The parent class
-        @param prop_model The name of the orm model holding the properties
-        @param prop_ref_field The name of the field at prop_model pointing to us
-        @param res_id the id of self in the corresponing orm table, that should
-                        match prop_model.prop_ref_field
-        """
-        ret = par_class.get_dav_eprop(self, cr, ns, prop)
-        if ret is not None:
-            return ret
-        if prop_model:
-            propobj = self.context._dirobj.pool[prop_model]
-            uid = self.context.uid
-            ctx = self.context.context.copy()
-            ctx.update(self.dctx)
-            ctx.update({'uid': uid, 'dbname': self.context.dbname })
-            ctx['node_classname'] = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
-            dict_filter(self.context.extra_ctx, ['username', 'groupname', 'webdav_path'], ctx)
-            sdomain = [(prop_ref_field, '=', False),('namespace', '=', ns), ('name','=', prop)]
-            if res_id:
-                sdomain = ['|', (prop_ref_field, '=', res_id)] + sdomain
-            prop_ids = propobj.search(cr, uid, sdomain, context=ctx)
-            if prop_ids:
-                pbro = propobj.browse(cr, uid, prop_ids[0], context=ctx)
-                val = pbro.value
-                if pbro.do_subst:
-                    if val.startswith("('") and val.endswith(")"):
-                        glbls = { 'urlquote': urllib.quote, }
-                        val = eval(val, glbls, ctx)
-                    else:
-                        val = val % ctx
-                return val
-        return None
-
-    def _dav_lock_hlpr(self, cr, lock_data, par_class, prop_model,
-                            prop_ref_field, res_id):
-        """ Helper, which uses the dav properties table for placing locks
-        
-        @param lock_data a dictionary of input to this function.
-        @return list of tuples, DAV:activelock _contents_ structure.
-                See webdav.py:class Prop2Xml() for semantics
-        
-        Note: although the DAV response shall be an <activelock/>, this
-        function will only return the elements inside the activelock,
-        because the calling function needs to append the <lockroot/> in
-        it. See webdav.py:mk_lock_response()
-        
-        In order to reuse code, this function can be called with 
-        lock_data['unlock_mode']=True, in order to unlock.
-        
-        @return bool in unlock mode, (davstruct, prop_id, token) in lock/refresh,
-                    or (False, prop_id, token) if already locked,
-                    or (False, False, False) if lock not found to refresh
-        """
-        assert prop_model
-        assert res_id
-        assert isinstance(lock_data, dict), '%r' % lock_data
-        propobj = self.context._dirobj.pool[prop_model]
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        ctx.update({'uid': uid, 'dbname': self.context.dbname })
-        ctx['node_classname'] = "%s.%s" % (self.__class__.__module__, self.__class__.__name__)
-        dict_filter(self.context.extra_ctx, ['username', 'groupname', 'webdav_path'], ctx)
-        sdomain = [(prop_ref_field, '=', res_id), ('namespace', '=', 'DAV:'),
-                    ('name','=', 'lockdiscovery')]
-        props_to_delete = []
-        lock_found = False
-        lock_val = None
-        tmout2 = int(lock_data.get('timeout', 3*3600))
-        
-        prop_ids = propobj.search(cr, uid, sdomain, context=ctx)
-        if prop_ids:
-            for pbro in propobj.browse(cr, uid, prop_ids, context=ctx):
-                val = pbro.value
-                if pbro.do_subst:
-                    if val.startswith("('") and val.endswith(")"):
-                        glbls = { 'urlquote': urllib.quote, }
-                        val = eval(val, glbls, ctx)
-                    else:
-                        # all locks should be at "subst" format
-                        continue
-                if not (val and isinstance(val, tuple) 
-                        and val[0:2] == ( 'activelock','DAV:')):
-                    # print "Value is not activelock:", val
-                    continue
-                
-                old_token = False
-                old_owner = False
-                try:
-                    # discover the timeout. If anything goes wrong, delete
-                    # the lock (cleanup)
-                    tmout = False
-                    for parm in val[2]:
-                        if parm[1] != 'DAV:':
-                            continue
-                        if parm[0] == 'timeout':
-                            if isinstance(parm[2], basestring) \
-                                    and parm[2].startswith('Second-'):
-                                tmout = int(parm[2][7:])
-                        elif parm[0] == 'locktoken':
-                            if isinstance(parm[2], basestring):
-                                old_token = parm[2]
-                            elif isinstance(parm[2], tuple) and \
-                                parm[2][0:2] == ('href','DAV:'):
-                                    old_token = parm[2][2]
-                            else:
-                                # print "Mangled token in DAV property: %r" % parm[2]
-                                props_to_delete.append(pbro.id)
-                                continue
-                        elif parm[0] == 'owner':
-                            old_owner = parm[2] # not used yet
-                    if tmout:
-                        mdate = pbro.write_date or pbro.create_date
-                        mdate = time.mktime(time.strptime(mdate,'%Y-%m-%d %H:%M:%S'))
-                        if mdate + tmout < time.time():
-                            props_to_delete.append(pbro.id)
-                            continue
-                    else:
-                        props_to_delete.append(pbro.id)
-                        continue
-                except ValueError:
-                    props_to_delete.append(pbro.id)
-                    continue
-                
-                # A valid lock is found here
-                if lock_data.get('refresh', False):
-                    if old_token != lock_data.get('token'):
-                        continue
-                    # refresh mode. Just touch anything and the ORM will update
-                    # the write uid+date, won't it?
-                    # Note: we don't update the owner, because incoming refresh
-                    # wouldn't have a body, anyway.
-                    propobj.write(cr, uid, [pbro.id,], { 'name': 'lockdiscovery'})
-                elif lock_data.get('unlock_mode', False):
-                    if old_token != lock_data.get('token'):
-                        continue
-                    props_to_delete.append(pbro.id)
-                
-                lock_found = pbro.id
-                lock_val = val
-
-        if tmout2 > 3*3600: # 3 hours maximum
-            tmout2 = 3*3600
-        elif tmout2 < 300:
-            # 5 minutes minimum, but an unlock request can always
-            # break it at any time. Ensures no negative values, either.
-            tmout2 = 300
-        
-        if props_to_delete:
-            # explicitly delete, as admin, any of the ids we have identified.
-            propobj.unlink(cr, SUPERUSER_ID, props_to_delete)
-        
-        if lock_data.get('unlock_mode', False):
-            return lock_found and True
-        elif (not lock_found) and not (lock_data.get('refresh', False)):
-            # Create a new lock, attach and return it.
-            new_token = uuid.uuid4().urn
-            lock_val = ('activelock', 'DAV:', 
-                    [ ('locktype', 'DAV:', (lock_data.get('locktype',False) or 'write','DAV:')),
-                      ('lockscope', 'DAV:', (lock_data.get('lockscope',False) or 'exclusive','DAV:')),
-                      # ? ('depth', 'DAV:', lock_data.get('depth','0') ),
-                      ('timeout','DAV:', 'Second-%d' % tmout2),
-                      ('locktoken', 'DAV:', ('href', 'DAV:', new_token)),
-                      # ('lockroot', 'DAV: ..., we don't store that, appended by caller
-                    ])
-            new_owner = lock_data.get('lockowner',False) or ctx.get('username', False)
-            if new_owner:
-                lock_val[2].append( ('owner', 'DAV:',  new_owner) )
-            prop_id = propobj.create(cr, uid, { prop_ref_field: res_id,
-                    'namespace': 'DAV:', 'name': 'lockdiscovery',
-                    'do_subst': True, 'value': repr(lock_val) })
-            return (lock_val[2], prop_id, new_token )
-        elif not lock_found: # and refresh
-            return (False, False, False)
-        elif lock_found and not lock_data.get('refresh', False):
-            # already locked
-            return (False, lock_found, old_token)
-        else:
-            return (lock_val[2], lock_found, old_token )
-
-class node_dir(node_acl_mixin, nodes.node_dir):
-    """ override node_dir and add DAV functionality
-    """
-    DAV_PROPS = { "DAV:": ('owner', 'group', 
-                            'supported-privilege-set', 
-                            'current-user-privilege-set'), 
-                }
-    DAV_M_NS = { "DAV:" : '_get_dav',}
-    http_options = { 'DAV': ['access-control',] }
-
-    def get_dav_resourcetype(self, cr):
-        return ('collection', 'DAV:')
-
-    def get_dav_props(self, cr):
-        return self._get_dav_props_hlpr(cr, nodes.node_dir, 
-                'document.webdav.dir.property', 'dir_id', self.dir_id)
-
-    def get_dav_eprop(self, cr, ns, prop):
-        return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_dir,
-                'document.webdav.dir.property', 'dir_id', self.dir_id)
-
-
-class node_file(node_acl_mixin, nodes.node_file):
-    DAV_PROPS = { "DAV:": ('owner', 'group', 
-                            'supported-privilege-set', 
-                            'current-user-privilege-set',
-                            ), 
-                }
-    DAV_M_NS = { "DAV:" : '_get_dav',}
-    http_options = { 'DAV': ['access-control', ] }
-    pass
-
-    def get_dav_resourcetype(self, cr):
-        return ''
-
-    def get_dav_props(self, cr):
-        return self._get_dav_props_hlpr(cr, nodes.node_file, 
-                'document.webdav.file.property', 'file_id', self.file_id)
-
-    def dav_lock(self, cr, lock_data):
-        """ Locks or unlocks the node, using DAV semantics.
-        
-        Unlocking will be done when lock_data['unlock_mode'] == True
-        
-        See _dav_lock_hlpr() for calling details.
-        
-        It is fundamentally OK to use this function from non-DAV endpoints,
-        but they will all have to emulate the tuple-in-list structure of
-        the DAV lock data. RFC if this translation should be done inside
-        the _dav_lock_hlpr (to ease other protocols).
-        """
-        return self._dav_lock_hlpr(cr, lock_data, nodes.node_file, 
-                'document.webdav.file.property', 'file_id', self.file_id)
-
-    def dav_unlock(self, cr, token):
-        """Releases the token lock held for the node
-        
-        This is a utility complement of dav_lock()
-        """
-        lock_data = { 'token': token, 'unlock_mode': True }
-        return self._dav_lock_hlpr(cr, lock_data, nodes.node_file, 
-                'document.webdav.file.property', 'file_id', self.file_id)
-
-    def get_dav_eprop(self, cr, ns, prop):
-        if ns == 'DAV:' and prop == 'supportedlock':
-            return [ ('lockentry', 'DAV:', 
-                        [ ('lockscope','DAV:', ('shared', 'DAV:')),
-                          ('locktype','DAV:', ('write', 'DAV:')),
-                        ]),
-                   ('lockentry', 'DAV:', 
-                        [ ('lockscope','DAV:', ('exclusive', 'DAV:')),
-                          ('locktype','DAV:', ('write', 'DAV:')),
-                        ] )
-                   ]
-        return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_file,
-                'document.webdav.file.property', 'file_id', self.file_id)
-
-class node_database(nodes.node_database):
-    def get_dav_resourcetype(self, cr):
-        return ('collection', 'DAV:')
-
-    def get_dav_props(self, cr):
-        return self._get_dav_props_hlpr(cr, nodes.node_database,
-                'document.webdav.dir.property', 'dir_id', False)
-
-    def get_dav_eprop(self, cr, ns, prop):
-        return self._get_dav_eprop_hlpr(cr, nodes.node_database, ns, prop,
-                'document.webdav.dir.property', 'dir_id', False)
-
-class node_res_obj(node_acl_mixin, nodes.node_res_obj):
-    DAV_PROPS = { "DAV:": ('owner', 'group', 
-                            'supported-privilege-set', 
-                            'current-user-privilege-set'), 
-                }
-    DAV_M_NS = { "DAV:" : '_get_dav',}
-    http_options = { 'DAV': ['access-control',] }
-
-    def get_dav_resourcetype(self, cr):
-        return ('collection', 'DAV:')
-
-    def get_dav_props(self, cr):
-        return self._get_dav_props_hlpr(cr, nodes.node_res_obj, 
-                'document.webdav.dir.property', 'dir_id', self.dir_id)
-
-    def get_dav_eprop(self, cr, ns, prop):
-        return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_res_obj,
-                'document.webdav.dir.property', 'dir_id', self.dir_id)
-
-
-class node_res_dir(node_acl_mixin, nodes.node_res_dir):
-    DAV_PROPS = { "DAV:": ('owner', 'group', 
-                            'supported-privilege-set', 
-                            'current-user-privilege-set'), 
-                }
-    DAV_M_NS = { "DAV:" : '_get_dav',}
-    http_options = { 'DAV': ['access-control',] }
-    res_obj_class = node_res_obj
-
-    def get_dav_resourcetype(self, cr):
-        return ('collection', 'DAV:')
-
-    def get_dav_props(self, cr):
-        return self._get_dav_props_hlpr(cr, nodes.node_res_dir, 
-                'document.webdav.dir.property', 'dir_id', self.dir_id)
-
-    def get_dav_eprop(self, cr, ns, prop):
-        return self._get_dav_eprop_hlpr(cr, ns, prop, nodes.node_res_dir,
-                'document.webdav.dir.property', 'dir_id', self.dir_id)
-
-# Some copies, so that this module can replace 'from document import nodes'
-get_node_context = nodes.get_node_context
-node_context = nodes.node_context
-node_class = nodes.node_class
-node_descriptor = nodes.node_descriptor
-
-
-#eof
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/public_html/index.html b/addons/document_webdav/public_html/index.html
deleted file mode 100644
index b3a841aced7..00000000000
--- a/addons/document_webdav/public_html/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<title>OpenERP server</title>
-</head>
-<body>
-This is an OpenERP server. Nothing to GET here.
-</body>
-</html>
-
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
deleted file mode 100644
index 41cbe3b883b..00000000000
--- a/addons/document_webdav/redirect.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-import logging
-import urlparse
-from openerp.service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
-from openerp.service.http_server import HttpLogHandler
-_logger = logging.getLogger(__name__)
-class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
-    
-    _HTTP_OPTIONS = { 'Allow': ['OPTIONS', 'GET', 'HEAD', 'PROPFIND'] }
-    redirect_paths = {}
-
-    def __init__(self, request, client_address, server):
-        HTTPHandler.__init__(self,request,client_address,server)
-
-    def send_head(self):
-        """Common code for GET and HEAD commands.
-
-        It will either send the correct redirect (Location) response
-        or a 404.
-        """
-
-        if self.path.endswith('/'):
-            self.path = self.path[:-1]
-        
-        if not self.path:
-            # Return an empty page
-            self.send_response(200)
-            self.send_header("Content-Length", 0)
-            self.end_headers()
-            return None
-        
-        redir_path = self._find_redirect()
-        if redir_path is False:
-            self.send_error(404, "File not found")
-            return None
-        elif redir_path is None:
-            return None
-
-        server_proto = getattr(self.server, 'proto', 'http').lower()
-        addr, port = self.server.server_name, self.server.server_port
-        try:
-            addr, port = self.request.getsockname()
-        except Exception, e:
-            self.log_error("Cannot calculate own address:" , e)
-        
-        if self.headers.has_key('Host'):
-            uparts = list(urlparse.urlparse("%s://%s:%d"% (server_proto, addr,port)))
-            uparts[1] = self.headers['Host']
-            baseuri = urlparse.urlunparse(uparts)
-        else:
-            baseuri = "%s://%s:%d"% (server_proto, addr, port )
-
-
-        location = baseuri + redir_path
-        # relative uri: location = self.redirect_paths[self.path]
-
-        self.send_response(301)
-        self.send_header("Location", location)
-        self.send_header("Content-Length", 0)
-        self.end_headers()
-        # Do we need a Cache-content: header here?
-        _logger.debug("redirecting %s to %s", self.path, redir_path)
-        return None
-
-    def do_PROPFIND(self):
-        self._get_ignore_body()
-        return self.do_HEAD()
-
-    def _find_redirect(self):
-        """ Locate self.path among the redirects we can handle
-        @return The new path, False for 404 or None for already sent error
-        """
-        return self.redirect_paths.get(self.path, False)
-
-    def _get_ignore_body(self):
-        if not self.headers.has_key("content-length"):
-            return
-        max_chunk_size = 10*1024*1024
-        size_remaining = int(self.headers["content-length"])
-        got = ''
-        while size_remaining:
-            chunk_size = min(size_remaining, max_chunk_size)
-            got = self.rfile.read(chunk_size)
-            size_remaining -= len(got)
-
-#eof
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/security/ir.model.access.csv b/addons/document_webdav/security/ir.model.access.csv
deleted file mode 100644
index fa81bcee2e2..00000000000
--- a/addons/document_webdav/security/ir.model.access.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_webdav_dir_property_all,webdav.dir.property all,model_document_webdav_dir_property,,1,0,0,0
-access_webdav_dir_property_group_doc_manager,webdav.dir.property document manager,model_document_webdav_dir_property,base.group_system,1,1,1,1
-access_webdav_dir_property_group_system,webdav.dir.property group system,model_document_webdav_dir_property,base.group_system,1,1,1,1
-access_webdav_file_property_all,webdav.file.property all,model_document_webdav_file_property,,1,1,1,1
diff --git a/addons/document_webdav/test/webdav_test1.yml b/addons/document_webdav/test/webdav_test1.yml
deleted file mode 100644
index ae91d7cd4a8..00000000000
--- a/addons/document_webdav/test/webdav_test1.yml
+++ /dev/null
@@ -1,63 +0,0 @@
--
-    In order to test the document_webdav functionality
--
-    I open the HTTP port and perform an OPTIONS request to the server
--
-    !python {model: ir.attachment}: |
-        from document_webdav import test_davclient as te
-        reload(te) # reload..
-        dc = te.DAVClient(timeout=2.0)
-        # have a small timeout, enough for any heavily-loaded test server to
-        # respond, but small so that this test won't block further loading.
-        # Don't catch the exception, so that the whole YAML test will abort
-        # if the WebDAV service is not available (eg. during an upgrade from
-        # command line).
-        dc.gd_options()
-        dc.get_creds(self, cr, uid)
-        dc.gd_options(path=cr.dbname, expect={'DAV': ['1',]})
--
-    I will test the propnames at the document root
--
-    !python {model: ir.attachment}: |
-        from document_webdav import test_davclient as te
-        dc = te.DAVClient()
-        dc.get_creds(self, cr, uid)
-        dc.gd_propname(path=cr.dbname+'/Documents/')
--
-    I will test the ETags of the document root
--
-    !python {model: ir.attachment}: |
-        from document_webdav import test_davclient as te
-        dc = te.DAVClient()
-        dc.get_creds(self, cr, uid)
-        dc.gd_getetag(path=cr.dbname+'/Documents/')
-
--
-    I will now ls -l the document root.
--
-    !python {model: ir.attachment}: |
-        from document_webdav import test_davclient as te
-        dc = te.DAVClient()
-        dc.get_creds(self, cr, uid)
-        res = dc.gd_lsl(path=cr.dbname+'/Documents/')
-        for lin in res:
-            print "%(type)s\t%(uid)s\t%(gid)s\t%(size)s\t%(mtime)s\t%(name)s" % lin
--
-    I will put a file to the server
--
-    !python {model: ir.attachment}: |
-        from document_webdav import test_davclient as te
-        dc = te.DAVClient()
-        dc.get_creds(self, cr, uid)
-        tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py')
-        res = dc.gd_put(path=cr.dbname+'/Documents/test_davclient.py', srcpath=tdp)
--
-    I will try to get the file from the root
--
-    !python {model: ir.attachment}: |
-        from document_webdav import test_davclient as te
-        import addons
-        dc = te.DAVClient()
-        dc.get_creds(self, cr, uid)
-        tdp = openerp.modules.module.get_module_resource('document_webdav', 'test_davclient.py')
-        res = dc.gd_get(path=cr.dbname+'/Documents/test_davclient.py', crange=(4,508), compare=tdp)
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
deleted file mode 100644
index f3a8b35b582..00000000000
--- a/addons/document_webdav/test_davclient.py
+++ /dev/null
@@ -1,707 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright P. Christeas <p_christ@hol.gr> 2008,2009
-# Copyright OpenERP SA. (http://www.openerp.com) 2010
-#
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-###############################################################################
-
-""" A trivial HTTP/WebDAV client, used for testing the server
-"""
-# code taken from the 'http-client.py' script:
-# http://git.hellug.gr/?p=xrg/openerp;a=history;f=tests/http-client.py;hb=refs/heads/xrg-60
-
-import gzip
-import logging
-import xml.dom.minidom
-
-import httplib
-
-from openerp.tools import config
-from xmlrpclib import Transport, ProtocolError
-import StringIO
-import base64
-from openerp import SUPERUSER_ID
-
-_logger = logging.getLogger(__name__)
-
-class HTTP11(httplib.HTTP):
-        _http_vsn = 11
-        _http_vsn_str = 'HTTP/1.1'
-
-class PersistentTransport(Transport):
-    """Handles an HTTP transaction to an XML-RPC server, persistently."""
-
-    def __init__(self, use_datetime=0):
-        self._use_datetime = use_datetime
-        self._http = {}
-        log.debug("Using persistent transport")
-
-    def make_connection(self, host):
-        # create a HTTP connection object from a host descriptor
-        if not self._http.has_key(host):
-                host, extra_headers, x509 = self.get_host_info(host)
-                self._http[host] = HTTP11(host)
-                _logger.debug("New connection to %s", host)
-        return self._http[host]
-
-    def get_host_info(self, host):
-        host, extra_headers, x509 = Transport.get_host_info(self,host)
-        if extra_headers == None:
-                extra_headers = []
-
-        extra_headers.append( ( 'Connection', 'keep-alive' ))
-
-        return host, extra_headers, x509
-
-    def _parse_response(self, file, sock, response):
-        """ read response from input file/socket, and parse it
-            We are persistent, so it is important to only parse
-            the right amount of input
-        """
-
-        p, u = self.getparser()
-
-        if response.msg.get('content-encoding') == 'gzip':
-            gzdata = StringIO.StringIO()
-            while not response.isclosed():
-                rdata = response.read(1024)
-                if not rdata:
-                    break
-                gzdata.write(rdata)
-            gzdata.seek(0)
-            rbuffer = gzip.GzipFile(mode='rb', fileobj=gzdata)
-            while True:
-                respdata = rbuffer.read()
-                if not respdata:
-                    break
-                p.feed(respdata)
-        else:
-            while not response.isclosed():
-                rdata = response.read(1024)
-                if not rdata:
-                        break
-                p.feed(rdata)
-                if len(rdata)<1024:
-                        break
-
-        p.close()
-        return u.close()
-
-    def request(self, host, handler, request_body, verbose=0):
-        # issue XML-RPC request
-
-        h = self.make_connection(host)
-        if verbose:
-            h.set_debuglevel(1)
-
-        self.send_request(h, handler, request_body)
-        self.send_host(h, host)
-        self.send_user_agent(h)
-        self.send_content(h, request_body)
-
-        resp = h._conn.getresponse()
-        # TODO: except BadStatusLine, e:
-
-        errcode, errmsg, headers = resp.status, resp.reason, resp.msg
-
-
-        if errcode != 200:
-            raise ProtocolError(
-                host + handler,
-                errcode, errmsg,
-                headers
-                )
-
-        self.verbose = verbose
-
-        try:
-            sock = h._conn.sock
-        except AttributeError:
-            sock = None
-
-        return self._parse_response(h.getfile(), sock, resp)
-
-class CompressedTransport(PersistentTransport):
-    def send_content(self, connection, request_body):
-        connection.putheader("Content-Type", "text/xml")
-
-        if len(request_body) > 512 or True:
-            buffer = StringIO.StringIO()
-            output = gzip.GzipFile(mode='wb', fileobj=buffer)
-            output.write(request_body)
-            output.close()
-            buffer.seek(0)
-            request_body = buffer.getvalue()
-            connection.putheader('Content-Encoding', 'gzip')
-
-        connection.putheader("Content-Length", str(len(request_body)))
-        connection.putheader("Accept-Encoding",'gzip')
-        connection.endheaders()
-        if request_body:
-            connection.send(request_body)
-
-    def send_request(self, connection, handler, request_body):
-        connection.putrequest("POST", handler, skip_accept_encoding=1)
-
-class SafePersistentTransport(PersistentTransport):
-    def make_connection(self, host):
-        # create a HTTP connection object from a host descriptor
-        if not self._http.has_key(host):
-                host, extra_headers, x509 = self.get_host_info(host)
-                self._http[host] = httplib.HTTPS(host, None, **(x509 or {}))
-                _logger.debug("New connection to %s", host)
-        return self._http[host]
-
-class AuthClient(object):
-    def getAuth(self, atype, realm):
-        raise NotImplementedError("Cannot authenticate for %s" % atype)
-
-    def resolveFailedRealm(self, realm):
-        """ Called when, using a known auth type, the realm is not in cache
-        """
-        raise NotImplementedError("Cannot authenticate for realm %s" % realm)
-
-class BasicAuthClient(AuthClient):
-    def __init__(self):
-        self._realm_dict = {}
-
-    def getAuth(self, atype, realm):
-        if atype != 'Basic' :
-            return super(BasicAuthClient,self).getAuth(atype, realm)
-
-        if not self._realm_dict.has_key(realm):
-            _logger.debug("realm dict: %r", self._realm_dict)
-            _logger.debug("missing key: \"%s\"" % realm)
-            self.resolveFailedRealm(realm)
-        return 'Basic '+ self._realm_dict[realm]
-
-    def addLogin(self, realm, username, passwd):
-        """ Add some known username/password for a specific login.
-            This function should be called once, for each realm
-            that we want to authenticate against
-        """
-        assert realm
-        auths = base64.encodestring(username + ':' + passwd)
-        if auths[-1] == "\n":
-            auths = auths[:-1]
-        self._realm_dict[realm] = auths
-
-class addAuthTransport:
-    """ Intermediate class that authentication algorithm to http transport
-    """
-
-    def setAuthClient(self, authobj):
-        """ Set the authentication client object.
-            This method must be called before any request is issued, that
-            would require http authentication
-        """
-        assert isinstance(authobj, AuthClient)
-        self._auth_client = authobj
-
-
-    def request(self, host, handler, request_body, verbose=0):
-        # issue XML-RPC request
-
-        h = self.make_connection(host)
-        if verbose:
-            h.set_debuglevel(1)
-
-        tries = 0
-        atype = None
-        realm = None
-
-        while(tries < 3):
-            self.send_request(h, handler, request_body)
-            self.send_host(h, host)
-            self.send_user_agent(h)
-            if atype:
-                # This line will bork if self.setAuthClient has not
-                # been issued. That is a programming error, fix your code!
-                auths = self._auth_client.getAuth(atype, realm)
-                _logger.debug("sending authorization: %s", auths)
-                h.putheader('Authorization', auths)
-            self.send_content(h, request_body)
-
-            resp = h._conn.getresponse()
-            #  except BadStatusLine, e:
-            tries += 1
-
-            if resp.status == 401:
-                if 'www-authenticate' in resp.msg:
-                    (atype,realm) = resp.msg.getheader('www-authenticate').split(' ',1)
-                    data1 = resp.read()
-                    if data1:
-                        log.warning("Why have data on a 401 auth. message?")
-                    if realm.startswith('realm="') and realm.endswith('"'):
-                        realm = realm[7:-1]
-                    _logger.debug("Resp: %r %r", resp.version,resp.isclosed(), resp.will_close)
-                    _logger.debug("Want to do auth %s for realm %s", atype, realm)
-                    if atype != 'Basic':
-                        raise ProtocolError(host+handler, 403,
-                                        "Unknown authentication method: %s" % atype, resp.msg)
-                    continue # with the outer while loop
-                else:
-                    raise ProtocolError(host+handler, 403,
-                                'Server-incomplete authentication', resp.msg)
-
-            if resp.status != 200:
-                raise ProtocolError( host + handler,
-                    resp.status, resp.reason, resp.msg )
-
-            self.verbose = verbose
-
-            try:
-                sock = h._conn.sock
-            except AttributeError:
-                sock = None
-
-            return self._parse_response(h.getfile(), sock, resp)
-
-        raise ProtocolError(host+handler, 403, "No authentication.",'')
-
-class PersistentAuthTransport(addAuthTransport,PersistentTransport):
-    pass
-
-class PersistentAuthCTransport(addAuthTransport,CompressedTransport):
-    pass
-
-class HTTPSConnection(httplib.HTTPSConnection):
-        certs_file = None
-        def connect(self):
-            "Connect to a host on a given (SSL) port. check the certificate"
-            import socket, ssl
-
-            if HTTPSConnection.certs_file:
-                ca_certs = HTTPSConnection.certs_file
-                cert_reqs = ssl.CERT_REQUIRED
-            else:
-                ca_certs = None
-                cert_reqs = ssl.CERT_NONE
-            sock = socket.create_connection((self.host, self.port), self.timeout)
-            self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
-                                ca_certs=ca_certs,
-                                cert_reqs=cert_reqs)
-
-
-        def getpeercert(self):
-                import ssl
-                cert = None
-                if self.sock:
-                        cert =  self.sock.getpeercert()
-                else:
-                        cert = ssl.get_server_certificate((self.host,self.port),
-                                ssl_version=ssl.PROTOCOL_SSLv23 )
-                        lf = (len(ssl.PEM_FOOTER)+1)
-                        if cert[0-lf] != '\n':
-                                cert = cert[:0-lf]+'\n'+cert[0-lf:]
-                        _logger.debug("len-footer: %s cert: %r", lf, cert[0-lf])
-
-                return cert
-
-
-class DAVClient(object):
-    """An instance of a WebDAV client, connected to the OpenERP server
-    """
-
-    def __init__(self, user=None, passwd=None, dbg=0, use_ssl=False, useragent=False, timeout=None):
-        if use_ssl:
-            self.host = config.get_misc('httpsd', 'interface', False)
-            self.port = config.get_misc('httpsd', 'port', 8071)
-            if not self.host:
-                self.host = config.get('xmlrpcs_interface')
-                self.port = config.get('xmlrpcs_port')
-        else:
-            self.host = config.get_misc('httpd', 'interface')
-            self.port = config.get_misc('httpd', 'port', 8069)
-            if not self.host:
-                self.host = config.get('xmlrpc_interface')
-                self.port = config.get('xmlrpc_port') or self.port
-        if self.host == '0.0.0.0' or not self.host:
-            self.host = '127.0.0.1'
-        self.port = int(self.port)
-        if not config.get_misc('webdav','enable',True):
-            raise Exception("WebDAV is disabled, cannot continue")
-        self.davpath = '/' + config.get_misc('webdav','vdir','webdav')
-        self.user = user
-        self.passwd = passwd
-        self.dbg = dbg
-        self.timeout = timeout or 5.0 # seconds, tests need to respond pretty fast!
-        self.hdrs = {}
-        if useragent:
-            self.set_useragent(useragent)
-
-    def get_creds(self, obj, cr, uid):
-        """Read back the user credentials from cr, uid
-
-        @param obj is any orm object, in order to use its pool
-        @param uid is the numeric id, which we will try to reverse resolve
-
-        note: this is a hackish way to get the credentials. It is expected
-        to break if "base_crypt" is used.
-        """
-        ruob = obj.pool.get('res.users')
-        res = ruob.read(cr, SUPERUSER_ID, [uid,], ['login', 'password'])
-        assert res, "uid %s not found" % uid
-        self.user = res[0]['login']
-        self.passwd = res[0]['password']
-        if self.passwd.startswith('$1$'):
-            # md5 by base crypt. We cannot decode, wild guess
-            # that passwd = login
-            self.passwd = self.user
-        return True
-
-    def set_useragent(self, uastr):
-        """ Set the user-agent header to something meaningful.
-        Some shorthand names will be replaced by stock strings.
-        """
-        if uastr in ('KDE4', 'Korganizer'):
-            self.hdrs['User-Agent'] = "Mozilla/5.0 (compatible; Konqueror/4.4; Linux) KHTML/4.4.3 (like Gecko)"
-        elif uastr == 'iPhone3':
-            self.hdrs['User-Agent'] = "DAVKit/5.0 (765); iCalendar/5.0 (79); iPhone/4.1 8B117"
-        elif uastr == "MacOS":
-            self.hdrs['User-Agent'] = "WebDAVFS/1.8 (01808000) Darwin/9.8.0 (i386)"
-        else:
-            self.hdrs['User-Agent'] = uastr
-
-    def _http_request(self, path, method='GET', hdrs=None, body=None):
-        if not hdrs:
-            hdrs = {}
-        import base64
-        dbg = self.dbg
-        hdrs.update(self.hdrs)
-        _logger.debug("Getting %s http://%s:%d/%s", method, self.host, self.port, path)
-        conn = httplib.HTTPConnection(self.host, port=self.port, timeout=self.timeout)
-        conn.set_debuglevel(dbg)
-        if not path:
-            path = "/index.html"
-        if not hdrs.has_key('Connection'):
-                hdrs['Connection']= 'keep-alive'
-        conn.request(method, path, body, hdrs )
-        try:
-                r1 = conn.getresponse()
-        except httplib.BadStatusLine, bsl:
-                log.warning("Bad status line: %s", bsl.line)
-                raise Exception('Bad status line.')
-        if r1.status == 401: # and r1.headers:
-                if 'www-authenticate' in r1.msg:
-                        (atype,realm) = r1.msg.getheader('www-authenticate').split(' ',1)
-                        data1 = r1.read()
-                        if not self.user:
-                                raise Exception('Must auth, have no user/pass!')
-                        _logger.debug("Ver: %s, closed: %s, will close: %s", r1.version,r1.isclosed(), r1.will_close)
-                        _logger.debug("Want to do auth %s for realm %s", atype, realm)
-                        if atype == 'Basic' :
-                                auths = base64.encodestring(self.user + ':' + self.passwd)
-                                if auths[-1] == "\n":
-                                        auths = auths[:-1]
-                                hdrs['Authorization']= 'Basic '+ auths
-                                #sleep(1)
-                                conn.request(method, path, body, hdrs )
-                                r1 = conn.getresponse()
-                        else:
-                                raise Exception("Unknown auth type %s" %atype)
-                else:
-                        _logger.warning("Got 401, cannot auth")
-                        raise Exception('No auth')
-
-        _logger.debug("Reponse: %s %s",r1.status, r1.reason)
-        data1 = r1.read()
-        if method != 'GET':
-            _logger.debug("Body:\n%s\nEnd of body", data1)
-            try:
-                ctype = r1.msg.getheader('content-type')
-                if ctype and ';' in ctype:
-                    ctype, encoding = ctype.split(';',1)
-                if ctype == 'text/xml':
-                    doc = xml.dom.minidom.parseString(data1)
-                    _logger.debug("XML Body:\n %s", doc.toprettyxml(indent="\t"))
-            except Exception:
-                _logger.warning("Cannot print XML.", exc_info=True)
-                pass
-        conn.close()
-        return r1.status, r1.msg, data1
-
-    def _assert_headers(self, expect, msg):
-        """ Assert that the headers in msg contain the expect values
-        """
-        for k, v in expect.items():
-            hval = msg.getheader(k)
-            if not hval:
-                raise AssertionError("Header %s not defined in http response" % k)
-            if isinstance(v, (list, tuple)):
-                delim = ','
-                hits = map(str.strip, hval.split(delim))
-                mvits= []
-                for vit in v:
-                    if vit not in hits:
-                        mvits.append(vit)
-                if mvits:
-                    raise AssertionError("HTTP header \"%s\" is missing: %s" %(k, ', '.join(mvits)))
-            else:
-                if hval.strip() != v.strip():
-                    raise AssertionError("HTTP header \"%s: %s\"" % (k, hval))
-
-    def gd_options(self, path='*', expect=None):
-        """ Test the http options functionality
-            If a dictionary is defined in expect, those options are
-            asserted.
-        """
-        if path != '*':
-            path = self.davpath + path
-        hdrs = { 'Content-Length': 0
-                }
-        s, m, d = self._http_request(path, method='OPTIONS', hdrs=hdrs)
-        assert s == 200, "Status: %r" % s
-        assert 'OPTIONS' in m.getheader('Allow')
-        _logger.debug('Options: %r', m.getheader('Allow'))
-
-        if expect:
-            self._assert_headers(expect, m)
-
-    def _parse_prop_response(self, data):
-        """ Parse a propfind/propname response
-        """
-        def getText(node):
-            rc = []
-            for node in node.childNodes:
-                if node.nodeType == node.TEXT_NODE:
-                    rc.append(node.data)
-            return ''.join(rc)
-
-        def getElements(node, namespaces=None, strict=False):
-            for cnod in node.childNodes:
-                if cnod.nodeType != node.ELEMENT_NODE:
-                    if strict:
-                        _logger.debug("Found %r inside <%s>", cnod, node.tagName)
-                    continue
-                if namespaces and (cnod.namespaceURI not in namespaces):
-                    _logger.debug("Ignoring <%s> in <%s>", cnod.tagName, node.localName)
-                    continue
-                yield cnod
-
-        nod = xml.dom.minidom.parseString(data)
-        nod_r = nod.documentElement
-        res = {}
-        assert nod_r.localName == 'multistatus', nod_r.tagName
-        for resp in nod_r.getElementsByTagNameNS('DAV:', 'response'):
-            href = None
-            status = 200
-            res_nss = {}
-            for cno in getElements(resp, namespaces=['DAV:',]):
-                if cno.localName == 'href':
-                    assert href is None, "Second href in same response"
-                    href = getText(cno)
-                elif cno.localName == 'propstat':
-                    for pno in getElements(cno, namespaces=['DAV:',]):
-                        rstatus = None
-                        if pno.localName == 'prop':
-                            for prop in getElements(pno):
-                                key = prop.localName
-                                tval = getText(prop).strip()
-                                val = tval or (True, rstatus or status)
-                                if prop.namespaceURI == 'DAV:' and prop.localName == 'resourcetype':
-                                    val = 'plain'
-                                    for rte in getElements(prop, namespaces=['DAV:',]):
-                                        # Note: we only look at DAV:... elements, we
-                                        # actually expect only one DAV:collection child
-                                        val = rte.localName
-                                res_nss.setdefault(prop.namespaceURI,{})[key] = val
-                        elif pno.localName == 'status':
-                            rstr = getText(pno)
-                            htver, sta, msg = rstr.split(' ', 3)
-                            assert htver == 'HTTP/1.1'
-                            rstatus = int(sta)
-                        else:
-                            _logger.debug("What is <%s> inside a <propstat>?", pno.tagName)
-
-                else:
-                    _logger.debug("Unknown node: %s", cno.tagName)
-
-            res.setdefault(href,[]).append((status, res_nss))
-
-        return res
-
-    def gd_propfind(self, path, props=None, depth=0):
-        if not props:
-            propstr = '<allprop/>'
-        else:
-            propstr = '<prop>'
-            nscount = 0
-            for p in props:
-                ns = None
-                if isinstance(p, tuple):
-                    p, ns = p
-                if ns is None or ns == 'DAV:':
-                    propstr += '<%s/>' % p
-                else:
-                    propstr += '<ns%d:%s xmlns:ns%d="%s" />' %(nscount, p, nscount, ns)
-                    nscount += 1
-            propstr += '</prop>'
-
-        body="""<?xml version="1.0" encoding="utf-8"?>
-            <propfind xmlns="DAV:">%s</propfind>""" % propstr
-        hdrs = { 'Content-Type': 'text/xml; charset=utf-8',
-                'Accept': 'text/xml',
-                'Depth': depth,
-                }
-
-        s, m, d = self._http_request(self.davpath + path, method='PROPFIND',
-                                    hdrs=hdrs, body=body)
-        assert s == 207, "Bad status: %s" % s
-        ctype = m.getheader('Content-Type').split(';',1)[0]
-        assert ctype == 'text/xml', m.getheader('Content-Type')
-        res = self._parse_prop_response(d)
-        if depth == 0:
-            assert len(res) == 1
-            res = res.values()[0]
-        else:
-            assert len(res) >= 1
-        return res
-
-
-    def gd_propname(self, path, depth=0):
-        body="""<?xml version="1.0" encoding="utf-8"?>
-            <propfind xmlns="DAV:"><propname/></propfind>"""
-        hdrs = { 'Content-Type': 'text/xml; charset=utf-8',
-                'Accept': 'text/xml',
-                'Depth': depth
-                }
-        s, m, d = self._http_request(self.davpath + path, method='PROPFIND',
-                                    hdrs=hdrs, body=body)
-        assert s == 207, "Bad status: %s" % s
-        ctype = m.getheader('Content-Type').split(';',1)[0]
-        assert ctype == 'text/xml', m.getheader('Content-Type')
-        res = self._parse_prop_response(d)
-        if depth == 0:
-            assert len(res) == 1
-            res = res.values()[0]
-        else:
-            assert len(res) >= 1
-        return res
-
-    def gd_getetag(self, path, depth=0):
-        return self.gd_propfind(path, props=['getetag',], depth=depth)
-
-    def gd_lsl(self, path):
-        """ Return a list of 'ls -l' kind of data for a folder
-
-            This is based on propfind.
-        """
-
-        lspairs = [ ('name', 'displayname', 'n/a'), ('size', 'getcontentlength', '0'),
-                ('type', 'resourcetype', '----------'), ('uid', 'owner', 'nobody'),
-                ('gid', 'group', 'nogroup'), ('mtime', 'getlastmodified', 'n/a'),
-                ('mime', 'getcontenttype', 'application/data'), ]
-
-        propnames = [ l[1] for l in lspairs]
-        propres = self.gd_propfind(path, props=propnames, depth=1)
-
-        res = []
-        for href, pr in propres.items():
-            lsline = {}
-            for st, nsdic in pr:
-                davprops = nsdic['DAV:']
-                if st == 200:
-                    for lsp in lspairs:
-                        if lsp[1] in davprops:
-                            if lsp[1] == 'resourcetype':
-                                if davprops[lsp[1]] == 'collection':
-                                    lsline[lsp[0]] = 'dr-xr-x---'
-                                else:
-                                    lsline[lsp[0]] = '-r-xr-x---'
-                            else:
-                                lsline[lsp[0]] = davprops[lsp[1]]
-                elif st in (404, 403):
-                    for lsp in lspairs:
-                        if lsp[1] in davprops:
-                            lsline[lsp[0]] = lsp[2]
-                else:
-                    _logger.debug("Strange status: %s", st)
-
-            res.append(lsline)
-
-        return res
-
-    def gd_get(self, path, crange=None, mime=None, compare=None):
-        """ HTTP GET for path, supporting Partial ranges
-        """
-        hdrs = { 'Accept': mime or '*/*', }
-        if crange:
-            if isinstance(crange, tuple):
-                crange = [crange,]
-            if not isinstance(crange, list):
-                raise TypeError("Range must be a tuple or list of tuples.")
-            rs = []
-            for r in crange:
-                rs.append('%d-%d' % r)
-            hdrs['Range'] = 'bytes='+ (','.join(rs))
-        s, m, d = self._http_request(self.davpath + path, method='GET', hdrs=hdrs)
-        assert s in (200, 206), "Bad status: %s" % s
-        ctype = m.getheader('Content-Type')
-        if ctype and ';' in ctype:
-            ctype = ctype.split(';',1)[0]
-        if mime:
-            assert ctype == mime, m.getheader('Content-Type')
-        rrange = None
-        rrh = m.getheader('Content-Range')
-        if rrh:
-            assert rrh.startswith('bytes '), rrh
-            rrh=rrh[6:].split('/',1)[0]
-            rrange = map(int, rrh.split('-',1))
-        if compare:
-            # we need to compare the returned data with that of compare
-            fd = open(compare, 'rb')
-            d2 = fd.read()
-            fd.close()
-            if crange:
-                if len(crange) > 1:
-                    raise NotImplementedError
-                r = crange[0]
-                d2 = d2[r[0]:r[1]+1]
-            assert d2 == d, "Data does not match"
-        return ctype, rrange, d
-
-    def gd_put(self, path, body=None, srcpath=None, mime=None, noclobber=False):
-        """ HTTP PUT
-            @param noclobber will prevent overwritting a resource (If-None-Match)
-            @param mime will set the content-type
-        """
-        hdrs = { }
-        if not (body or srcpath):
-            raise ValueError("PUT must have something to send.")
-        if (not body) and srcpath:
-            fd = open(srcpath, 'rb')
-            body = fd.read()
-            fd.close()
-        if mime:
-            hdrs['Content-Type'] = mime
-        if noclobber:
-            hdrs['If-None-Match'] = '*'
-        s, m, d = self._http_request(self.davpath + path, method='PUT',
-                            hdrs=hdrs, body=body)
-        assert s == (201), "Bad status: %s" % s
-        etag = m.getheader('ETag')
-        return etag or True
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
deleted file mode 100644
index aedad059c16..00000000000
--- a/addons/document_webdav/webdav.py
+++ /dev/null
@@ -1,350 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#    Copyright (c) 1999 Christian Scholz (ruebe@aachen.heimat.de)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import logging
-
-_logger = logging.getLogger(__name__)
-import xml.dom.minidom
-domimpl = xml.dom.minidom.getDOMImplementation()
-from xml.dom.minicompat import StringTypes
-
-import urlparse
-import urllib
-from openerp.osv import osv
-from openerp.tools.translate import _
-
-try:
-    from pywebdav.lib import utils
-    from pywebdav.lib.propfind import PROPFIND
-    from pywebdav.lib.report import REPORT
-except ImportError:
-    from DAV import utils
-    from DAV.propfind import PROPFIND
-    from DAV.report import REPORT
-
-from openerp import tools
-
-class Text2(xml.dom.minidom.Text):
-    def writexml(self, writer, indent="", addindent="", newl=""):
-        data = "%s%s%s" % (indent, self.data, newl)
-        data = data.replace("&", "&amp;").replace("<", "&lt;")
-        data = data.replace(">", "&gt;")
-        writer.write(data)
-
-class Prop2xml(object):
-    """ A helper class to convert property structs to DAV:XML
-    
-        Written to generalize the use of _prop_child(), a class is 
-        needed to hold some persistent data accross the recursions 
-        of _prop_elem_child().
-    """
-    
-    def __init__(self, doc, namespaces, nsnum):
-        """ Init the structure
-        @param doc the xml doc element
-        @param namespaces a dict of namespaces
-        @param nsnum the next namespace number to define
-        """
-        self.doc = doc
-        self.namespaces = namespaces
-        self.nsnum = nsnum
-
-    def createText2Node(self, data):
-        if not isinstance(data, StringTypes):
-            raise TypeError, "Node contents must be a string."
-        t = Text2()
-        t.data = data
-        t.ownerDocument = self.doc
-        return t
-
-    def _prop_child(self, xnode, ns, prop, value):
-        """Append a property xml node to xnode, with <prop>value</prop>
-
-           And a little smarter than that, it will consider namespace and
-           also allow nested properties etc.
-
-           :param ns the namespace of the <prop/> node
-           :param prop the name of the property
-           :param value the value. Can be:
-                    string: text node
-                    tuple ('elem', 'ns') for empty sub-node <ns:elem />
-                    tuple ('elem', 'ns', sub-elems) for sub-node with elements
-                    tuple ('elem', 'ns', sub-elems, {attrs}) for sub-node with 
-                            optional elements and attributes
-                    list, of above tuples
-        """
-        if ns == 'DAV:':
-            ns_prefix = 'D:'
-        else:
-            ns_prefix="ns"+str(self.namespaces.index(ns))+":"
-
-        pe = self.doc.createElement(ns_prefix+str(prop))
-        if hasattr(value, '__class__') and value.__class__.__name__ == 'Element':
-            pe.appendChild(value)
-        else:
-            if ns == 'DAV:' and prop=="resourcetype" and isinstance(value, int):
-                # hack, to go..
-                if value == 1:
-                    ve = self.doc.createElement("D:collection")
-                    pe.appendChild(ve)
-            else:
-                self._prop_elem_child(pe, ns, value, ns_prefix)
-
-            xnode.appendChild(pe)
-
-    def _prop_elem_child(self, pnode, pns, v, pns_prefix):
-
-        if isinstance(v, list):
-            for vit in v:
-                self._prop_elem_child(pnode, pns, vit, pns_prefix)
-        elif isinstance(v,tuple):
-            need_ns = False
-            if v[1] == pns:
-                ns_prefix = pns_prefix
-            elif v[1] == 'DAV:':
-                ns_prefix = 'D:'
-            elif v[1] in self.namespaces:
-                ns_prefix="ns"+str(self.namespaces.index(v[1]))+":"
-            else:
-                ns_prefix="ns"+str(self.nsnum)+":"
-                need_ns = True
-
-            ve = self.doc.createElement(ns_prefix+v[0])
-            if need_ns:
-                ve.setAttribute("xmlns:ns"+str(self.nsnum), v[1])
-            if len(v) > 2 and v[2] is not None:
-                if isinstance(v[2], (list, tuple)):
-                    # support nested elements like:
-                    # ( 'elem', 'ns:', [('sub-elem1', 'ns1'), ...]
-                    self._prop_elem_child(ve, v[1], v[2], ns_prefix)
-                else:
-                    vt = self.createText2Node(tools.ustr(v[2]))
-                    ve.appendChild(vt)
-            if len(v) > 3 and v[3]:
-                assert isinstance(v[3], dict)
-                for ak, av in v[3].items():
-                    ve.setAttribute(ak, av)
-            pnode.appendChild(ve)
-        else:
-            ve = self.createText2Node(tools.ustr(v))
-            pnode.appendChild(ve)
-
-
-super_mk_prop_response = PROPFIND.mk_prop_response
-def mk_prop_response(self, uri, good_props, bad_props, doc):
-    """ make a new <prop> result element
-
-    We differ between the good props and the bad ones for
-    each generating an extra <propstat>-Node (for each error
-    one, that means).
-
-    """
-    re=doc.createElement("D:response")
-    # append namespaces to response
-    nsnum=0
-    namespaces = self.namespaces[:]
-    if 'DAV:' in namespaces:
-        namespaces.remove('DAV:')
-    for nsname in namespaces:
-        re.setAttribute("xmlns:ns"+str(nsnum),nsname)
-        nsnum=nsnum+1
-
-    propgen = Prop2xml(doc, namespaces, nsnum)
-    # write href information
-    uparts=urlparse.urlparse(uri)
-    fileloc=uparts[2]
-    if uparts[3]:
-        fileloc += ';' + uparts[3]
-    if isinstance(fileloc, unicode):
-        fileloc = fileloc.encode('utf-8')
-    href=doc.createElement("D:href")
-    davpath = self._dataclass.parent.get_davpath()
-    if uparts[0] and uparts[1]:
-        hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
-    else:
-        # When the request has been relative, we don't have enough data to
-        # reply with absolute url here.
-        hurl = '%s%s' % (davpath, urllib.quote(fileloc))
-    huri=doc.createTextNode(hurl)
-    href.appendChild(huri)
-    re.appendChild(href)
-
-    # write good properties
-    ps=doc.createElement("D:propstat")
-    if good_props:
-        re.appendChild(ps)
-    s=doc.createElement("D:status")
-    t=doc.createTextNode("HTTP/1.1 200 OK")
-    s.appendChild(t)
-    ps.appendChild(s)
-
-    gp=doc.createElement("D:prop")
-    for ns in good_props.keys():
-        if ns == 'DAV:':
-            ns_prefix = 'D:'
-        else:
-            ns_prefix="ns"+str(namespaces.index(ns))+":"
-        for p,v in good_props[ns].items():
-            if v is None:
-                continue
-            propgen._prop_child(gp, ns, p, v)
-
-    ps.appendChild(gp)
-    re.appendChild(ps)
-
-    # now write the errors!
-    if len(bad_props.items()):
-
-        # write a propstat for each error code
-        for ecode in bad_props.keys():
-            ps=doc.createElement("D:propstat")
-            re.appendChild(ps)
-            s=doc.createElement("D:status")
-            t=doc.createTextNode(utils.gen_estring(ecode))
-            s.appendChild(t)
-            ps.appendChild(s)
-            bp=doc.createElement("D:prop")
-            ps.appendChild(bp)
-
-            for ns in bad_props[ecode].keys():
-                if ns == 'DAV:':
-                    ns_prefix='D:'
-                else:
-                    ns_prefix="ns"+str(self.namespaces.index(ns))+":"
-
-            for p in bad_props[ecode][ns]:
-                pe=doc.createElement(ns_prefix+str(p))
-                bp.appendChild(pe)
-
-            re.appendChild(ps)
-
-    # return the new response element
-    return re
-
-
-def mk_propname_response(self, uri, propnames, doc):
-    """ make a new <prop> result element for a PROPNAME request
-
-    This will simply format the propnames list.
-    propnames should have the format {NS1 : [prop1, prop2, ...], NS2: ...}
-
-    """
-    re=doc.createElement("D:response")
-
-    # write href information
-    uparts=urlparse.urlparse(uri)
-    fileloc=uparts[2]
-    if uparts[3]:
-        fileloc += ';' + uparts[3]
-    if isinstance(fileloc, unicode):
-        fileloc = fileloc.encode('utf-8')
-    href=doc.createElement("D:href")
-    davpath = self._dataclass.parent.get_davpath()
-    if uparts[0] and uparts[1]:
-        hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
-    else:
-        # When the request has been relative, we don't have enough data to
-        # reply with absolute url here.
-        hurl = '%s%s' % (davpath, urllib.quote(fileloc))
-    huri=doc.createTextNode(hurl)
-    href.appendChild(huri)
-    re.appendChild(href)
-
-    ps=doc.createElement("D:propstat")
-    nsnum=0
-
-    for ns,plist in propnames.items():
-        # write prop element
-        pr=doc.createElement("D:prop")
-        if ns == 'DAV':
-            nsp = 'D'
-        else:
-            nsp="ns"+str(nsnum)
-            ps.setAttribute("xmlns:"+nsp,ns)
-            nsnum=nsnum+1
-
-        # write propertynames
-        for p in plist:
-            pe=doc.createElement(nsp+":"+p)
-            pr.appendChild(pe)
-
-        ps.appendChild(pr)
-
-    re.appendChild(ps)
-
-    return re
-
-PROPFIND.mk_prop_response = mk_prop_response
-PROPFIND.mk_propname_response = mk_propname_response
-
-def mk_lock_response(self, uri, props):
-    """ Prepare the data response to a DAV LOCK command
-    
-    This function is here, merely to be in the same file as the
-    ones above, that have similar code.
-    """
-    doc = domimpl.createDocument('DAV:', "D:prop", None)
-    ms = doc.documentElement
-    ms.setAttribute("xmlns:D", "DAV:")
-    # ms.tagName = 'D:multistatus'
-    namespaces = []
-    nsnum = 0
-    propgen = Prop2xml(doc, namespaces, nsnum)
-    # write href information
-    uparts=urlparse.urlparse(uri)
-    fileloc=uparts[2]
-    if uparts[3]:
-        fileloc += ';' + uparts[3]
-    if isinstance(fileloc, unicode):
-        fileloc = fileloc.encode('utf-8')
-    davpath = self.parent.get_davpath()
-    if uparts[0] and uparts[1]:
-        hurl = '%s://%s%s%s' % (uparts[0], uparts[1], davpath, urllib.quote(fileloc))
-    else:
-        # When the request has been relative, we don't have enough data to
-        # reply with absolute url here.
-        hurl = '%s%s' % (davpath, urllib.quote(fileloc))
-        
-    props.append( ('lockroot', 'DAV:', ('href', 'DAV:', (hurl))))
-    pld = doc.createElement('D:lockdiscovery')
-    ms.appendChild(pld)
-    propgen._prop_child(pld, 'DAV:', 'activelock', props)
-
-    return doc.toxml(encoding="utf-8")
-
-super_create_prop = REPORT.create_prop
-
-def create_prop(self):
-    try:
-        if (self.filter is not None) and self._depth == "0":
-            hrefs = self.filter.getElementsByTagNameNS('DAV:', 'href')
-            if hrefs:
-                self._depth = "1"
-    except Exception:
-        pass
-    return super_create_prop(self)
-
-REPORT.create_prop = create_prop
-
-#eof
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/webdav_demo.xml b/addons/document_webdav/webdav_demo.xml
deleted file mode 100644
index 9bd68b8a1f1..00000000000
--- a/addons/document_webdav/webdav_demo.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-<record id="document_webdav_dir_property_nodeclass0" model="document.webdav.dir.property">
-    <field name="namespace">debug:</field>
-    <field name="name">node_class</field>
-    <field name="value">%(node_classname)s</field>
-    <field eval="1" name="do_subst"/>
-</record>
-
-<!--
-<record id="document_webdav_dir_property_debug0" model="document.webdav.dir.property">
-    <field name="namespace">debug:</field>
-    <field name="name">node_context</field>
-    <field name="value">%r</field>
-    <! dash dash This will expose the whole context at the property !>
-    <field eval="1" name="do_subst"/>
-</record>
--->
-
-</data>
-</openerp>
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
deleted file mode 100644
index e495f5c9f2f..00000000000
--- a/addons/document_webdav/webdav_server.py
+++ /dev/null
@@ -1,676 +0,0 @@
-# -*- encoding: utf-8 -*-
-############################################################################9
-#
-# Copyright P. Christeas <p_christ@hol.gr> 2008-2010
-# Copyright OpenERP SA, 2010 (http://www.openerp.com )
-#
-# Disclaimer: Many of the functions below borrow code from the
-#   python-webdav library (http://code.google.com/p/pywebdav/ ),
-#   which they import and override to suit OpenERP functionality.
-# python-webdav was written by: Simon Pamies <s.pamies@banality.de>
-#                               Christian Scholz <mrtopf@webdav.de>
-#                               Vince Spicer <vince@vince.ca>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-###############################################################################
-
-
-import logging
-import openerp
-from dav_fs import openerp_dav_handler
-from openerp.tools.config import config
-try:
-    from pywebdav.lib.WebDAVServer import DAVRequestHandler
-    from pywebdav.lib.utils import IfParser, TagList
-    from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-    from pywebdav.lib.propfind import PROPFIND
-except ImportError:
-    from DAV.WebDAVServer import DAVRequestHandler
-    from DAV.utils import IfParser, TagList
-    from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-    from DAV.propfind import PROPFIND
-from openerp.service import http_server
-from openerp.service.websrv_lib import FixSendError, HttpOptions
-from BaseHTTPServer import BaseHTTPRequestHandler
-import urlparse
-import urllib
-import re
-import time
-from string import atoi
-import socket
-# from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
-from xml.dom import minidom
-from redirect import RedirectHTTPHandler
-_logger = logging.getLogger(__name__)
-khtml_re = re.compile(r' KHTML/([0-9\.]+) ')
-
-def OpenDAVConfig(**kw):
-    class OpenDAV:
-        def __init__(self, **kw):
-            self.__dict__.update(**kw)
-
-        def getboolean(self, word):
-            return self.__dict__.get(word, False)
-
-    class Config:
-        DAV = OpenDAV(**kw)
-
-    return Config()
-
-
-class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
-    verbose = False
-
-    protocol_version = 'HTTP/1.1'
-    _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
-                    'Allow' : [ 'GET', 'HEAD', 'COPY', 'MOVE', 'POST', 'PUT',
-                            'PROPFIND', 'PROPPATCH', 'OPTIONS', 'MKCOL',
-                            'DELETE', 'TRACE', 'REPORT', ]
-                    }
-
-    def __init__(self, request, client_address, server):
-        self.request = request
-        self.client_address = client_address
-        self.server = server
-        self.setup()
-
-    def get_userinfo(self, user, pw):
-        return False
-
-    def _log(self, message):
-        self._logger.debug(message)
-
-    def handle(self):
-        """Handle multiple requests if necessary."""
-        self.close_connection = 1
-        try:
-            self.handle_one_request()
-            while not self.close_connection:
-                self.handle_one_request()
-        except Exception as e:
-            try:
-                self.log_error("Request timed out: %r \n Trying old version of HTTPServer", e)
-                self._init_buffer()
-            except Exception as e:
-                #a read or a write timed out.  Discard this connection
-                self.log_error("Not working neither, closing connection\n %r", e)
-                self.close_connection = 1
-
-    def finish(self):
-        pass
-
-    def get_db_from_path(self, uri):
-        # interface class will handle all cases.
-        res =  self.IFACE_CLASS.get_db(uri, allow_last=True)
-        return res
-
-    def setup(self):
-        self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
-        addr, port = self.server.server_name, self.server.server_port
-        server_proto = getattr(self.server,'proto', 'http').lower()
-        # Too early here to use self.headers
-        self.baseuri = "%s://%s:%d/"% (server_proto, addr, port)
-        self.IFACE_CLASS  = openerp_dav_handler(self, self.verbose)
-
-    def copymove(self, CLASS):
-        """ Our uri scheme removes the /webdav/ component from there, so we
-        need to mangle the header, too.
-        """
-        up = urlparse.urlparse(urllib.unquote(self.headers['Destination']))
-        if up.path.startswith(self.davpath):
-            self.headers['Destination'] = up.path[len(self.davpath):]
-        else:
-            raise DAV_Forbidden("Not allowed to copy/move outside webdav path.")
-        # TODO: locks
-        DAVRequestHandler.copymove(self, CLASS)
-
-    def get_davpath(self):
-        return self.davpath
-
-    def log_message(self, format, *args):
-        _logger.debug(format % args)
-
-    def log_error(self, format, *args):
-        _logger.warning(format % args)
-
-    def _prep_OPTIONS(self, opts):
-        ret = opts
-        dc=self.IFACE_CLASS
-        uri=urlparse.urljoin(self.get_baseuri(dc), self.path)
-        uri=urllib.unquote(uri)
-        try:
-            ret = dc.prep_http_options(uri, opts)
-        except DAV_Error, (ec,dd):
-            pass
-        except Exception,e:
-            self.log_error("Error at options: %s", str(e))
-            raise
-        return ret
-
-    def send_response(self, code, message=None):
-        # the BufferingHttpServer will send Connection: close , while
-        # the BaseHTTPRequestHandler will only accept int code.
-        # workaround both of them.
-        if self.command == 'PROPFIND' and int(code) == 404:
-            kh = khtml_re.search(self.headers.get('User-Agent',''))
-            if kh and (kh.group(1) < '4.5'):
-                # There is an ugly bug in all khtml < 4.5.x, where the 404
-                # response is treated as an immediate error, which would even
-                # break the flow of a subsequent PUT request. At the same time,
-                # the 200 response  (rather than 207 with content) is treated
-                # as "path not exist", so we send this instead
-                # https://bugs.kde.org/show_bug.cgi?id=166081
-                code = 200
-        BaseHTTPRequestHandler.send_response(self, int(code), message)
-
-    def send_header(self, key, value):
-        if key == 'Connection' and value == 'close':
-            self.close_connection = 1
-        DAVRequestHandler.send_header(self, key, value)
-
-    def send_body(self, DATA, code=None, msg=None, desc=None, ctype='application/octet-stream', headers=None):
-        if headers and 'Connection' in headers:
-            pass
-        elif self.request_version in ('HTTP/1.0', 'HTTP/0.9'):
-            pass
-        elif self.close_connection == 1: # close header already sent
-            pass
-        elif headers and self.headers.get('Connection',False) == 'Keep-Alive':
-            headers['Connection'] = 'keep-alive'
-
-        if headers is None:
-            headers = {}
-
-        DAVRequestHandler.send_body(self, DATA, code=code, msg=msg, desc=desc,
-                    ctype=ctype, headers=headers)
-
-    def do_PUT(self):
-        dc=self.IFACE_CLASS
-        uri=urlparse.urljoin(self.get_baseuri(dc), self.path)
-        uri=urllib.unquote(uri)
-        # Handle If-Match
-        if self.headers.has_key('If-Match'):
-            test = False
-            etag = None
-
-            for match in self.headers['If-Match'].split(','):
-                if match == '*':
-                    if dc.exists(uri):
-                        test = True
-                        break
-                else:
-                    if dc.match_prop(uri, match, "DAV:", "getetag"):
-                        test = True
-                        break
-            if not test:
-                self._get_body()
-                self.send_status(412)
-                return
-
-        # Handle If-None-Match
-        if self.headers.has_key('If-None-Match'):
-            test = True
-            etag = None
-            for match in self.headers['If-None-Match'].split(','):
-                if match == '*':
-                    if dc.exists(uri):
-                        test = False
-                        break
-                else:
-                    if dc.match_prop(uri, match, "DAV:", "getetag"):
-                        test = False
-                        break
-            if not test:
-                self._get_body()
-                self.send_status(412)
-                return
-
-        # Handle expect
-        expect = self.headers.get('Expect', '')
-        if (expect.lower() == '100-continue' and
-                self.protocol_version >= 'HTTP/1.1' and
-                self.request_version >= 'HTTP/1.1'):
-            self.send_status(100)
-            self._flush()
-
-        # read the body
-        body=self._get_body()
-
-        # locked resources are not allowed to be overwritten
-        if self._l_isLocked(uri):
-            return self.send_body(None, '423', 'Locked', 'Locked')
-
-        ct=None
-        if self.headers.has_key("Content-Type"):
-            ct=self.headers['Content-Type']
-        try:
-            location = dc.put(uri, body, ct)
-        except DAV_Error, (ec,dd):
-            self.log_error("Cannot PUT to %s: %s", uri, dd)
-            return self.send_status(ec)
-
-        headers = {}
-        etag = None
-        if location and isinstance(location, tuple):
-            etag = location[1]
-            location = location[0]
-            # note that we have allowed for > 2 elems
-        if location:
-            headers['Location'] = location
-        else:
-            try:
-                if not etag:
-                    etag = dc.get_prop(location or uri, "DAV:", "getetag")
-                if etag:
-                    headers['ETag'] = str(etag)
-            except Exception:
-                pass
-
-        self.send_body(None, '201', 'Created', '', headers=headers)
-
-    def _get_body(self):
-        body = None
-        if self.headers.has_key("Content-Length"):
-            l=self.headers['Content-Length']
-            body=self.rfile.read(atoi(l))
-        return body
-
-    def do_DELETE(self):
-        try:
-            DAVRequestHandler.do_DELETE(self)
-        except DAV_Error, (ec, dd):
-            return self.send_status(ec)
-
-    def do_UNLOCK(self):
-        """ Unlocks given resource """
-
-        dc = self.IFACE_CLASS
-        self.log_message('UNLOCKing resource %s' % self.headers)
-
-        uri = urlparse.urljoin(self.get_baseuri(dc), self.path)
-        uri = urllib.unquote(uri)
-
-        token = self.headers.get('Lock-Token', False)
-        if token:
-            token = token.strip()
-            if token[0] == '<' and token[-1] == '>':
-                token = token[1:-1]
-            else:
-                token = False
-
-        if not token:
-            return self.send_status(400, 'Bad lock token')
-
-        try:
-            res = dc.unlock(uri, token)
-        except DAV_Error, (ec, dd):
-            return self.send_status(ec, dd)
-
-        if res == True:
-            self.send_body(None, '204', 'OK', 'Resource unlocked.')
-        else:
-            # We just differentiate the description, for debugging purposes
-            self.send_body(None, '204', 'OK', 'Resource not locked.')
-
-    def do_LOCK(self):
-        """ Attempt to place a lock on the given resource.
-        """
-
-        dc = self.IFACE_CLASS
-        lock_data = {}
-
-        self.log_message('LOCKing resource %s' % self.headers)
-
-        body = None
-        if self.headers.has_key('Content-Length'):
-            l = self.headers['Content-Length']
-            body = self.rfile.read(atoi(l))
-
-        depth = self.headers.get('Depth', 'infinity')
-
-        uri = urlparse.urljoin(self.get_baseuri(dc), self.path)
-        uri = urllib.unquote(uri)
-        self.log_message('do_LOCK: uri = %s' % uri)
-
-        ifheader = self.headers.get('If')
-
-        if ifheader:
-            ldif = IfParser(ifheader)
-            if isinstance(ldif, list):
-                if len(ldif) !=1 or (not isinstance(ldif[0], TagList)) \
-                        or len(ldif[0].list) != 1:
-                    raise DAV_Error(400, "Cannot accept multiple tokens.")
-                ldif = ldif[0].list[0]
-                if ldif[0] == '<' and ldif[-1] == '>':
-                    ldif = ldif[1:-1]
-
-            lock_data['token'] = ldif
-
-        if not body:
-            lock_data['refresh'] = True
-        else:
-            lock_data['refresh'] = False
-            lock_data.update(self._lock_unlock_parse(body))
-
-        if lock_data['refresh'] and not lock_data.get('token', False):
-            raise DAV_Error(400, 'Lock refresh must specify token.')
-
-        lock_data['depth'] = depth
-
-        try:
-            created, data, lock_token = dc.lock(uri, lock_data)
-        except DAV_Error, (ec, dd):
-            return self.send_status(ec, dd)
-
-        headers = {}
-        if not lock_data['refresh']:
-            headers['Lock-Token'] = '<%s>' % lock_token
-
-        if created:
-            self.send_body(data, '201', 'Created',  ctype='text/xml', headers=headers)
-        else:
-            self.send_body(data, '200', 'OK', ctype='text/xml', headers=headers)
-
-    def _lock_unlock_parse(self, body):
-        # Override the python-webdav function, with some improvements
-        # Unlike the py-webdav one, we also parse the owner minidom elements into
-        # pure pythonic struct.
-        doc = minidom.parseString(body)
-
-        data = {}
-        owners = []
-        for info in doc.getElementsByTagNameNS('DAV:', 'lockinfo'):
-            for scope in info.getElementsByTagNameNS('DAV:', 'lockscope'):
-                for scc in scope.childNodes:
-                    if scc.nodeType == info.ELEMENT_NODE \
-                            and scc.namespaceURI == 'DAV:':
-                        data['lockscope'] = scc.localName
-                        break
-            for ltype in info.getElementsByTagNameNS('DAV:', 'locktype'):
-                for ltc in ltype.childNodes:
-                    if ltc.nodeType == info.ELEMENT_NODE \
-                            and ltc.namespaceURI == 'DAV:':
-                        data['locktype'] = ltc.localName
-                        break
-            for own in info.getElementsByTagNameNS('DAV:', 'owner'):
-                for ono in own.childNodes:
-                    if ono.nodeType == info.TEXT_NODE:
-                        if ono.data:
-                            owners.append(ono.data)
-                    elif ono.nodeType == info.ELEMENT_NODE \
-                            and ono.namespaceURI == 'DAV:' \
-                            and ono.localName == 'href':
-                        href = ''
-                        for hno in ono.childNodes:
-                            if hno.nodeType == info.TEXT_NODE:
-                                href += hno.data
-                        owners.append(('href','DAV:', href))
-
-            if len(owners) == 1:
-                data['lockowner'] = owners[0]
-            elif not owners:
-                pass
-            else:
-                data['lockowner'] = owners
-        return data
-
-from openerp.service.http_server import reg_http_service,OpenERPAuthProvider
-
-class DAVAuthProvider(OpenERPAuthProvider):
-    def authenticate(self, db, user, passwd, client_address):
-        """ authenticate, but also allow the False db, meaning to skip
-            authentication when no db is specified.
-        """
-        if db is False:
-            return True
-        return OpenERPAuthProvider.authenticate(self, db, user, passwd, client_address)
-
-
-class dummy_dav_interface(object):
-    """ Dummy dav interface """
-    verbose = True
-
-    PROPS={"DAV:" : ('creationdate',
-                     'displayname',
-                     'getlastmodified',
-                     'resourcetype',
-                     ),
-           }
-
-    M_NS={"DAV:" : "_get_dav", }
-
-    def __init__(self, parent):
-        self.parent = parent
-
-    def get_propnames(self, uri):
-        return self.PROPS
-
-    def get_prop(self, uri, ns, propname):
-        if self.M_NS.has_key(ns):
-            prefix=self.M_NS[ns]
-        else:
-            raise DAV_NotFound
-        mname=prefix+"_"+propname.replace('-', '_')
-        try:
-            m=getattr(self,mname)
-            r=m(uri)
-            return r
-        except AttributeError:
-            raise DAV_NotFound
-
-    def get_data(self, uri, range=None):
-        raise DAV_NotFound
-
-    def _get_dav_creationdate(self, uri):
-        return time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
-
-    def _get_dav_getlastmodified(self, uri):
-        return time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
-
-    def _get_dav_displayname(self, uri):
-        return uri
-
-    def _get_dav_resourcetype(self, uri):
-        return ('collection', 'DAV:')
-
-    def exists(self, uri):
-        """ return 1 or None depending on if a resource exists """
-        uri2 = uri.split('/')
-        if len(uri2) < 3:
-            return True
-        _logger.debug("Requested uri: %s", uri)
-        return None # no
-
-    def is_collection(self, uri):
-        """ return 1 or None depending on if a resource is a collection """
-        return None # no
-
-class DAVStaticHandler(http_server.StaticHTTPHandler):
-    """ A variant of the Static handler, which will serve dummy DAV requests
-    """
-
-    verbose = False
-    protocol_version = 'HTTP/1.1'
-    _HTTP_OPTIONS= { 'DAV' : ['1', '2'],
-                    'Allow' : [ 'GET', 'HEAD',
-                            'PROPFIND', 'OPTIONS', 'REPORT', ]
-                    }
-
-    def send_body(self, content, code, message='OK', content_type='text/xml'):
-        self.send_response(int(code), message)
-        self.send_header("Content-Type", content_type)
-        # self.send_header('Connection', 'close')
-        self.send_header('Content-Length', len(content) or 0)
-        self.end_headers()
-        if hasattr(self, '_flush'):
-            self._flush()
-
-        if self.command != 'HEAD':
-            self.wfile.write(content)
-
-    def do_PROPFIND(self):
-        """Answer to PROPFIND with generic data.
-
-        A rough copy of python-webdav's do_PROPFIND, but hacked to work
-        statically.
-        """
-
-        dc = dummy_dav_interface(self)
-
-        # read the body containing the xml request
-        # iff there is no body then this is an ALLPROP request
-        body = None
-        if self.headers.has_key('Content-Length'):
-            l = self.headers['Content-Length']
-            body = self.rfile.read(atoi(l))
-
-        path = self.path.rstrip('/')
-        uri = urllib.unquote(path)
-
-        pf = PROPFIND(uri, dc, self.headers.get('Depth', 'infinity'), body)
-
-        try:
-            DATA = '%s\n' % pf.createResponse()
-        except DAV_Error, (ec,dd):
-            return self.send_error(ec,dd)
-        except Exception:
-            self.log_exception("Cannot PROPFIND")
-            raise
-
-        # work around MSIE DAV bug for creation and modified date
-        # taken from Resource.py @ Zope webdav
-        if (self.headers.get('User-Agent') ==
-            'Microsoft Data Access Internet Publishing Provider DAV 1.1'):
-            DATA = DATA.replace('<ns0:getlastmodified xmlns:ns0="DAV:">',
-                                    '<ns0:getlastmodified xmlns:n="DAV:" xmlns:b="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/" b:dt="dateTime.rfc1123">')
-            DATA = DATA.replace('<ns0:creationdate xmlns:ns0="DAV:">',
-                                    '<ns0:creationdate xmlns:n="DAV:" xmlns:b="urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/" b:dt="dateTime.tz">')
-
-        self.send_body(DATA, '207','Multi-Status','Multiple responses')
-
-    def not_get_baseuri(self):
-        baseuri = '/'
-        if self.headers.has_key('Host'):
-            uparts = list(urlparse.urlparse('/'))
-            uparts[1] = self.headers['Host']
-            baseuri = urlparse.urlunparse(uparts)
-        return baseuri
-
-    def get_davpath(self):
-        return ''
-
-
-try:
-
-    if (config.get_misc('webdav','enable',True)):
-        directory = '/'+config.get_misc('webdav','vdir','webdav')
-        handler = DAVHandler
-        verbose = config.get_misc('webdav','verbose',True)
-        handler.debug = config.get_misc('webdav','debug',True)
-        _dc = { 'verbose' : verbose,
-                'directory' : directory,
-                'lockemulation' : True,
-                }
-
-        conf = OpenDAVConfig(**_dc)
-        handler._config = conf
-        reg_http_service(directory, DAVHandler, DAVAuthProvider)
-        _logger.info("WebDAV service registered at path: %s/ "% directory)
-
-        if not (config.get_misc('webdav', 'no_root_hack', False)):
-            # Now, replace the static http handler with the dav-enabled one.
-            # If a static-http service has been specified for our server, then
-            # read its configuration and use that dir_path.
-            # NOTE: this will _break_ any other service that would be registered
-            # at the root path in future.
-            base_path = False
-            if config.get_misc('static-http','enable', False):
-                base_path = config.get_misc('static-http', 'base_path', '/')
-            if base_path and base_path == '/':
-                dir_path = config.get_misc('static-http', 'dir_path', False)
-            else:
-                dir_path = openerp.modules.module.get_module_resource('document_webdav','public_html')
-                # an _ugly_ hack: we put that dir back in tools.config.misc, so that
-                # the StaticHttpHandler can find its dir_path.
-                config.misc.setdefault('static-http',{})['dir_path'] = dir_path
-
-            reg_http_service('/', DAVStaticHandler)
-
-except Exception, e:
-    _logger.error('Cannot launch webdav: %s' % e)
-
-
-def init_well_known():
-    reps = RedirectHTTPHandler.redirect_paths
-
-    num_svcs = config.get_misc('http-well-known', 'num_services', '0')
-
-    for nsv in range(1, int(num_svcs)+1):
-        uri = config.get_misc('http-well-known', 'service_%d' % nsv, False)
-        path = config.get_misc('http-well-known', 'path_%d' % nsv, False)
-        if not (uri and path):
-            continue
-        reps['/'+uri] = path
-
-    if int(num_svcs):
-        reg_http_service('/.well-known', RedirectHTTPHandler)
-
-init_well_known()
-
-class PrincipalsRedirect(RedirectHTTPHandler):
-
-
-    redirect_paths = {}
-
-    def _find_redirect(self):
-        for b, r in self.redirect_paths.items():
-            if self.path.startswith(b):
-                return r + self.path[len(b):]
-        return False
-
-def init_principals_redirect():
-    """ Some devices like the iPhone will look under /principals/users/xxx for
-    the user's properties. In OpenERP we _cannot_ have a stray /principals/...
-    working path, since we have a database path and the /webdav/ component. So,
-    the best solution is to redirect the url with 301. Luckily, it does work in
-    the device. The trick is that we need to hard-code the database to use, either
-    the one centrally defined in the config, or a "forced" one in the webdav
-    section.
-    """
-    dbname = config.get_misc('webdav', 'principal_dbname', False)
-    if (not dbname) and not config.get_misc('webdav', 'no_principals_redirect', False):
-        dbname = config.get('db_name', False)
-    if dbname:
-        PrincipalsRedirect.redirect_paths[''] = '/webdav/%s/principals' % dbname
-        reg_http_service('/principals', PrincipalsRedirect)
-        _logger.info(
-                "Registered HTTP redirect handler for /principals to the %s db.",
-                dbname)
-
-init_principals_redirect()
-
-#eof
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/webdav_setup.xml b/addons/document_webdav/webdav_setup.xml
deleted file mode 100644
index dbf6bc8fbcc..00000000000
--- a/addons/document_webdav/webdav_setup.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<openerp>
-<data noupdate="1">
-<!--This file contains a typical setup of a WebDAV folders' structure, 
-    which conforms to the RFCs and extensions of the protocol.
-    In OpenERP, this is not enforced by any code inside the server, it
-    is rather a matter of setting these records in our document configuration.
--->
-
-        <!-- /principals tree -->
-        <record id="document_directory_principals0" model="document.directory">
-                <field name="domain">[]</field>
-                <field eval="1" name="resource_find_all"/>
-                <field eval="0" name="ressource_tree"/>
-                <field name="user_id" eval="False"/>
-                <field name="company_id" ref="base.main_company"/>
-                <field name="type">directory</field>
-                <field eval="[(6,0,[])]" name="group_ids"/>
-                <field name="name">principals</field>
-        </record>
-
-        <record id="document_directory_groups0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">groups</field>
-        </record>
-
-        <record id="document_directory_resources0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">resources</field>
-        </record>
-        <record id="document_directory_uids1" model="document.directory">
-            <field name="domain">[('id','=',uid)]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="resource_field" ref="base.field_res_users_login"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">ressource</field>
-            <field name="ressource_type_id" ref="base.model_res_users"/>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">__uids__</field>
-        </record>
-        <record id="document_directory_users1" model="document.directory">
-            <field name="domain">[('id','=',uid)]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="resource_field" ref="base.field_res_users_login"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">ressource</field>
-            <field name="ressource_type_id" ref="base.model_res_users"/>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">users</field>
-        </record>
-        <record id="document_directory_locations0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="parent_id" ref="document_directory_principals0"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">locations</field>
-        </record>
-        <record id="document_webdav_dir_property_currentuserprincipal0" model="document.webdav.dir.property">
-            <field name="namespace">DAV:</field>
-            <field name="name">current-user-principal</field>
-            <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
-            <field eval="1" name="do_subst"/>
-        </record>
-        <record id="document_webdav_dir_property_principalurl0" model="document.webdav.dir.property">
-            <field name="namespace">DAV:</field>
-            <field name="name">principal-URL</field>
-            <field name="value">('href','DAV:','/%s/%s/principals/users/%s' % ('webdav',dbname, username ) )</field>
-            <field eval="1" name="do_subst"/>
-        </record>
-
-</data>
-</openerp>
\ No newline at end of file
diff --git a/addons/document_webdav/webdav_view.xml b/addons/document_webdav/webdav_view.xml
deleted file mode 100644
index 5a0cb75274e..00000000000
--- a/addons/document_webdav/webdav_view.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-    <record model="ir.ui.view" id="view_dir_props_form">
-        <field name="name">document.webdav.dir.property.form</field>
-        <field name="model">document.webdav.dir.property</field>
-        <field name="arch" type="xml">
-            <form string="Properties">
-                <group col="4">
-                    <field name="namespace"/>
-                    <field name="name"/>
-                    <field name="dir_id" />
-                    <field name="do_subst" />
-                </group>
-                <field name="value" colspan="4" />
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_dir_props_tree">
-        <field name="name">document.webdav.dir.property.tree</field>
-        <field name="model">document.webdav.dir.property</field>
-        <field name="arch" type="xml">
-            <tree string="Properties" toolbar="1">
-                <field name="dir_id" />
-                <field name="namespace"/>
-                <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_dir_props_filter" model="ir.ui.view">
-            <field name="name">Search View: Directory DAV properties</field>
-            <field name="model">document.webdav.dir.property</field>
-            <field name="arch" type="xml">
-                <search string="Search Document properties">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document property"/>
-                    <group expand="0" string="Group By..." groups="base.group_no_one">
-                        <filter string="Dir" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'dir_id'}"/>
-                        <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>
-                    </group>
-               </search>
-            </field>
-        </record>
-
-    <record model="ir.actions.act_window" id="action_dir_props_form">
-        <field name="name">DAV Properties for Folders</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">document.webdav.dir.property</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_dir_props_filter"/>
-    </record>
-   <menuitem
-        name="DAV Properties"
-        id="menu_properties"
-        groups="base.group_no_one"
-        parent="document.menu_document_management_configuration"/>
-
-      <menuitem
-        name="Folders"
-        action="action_dir_props_form"
-        id="menu_folder_props"
-        groups="base.group_no_one"
-        parent="menu_properties"/>
-
-    <!-- Add the properties to the directory form -->
-    <record model="ir.ui.view" id="view_document_directory_form1">
-        <field name="name">document.directory.webdav.inherit</field>
-        <field name="model">document.directory</field>
-        <field name="inherit_id" ref="document.view_document_directory_form" />
-        <field name="arch" type="xml">
-        <xpath expr="/form/notebook/page[@string='Dynamic context']" position="after" version="7.0">
-        <page string="WebDAV properties">
-            <label string="These properties will be added to WebDAV requests" colspan="4" />
-
-            <field name="dav_prop_ids" nolabel="1" colspan="4">
-                <tree string="Properties">
-                    <field name="namespace"/>
-                    <field name="name"/>
-                </tree>
-                <form string="Properties" version="7.0">
-                    <group col="4">
-                        <field name="namespace"/>
-                        <field name="name"/>
-                        <newline />
-                        <field name="do_subst" />
-                    </group>
-                    <field name="value"/>
-                </form>
-            </field>
-        </page>
-        </xpath>
-    </field>
-    </record>
-
-    <!-- File properties -->
-    <record model="ir.ui.view" id="view_file_props_form">
-        <field name="name">document.webdav.file.property.form</field>
-        <field name="model">document.webdav.file.property</field>
-        <field name="arch" type="xml">
-            <form string="Properties">
-                <group col="4">
-                    <field name="namespace"/>
-                    <field name="name"/>
-                    <newline />
-                    <field name="file_id" />
-                    <field name="do_subst" />
-                </group>
-                <field name="value"/>
-            </form>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_file_props_tree">
-        <field name="name">document.webdav.file.property.tree</field>
-        <field name="model">document.webdav.file.property</field>
-        <field name="arch" type="xml">
-            <tree string="Properties" toolbar="1">
-        <field name="file_id" />
-        <field name="namespace"/>
-        <field name="name"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_file_props_filter" model="ir.ui.view">
-            <field name="name">Search View: File DAV properties</field>
-            <field name="model">document.webdav.file.property</field>
-            <field name="arch" type="xml">
-                <search string="Search Document properties">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('namespace','ilike',self)]" string="Document Property"/>
-                    <group expand="0" string="Group By..." groups="base.group_no_one">
-                        <filter string="Document" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'file_id'}"/>
-                        <filter string="Namespace" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'namespace'}"/>
-                    </group>
-               </search>
-            </field>
-        </record>
-
-    <record model="ir.actions.act_window" id="action_file_props_form">
-        <field name="name">DAV Properties for Documents</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">document.webdav.file.property</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="search_view_id" ref="view_file_props_filter"/>
-    </record>
-   <menuitem
-        name="Documents"
-        action="action_file_props_form"
-        id="menu_document_props"
-        groups="base.group_no_one"
-        parent="menu_properties"/>
-</data>
-</openerp>
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index c1329eb5a4e..3f0fad1c8a0 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -449,7 +449,7 @@ class email_template(osv.osv):
                         ctx['lang'] = self.render_template_batch(cr, uid, template.lang, template.model, [res_id], context)[res_id]  # take 0 ?
 
                     if report.report_type in ['qweb-html', 'qweb-pdf']:
-                        result, format = self.pool['report'].get_pdf(report, res_id, context=ctx), 'pdf'
+                        result, format = self.pool['report'].get_pdf(cr, uid, [res_id], report_service, context=ctx), 'pdf'
                     else:
                         result, format = openerp.report.render_report(cr, uid, [res_id], report_service, {'model': template.model}, ctx)
 
diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py
index e950950a985..9e5656ef986 100644
--- a/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@ -12,6 +12,7 @@ import math
 import md5
 import openerp.addons.hw_proxy.controllers.main as hw_proxy
 import subprocess
+import traceback
 from threading import Thread, Lock
 from Queue import Queue, Empty
 
@@ -36,6 +37,7 @@ from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
+
 class EscposDriver(Thread):
     def __init__(self):
         Thread.__init__(self)
@@ -45,6 +47,7 @@ class EscposDriver(Thread):
 
     def connected_usb_devices(self):
         connected = []
+        
         for device in supported_devices.device_list:
             if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None:
                 connected.append(device)
@@ -74,6 +77,8 @@ class EscposDriver(Thread):
         self.push_task('status')
         return self.status
 
+
+
     def open_cashbox(self,printer):
         printer.cashdraw(2)
         printer.cashdraw(5)
@@ -113,6 +118,9 @@ class EscposDriver(Thread):
                     if timestamp >= time.time() - 1 * 60 * 60:
                         self.print_receipt_body(printer,data)
                         printer.cut()
+                elif task == 'xml_receipt':
+                    if timestamp >= time.time() - 1 * 60 * 60:
+                        printer.receipt(data)
                 elif task == 'cashbox':
                     if timestamp >= time.time() - 12:
                         self.open_cashbox(printer)
@@ -123,7 +131,8 @@ class EscposDriver(Thread):
 
             except Exception as e:
                 self.set_status('error', str(e))
-                _logger.error(e);
+                errmsg = str(e) + '\n' + '-'*60+'\n' + traceback.format_exc() + '-'*60 + '\n'
+                _logger.error(errmsg);
 
     def push_task(self,task, data = None):
         self.lockedstart()
@@ -142,12 +151,15 @@ class EscposDriver(Thread):
         if len(ips) == 0:
             eprint.text('ERROR: Could not connect to LAN\n\nPlease check that the PosBox is correc-\ntly connected with a network cable,\n that the LAN is setup with DHCP, and\nthat network addresses are available')
         elif len(ips) == 1:
-            eprint.text('IP Address\n'+ips[0]+'\n')
+            eprint.text('IP Address:\n'+ips[0]+'\n')
         else:
-            eprint.text('IP Addresses\n')
+            eprint.text('IP Addresses:\n')
             for ip in ips:
                 eprint.text(ip+'\n')
 
+        if len(ips) >= 1:
+            eprint.text('\nHomepage:\nhttp://'+ips[0]+':8069\n')
+
         eprint.text('\n\n')
         eprint.cut()
 
@@ -278,10 +290,10 @@ class EscposDriver(Thread):
 
 driver = EscposDriver()
 
+driver.push_task('printstatus')
+
 hw_proxy.drivers['escpos'] = driver
 
-driver.push_task('printstatus')
-        
 class EscposProxy(hw_proxy.Proxy):
     
     @http.route('/hw_proxy/open_cashbox', type='json', auth='none', cors='*')
@@ -293,4 +305,9 @@ class EscposProxy(hw_proxy.Proxy):
     def print_receipt(self, receipt):
         _logger.info('ESC/POS: PRINT RECEIPT') 
         driver.push_task('receipt',receipt)
+
+    @http.route('/hw_proxy/print_xml_receipt', type='json', auth='none', cors='*')
+    def print_receipt(self, receipt):
+        _logger.info('ESC/POS: PRINT XML RECEIPT') 
+        driver.push_task('xml_receipt',receipt)
     
diff --git a/addons/hw_escpos/escpos/constants.py b/addons/hw_escpos/escpos/constants.py
index 723c67013f0..6f0be0bb135 100644
--- a/addons/hw_escpos/escpos/constants.py
+++ b/addons/hw_escpos/escpos/constants.py
@@ -22,6 +22,7 @@ PAPER_PART_CUT  = '\x1d\x56\x01' # Partial cut paper
 TXT_NORMAL      = '\x1b\x21\x00' # Normal text
 TXT_2HEIGHT     = '\x1b\x21\x10' # Double height text
 TXT_2WIDTH      = '\x1b\x21\x20' # Double width text
+TXT_DOUBLE      = '\x1b\x21\x30' # Double height & Width
 TXT_UNDERL_OFF  = '\x1b\x2d\x00' # Underline font OFF
 TXT_UNDERL_ON   = '\x1b\x2d\x01' # Underline font 1-dot ON
 TXT_UNDERL2_ON  = '\x1b\x2d\x02' # Underline font 2-dot ON
diff --git a/addons/hw_escpos/escpos/escpos.py b/addons/hw_escpos/escpos/escpos.py
index a4942019f8c..84b52f99d8c 100644
--- a/addons/hw_escpos/escpos/escpos.py
+++ b/addons/hw_escpos/escpos/escpos.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+# -*- coding: utf-8 -*-
 '''
 @author: Manuel F Martinez <manpaz@bashlinux.com>
 @organization: Bashlinux
@@ -17,6 +17,10 @@ import io
 import base64
 import math
 import md5
+import re
+import traceback
+import xml.etree.ElementTree as ET
+import xml.dom.minidom as minidom
 
 from PIL import Image
 
@@ -30,13 +34,272 @@ except ImportError:
 from constants import *
 from exceptions import *
 
+def utfstr(stuff):
+    """ converts stuff to string and does without failing if stuff is a utf8 string """
+    if isinstance(stuff,basestring):
+        return stuff
+    else:
+        return str(stuff)
+
+class StyleStack:
+    """ 
+    The stylestack is used by the xml receipt serializer to compute the active styles along the xml
+    document. Styles are just xml attributes, there is no css mechanism. But the style applied by
+    the attributes are inherited by deeper nodes.
+    """
+    def __init__(self):
+        self.stack = []
+        self.defaults = {   # default style values
+            'align':     'left',
+            'underline': 'off',
+            'bold':      'off',
+            'size':      'normal',
+            'font'  :    'a',
+            'width':     48,
+            'indent':    0,
+            'tabwidth':  2,
+            'bullet':    ' - ',
+            'line-ratio':0.5,
+
+            'value-decimals':           2,
+            'value-symbol':             '',
+            'value-symbol-position':    'after',
+            'value-autoint':            'off',
+            'value-decimals-separator':  '.',
+            'value-thousands-separator': ',',
+            'value-width':               0,
+            
+        }
+
+        self.types = { # attribute types, default is string and can be ommitted
+            'width':    'int',
+            'indent':   'int',
+            'tabwidth': 'int',
+            'line-ratio':       'float',
+            'value-decimals':   'int',
+            'value-width':      'int',
+        }
+
+        self.cmds = { 
+            # translation from styles to escpos commands
+            # some style do not correspond to escpos command are used by
+            # the serializer instead
+            'align': {
+                'left':     TXT_ALIGN_LT,
+                'right':    TXT_ALIGN_RT,
+                'center':   TXT_ALIGN_CT,
+            },
+            'underline': {
+                'off':      TXT_UNDERL_OFF,
+                'on':       TXT_UNDERL_ON,
+                'double':   TXT_UNDERL2_ON,
+            },
+            'bold': {
+                'off':      TXT_BOLD_OFF,
+                'on':       TXT_BOLD_ON,
+            },
+            'font': {
+                'a':        TXT_FONT_A,
+                'b':        TXT_FONT_B,
+            },
+            'size': {
+                'normal':           TXT_NORMAL,
+                'double-height':    TXT_2HEIGHT,
+                'double-width':     TXT_2WIDTH,
+                'double':           TXT_DOUBLE,
+            }
+        }
+
+        self.push(self.defaults) 
+
+    def get(self,style):
+        """ what's the value of a style at the current stack level"""
+        level = len(self.stack) -1
+        while level >= 0:
+            if style in self.stack[level]:
+                return self.stack[level][style]
+            else:
+                level = level - 1
+        return None
+
+    def enforce_type(self, attr, val):
+        """converts a value to the attribute's type"""
+        if not attr in self.types:
+            return utfstr(val)
+        elif self.types[attr] == 'int':
+            return int(float(val))
+        elif self.types[attr] == 'float':
+            return float(val)
+        else:
+            return utfstr(val)
+
+    def push(self, style={}):
+        """push a new level on the stack with a style dictionnary containing style:value pairs"""
+        _style = {}
+        for attr in style:
+            if attr in self.cmds and not style[attr] in self.cmds[attr]:
+                print 'WARNING: ESC/POS PRINTING: ignoring invalid value: '+utfstr(style[attr])+' for style: '+utfstr(attr)
+            else:
+                _style[attr] = self.enforce_type(attr, style[attr])
+        self.stack.append(_style)
+
+    def set(self, style={}):
+        """overrides style values at the current stack level"""
+        _style = {}
+        for attr in style:
+            if attr in self.cmds and not style[attr] in self.cmds[attr]:
+                print 'WARNING: ESC/POS PRINTING: ignoring invalid value: '+utfstr(style[attr])+' for style: '+utfstr(attr)
+            else:
+                self.stack[-1][attr] = self.enforce_type(attr, style[attr])
+
+    def pop(self):
+        """ pop a style stack level """
+        if len(self.stack) > 1 :
+            self.stack = self.stack[:-1]
+
+    def to_escpos(self):
+        """ converts the current style to an escpos command string """
+        cmd = ''
+        for style in self.cmds:
+            cmd += self.cmds[style][self.get(style)]
+        return cmd
+
+class XmlSerializer:
+    """ 
+    Converts the xml inline / block tree structure to a string,
+    keeping track of newlines and spacings.
+    The string is outputted asap to the provided escpos driver.
+    """
+    def __init__(self,escpos):
+        self.escpos = escpos
+        self.stack = ['block']
+        self.dirty = False
+
+    def start_inline(self,stylestack=None):
+        """ starts an inline entity with an optional style definition """
+        self.stack.append('inline')
+        if self.dirty:
+            self.escpos._raw(' ')
+        if stylestack:
+            self.style(stylestack)
+
+    def start_block(self,stylestack=None):
+        """ starts a block entity with an optional style definition """
+        if self.dirty:
+            self.escpos._raw('\n')
+            self.dirty = False
+        self.stack.append('block')
+        if stylestack:
+            self.style(stylestack)
+
+    def end_entity(self):
+        """ ends the entity definition. (but does not cancel the active style!) """
+        if self.stack[-1] == 'block' and self.dirty:
+            self.escpos._raw('\n')
+            self.dirty = False
+        if len(self.stack) > 1:
+            self.stack = self.stack[:-1]
+
+    def pre(self,text):
+        """ puts a string of text in the entity keeping the whitespace intact """
+        if text:
+            self.escpos.text(text)
+            self.dirty = True
+
+    def text(self,text):
+        """ puts text in the entity. Whitespace and newlines are stripped to single spaces. """
+        if text:
+            text = utfstr(text)
+            text = text.strip()
+            text = re.sub('\s+',' ',text)
+            if text:
+                self.dirty = True
+                self.escpos.text(text)
+
+    def linebreak(self):
+        """ inserts a linebreak in the entity """
+        self.dirty = False
+        self.escpos._raw('\n')
+
+    def style(self,stylestack):
+        """ apply a style to the entity (only applies to content added after the definition) """
+        self.raw(stylestack.to_escpos())
+
+    def raw(self,raw):
+        """ puts raw text or escpos command in the entity without affecting the state of the serializer """
+        self.escpos._raw(raw)
+
+class XmlLineSerializer:
+    """ 
+    This is used to convert a xml tree into a single line, with a left and a right part.
+    The content is not output to escpos directly, and is intended to be fedback to the
+    XmlSerializer as the content of a block entity.
+    """
+    def __init__(self, indent=0, tabwidth=2, width=48, ratio=0.5):
+        self.tabwidth = tabwidth
+        self.indent = indent
+        self.width  = max(0, width - int(tabwidth*indent))
+        self.lwidth = int(self.width*ratio)
+        self.rwidth = max(0, self.width - self.lwidth)
+        self.clwidth = 0
+        self.crwidth = 0
+        self.lbuffer  = ''
+        self.rbuffer  = ''
+        self.left    = True
+
+    def _txt(self,txt):
+        if self.left:
+            if self.clwidth < self.lwidth:
+                txt = txt[:max(0, self.lwidth - self.clwidth)]
+                self.lbuffer += txt
+                self.clwidth += len(txt)
+        else:
+            if self.crwidth < self.rwidth:
+                txt = txt[:max(0, self.rwidth - self.crwidth)]
+                self.rbuffer += txt
+                self.crwidth  += len(txt)
+
+    def start_inline(self,stylestack=None):
+        if (self.left and self.clwidth) or (not self.left and self.crwidth):
+            self._txt(' ')
+
+    def start_block(self,stylestack=None):
+        self.start_inline(stylestack)
+
+    def end_entity(self):
+        pass
+
+    def pre(self,text):
+        if text:
+            self._txt(text)
+    def text(self,text):
+        if text:
+            text = utfstr(text)
+            text = text.strip()
+            text = re.sub('\s+',' ',text)
+            if text:
+                self._txt(text)
+
+    def linebreak(self):
+        pass
+    def style(self,stylestack):
+        pass
+    def raw(self,raw):
+        pass
+
+    def start_right(self):
+        self.left = False
+
+    def get_line(self):
+        return ' ' * self.indent * self.tabwidth + self.lbuffer + ' ' * (self.width - self.clwidth - self.crwidth) + self.rbuffer
+    
+
 class Escpos:
     """ ESC/POS Printer object """
     device    = None
     encoding  = None
     img_cache = {}
 
-
     def _check_image_size(self, size):
         """ Check and fix the size of the image to 32 bits """
         if size % 32 == 0:
@@ -48,7 +311,6 @@ class Escpos:
             else:
                 return (image_border / 2, (image_border / 2) + 1)
 
-
     def _print_image(self, line, size):
         """ Print formatted image """
         i = 0
@@ -101,7 +363,6 @@ class Escpos:
 
         return raw
 
-
     def _convert_image(self, im):
         """ Parse image and prepare it to a printable format """
         pixels   = []
@@ -197,8 +458,7 @@ class Escpos:
         # Convert the RGB image in printable image
         self._convert_image(im)
 
-
-    def barcode(self, code, bc, width, height, pos, font):
+    def barcode(self, code, bc, width=255, height=2, pos='below', font='a'):
         """ Print Barcode """
         # Align Bar Code()
         self._raw(TXT_ALIGN_CT)
@@ -249,6 +509,193 @@ class Escpos:
         else:
             raise exception.BarcodeCodeError()
 
+    def receipt(self,xml):
+        """
+        Prints an xml based receipt definition
+        """
+
+        def strclean(string):
+            if not string:
+                string = ''
+            string = string.strip()
+            string = re.sub('\s+',' ',string)
+            return string
+
+        def format_value(value, decimals=3, width=0, decimals_separator='.', thousands_separator=',', autoint=False, symbol='', position='after'):
+            decimals = max(0,int(decimals))
+            width    = max(0,int(width))
+            value    = float(value)
+
+            if autoint and math.floor(value) == value:
+                decimals = 0
+            if width == 0:
+                width = ''
+
+            if thousands_separator:
+                formatstr = "{:"+str(width)+",."+str(decimals)+"f}"
+            else:
+                formatstr = "{:"+str(width)+"."+str(decimals)+"f}"
+
+
+            ret = formatstr.format(value)
+            ret = ret.replace(',','COMMA')
+            ret = ret.replace('.','DOT')
+            ret = ret.replace('COMMA',thousands_separator)
+            ret = ret.replace('DOT',decimals_separator)
+
+            if symbol:
+                if position == 'after':
+                    ret = ret + symbol
+                else:
+                    ret = symbol + ret
+            return ret
+
+        def print_elem(stylestack, serializer, elem, indent=0):
+
+            elem_styles = {
+                'h1': {'bold': 'on', 'size':'double'},
+                'h2': {'size':'double'},
+                'h3': {'bold': 'on', 'size':'double-height'},
+                'h4': {'size': 'double-height'},
+                'h5': {'bold': 'on'},
+                'em': {'font': 'b'},
+                'b':  {'bold': 'on'},
+            }
+
+            stylestack.push()
+            if elem.tag in elem_styles:
+                stylestack.set(elem_styles[elem.tag])
+            stylestack.set(elem.attrib)
+
+            if elem.tag in ('p','div','section','article','receipt','header','footer','li','h1','h2','h3','h4','h5'):
+                serializer.start_block(stylestack)
+                serializer.text(elem.text)
+                for child in elem:
+                    print_elem(stylestack,serializer,child)
+                    serializer.start_inline(stylestack)
+                    serializer.text(child.tail)
+                    serializer.end_entity()
+                serializer.end_entity()
+
+            elif elem.tag in ('span','em','b','left','right'):
+                serializer.start_inline(stylestack)
+                serializer.text(elem.text)
+                for child in elem:
+                    print_elem(stylestack,serializer,child)
+                    serializer.start_inline(stylestack)
+                    serializer.text(child.tail)
+                    serializer.end_entity()
+                serializer.end_entity()
+
+            elif elem.tag == 'value':
+                serializer.start_inline(stylestack)
+                serializer.pre(format_value( 
+                                              elem.text,
+                                              decimals=stylestack.get('value-decimals'),
+                                              width=stylestack.get('value-width'),
+                                              decimals_separator=stylestack.get('value-decimals-separator'),
+                                              thousands_separator=stylestack.get('value-thousands-separator'),
+                                              autoint=(stylestack.get('autoint') == 'on'),
+                                              symbol=stylestack.get('value-symbol'),
+                                              position=stylestack.get('value-symbol-position') 
+                                            ))
+                serializer.end_entity()
+
+            elif elem.tag == 'line':
+                width = stylestack.get('width')
+                if stylestack.get('size') in ('double', 'double-width'):
+                    width = width / 2
+
+                lineserializer = XmlLineSerializer(stylestack.get('indent')+indent,stylestack.get('tabwidth'),width,stylestack.get('line-ratio'))
+                serializer.start_block(stylestack)
+                for child in elem:
+                    if child.tag == 'left':
+                        print_elem(stylestack,lineserializer,child,indent=indent)
+                    elif child.tag == 'right':
+                        lineserializer.start_right()
+                        print_elem(stylestack,lineserializer,child,indent=indent)
+                serializer.pre(lineserializer.get_line())
+                serializer.end_entity()
+
+            elif elem.tag == 'ul':
+                serializer.start_block(stylestack)
+                bullet = stylestack.get('bullet')
+                for child in elem:
+                    if child.tag == 'li':
+                        serializer.style(stylestack)
+                        serializer.raw(' ' * indent * stylestack.get('tabwidth') + bullet)
+                    print_elem(stylestack,serializer,child,indent=indent+1)
+                serializer.end_entity()
+
+            elif elem.tag == 'ol':
+                cwidth = len(str(len(elem))) + 2
+                i = 1
+                serializer.start_block(stylestack)
+                for child in elem:
+                    if child.tag == 'li':
+                        serializer.style(stylestack)
+                        serializer.raw(' ' * indent * stylestack.get('tabwidth') + ' ' + (str(i)+')').ljust(cwidth))
+                        i = i + 1
+                    print_elem(stylestack,serializer,child,indent=indent+1)
+                serializer.end_entity()
+
+            elif elem.tag == 'pre':
+                serializer.start_block(stylestack)
+                serializer.pre(elem.text)
+                serializer.end_entity()
+
+            elif elem.tag == 'hr':
+                width = stylestack.get('width')
+                if stylestack.get('size') in ('double', 'double-width'):
+                    width = width / 2
+                serializer.start_block(stylestack)
+                serializer.text('-'*width)
+                serializer.end_entity()
+
+            elif elem.tag == 'br':
+                serializer.linebreak()
+
+            elif elem.tag == 'img':
+                if 'src' in elem.attrib and 'data:' in elem.attrib['src']:
+                    self.print_base64_image(elem.attrib['src'])
+
+            elif elem.tag == 'barcode' and 'encoding' in elem.attrib:
+                serializer.start_block(stylestack)
+                self.barcode(strclean(elem.text),elem.attrib['encoding'])
+                serializer.end_entity()
+
+            elif elem.tag == 'cut':
+                self.cut()
+            elif elem.tag == 'partialcut':
+                self.cut(mode='part')
+            elif elem.tag == 'cashdraw':
+                self.cashdraw(2)
+                self.cashdraw(5)
+
+            stylestack.pop()
+
+        try:
+            stylestack      = StyleStack() 
+            serializer      = XmlSerializer(self)
+            root            = ET.fromstring(xml)
+
+            self._raw(stylestack.to_escpos())
+
+            print_elem(stylestack,serializer,root)
+
+            if 'open-cashdrawer' in root.attrib and root.attrib['open-cashdrawer'] == 'true':
+                self.cashdraw(2)
+                self.cashdraw(5)
+            if not 'cut' in root.attrib or root.attrib['cut'] == 'true' :
+                self.cut()
+
+        except Exception as e:
+            errmsg = str(e)+'\n'+'-'*48+'\n'+traceback.format_exc() + '-'*48+'\n'
+            self.text(errmsg)
+            self.cut()
+
+            raise e
+
     def text(self,txt):
         """ Print Utf8 encoded alpha-numeric text """
         if not txt:
diff --git a/addons/document_ftp/wizard/__init__.py b/addons/hw_posbox_homepage/__init__.py
similarity index 96%
rename from addons/document_ftp/wizard/__init__.py
rename to addons/hw_posbox_homepage/__init__.py
index 40997cc6b90..a208bc1c551 100644
--- a/addons/document_ftp/wizard/__init__.py
+++ b/addons/hw_posbox_homepage/__init__.py
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import ftp_browse
-import ftp_configuration
 
+import controllers
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/document_webdav/__init__.py b/addons/hw_posbox_homepage/__openerp__.py
similarity index 64%
rename from addons/document_webdav/__init__.py
rename to addons/hw_posbox_homepage/__openerp__.py
index 486b38e681c..7c0cac0f370 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/hw_posbox_homepage/__openerp__.py
@@ -18,10 +18,30 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import logging
 
-import webdav
-import webdav_server
-import document_webdav
+
+{
+    'name': 'PosBox Homepage',
+    'version': '1.0',
+    'category': 'Hardware Drivers',
+    'sequence': 6,
+    'summary': 'A homepage for the PosBox',
+    'description': """
+PosBox Homepage
+===============
+
+This module overrides openerp web interface to display a simple
+Homepage that explains what's the posbox and show the status,
+and where to find documentation.
+
+If you activate this module, you won't be able to access the 
+regular openerp interface anymore. 
+
+""",
+    'author': 'OpenERP SA',
+    'depends': ['hw_proxy'],
+    'installable': False,
+    'auto_install': False,
+}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hw_posbox_homepage/controllers/__init__.py b/addons/hw_posbox_homepage/controllers/__init__.py
new file mode 100644
index 00000000000..b5f0bcc9ec6
--- /dev/null
+++ b/addons/hw_posbox_homepage/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hw_posbox_homepage/controllers/main.py b/addons/hw_posbox_homepage/controllers/main.py
new file mode 100644
index 00000000000..bab94be060c
--- /dev/null
+++ b/addons/hw_posbox_homepage/controllers/main.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+import logging
+import os
+import time
+from os import listdir
+
+import openerp
+from openerp import http
+from openerp.http import request
+from openerp.tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
+index_template = """
+<!DOCTYPE HTML>
+<html>
+    <head>
+        <title>OpenERP's PosBox</title>
+        <style>
+        body {
+            width: 480px;
+            margin: 60px auto;
+            font-family: sans-serif;
+            text-align: justify;
+            color: #6B6B6B;
+        }
+        </style>
+    </head>
+    <body>
+        <h1>Your PosBox is up and running</h1>
+        <p>
+        The PosBox is an hardware adapter that allows you to use 
+        receipt printers and barcode scanners with OpenERP's Point of
+        Sale, <b>version 8.0 or later</b>. You can start an <a href='https://www.openerp.com/start'>online free trial</a>,
+        or <a href='https://www.openerp.com/start?download'>download and install</a> it yourself.
+        </p>
+        <p>
+        For more information on how to setup the Point of Sale with
+        the PosBox, please refer to <a href='/hw_proxy/static/doc/manual.pdf'>the manual</a>
+        </p>
+        <p>
+        To see the status of the connected hardware, please refer 
+        to the <a href='/hw_proxy/status'>hardware status page</a>
+        </p>
+        <p>
+        The PosBox software installed on this posbox is <b>version 6</b>, 
+        the posbox version number is independent from OpenERP. You can upgrade
+        the software on the <a href='/hw_proxy/upgrade/'>upgrade page</a>
+        </p>
+        <p>For any other question, please contact the OpenERP support at <a href='mailto:support@openerp.com'>support@openerp.com</a>
+        </p>
+    </body>
+</html>
+
+"""
+
+
+class PosboxHomepage(openerp.addons.web.controllers.main.Home):
+    @http.route('/', type='http', auth='none', website=True)
+    def index(self):
+        #return request.render('hw_posbox_homepage.index',mimetype='text/html')
+        return index_template
+        
diff --git a/addons/document_ftp/__init__.py b/addons/hw_posbox_upgrade/__init__.py
similarity index 92%
rename from addons/document_ftp/__init__.py
rename to addons/hw_posbox_upgrade/__init__.py
index e7e4a647563..a208bc1c551 100644
--- a/addons/document_ftp/__init__.py
+++ b/addons/hw_posbox_upgrade/__init__.py
@@ -19,10 +19,7 @@
 #
 ##############################################################################
 
-import ftpserver
-import wizard
-import res_config
-
-post_load = ftpserver.start_server
+import controllers
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/document_ftp/res_config.py b/addons/hw_posbox_upgrade/__openerp__.py
similarity index 56%
rename from addons/document_ftp/res_config.py
rename to addons/hw_posbox_upgrade/__openerp__.py
index 93b3aa69974..68f81c2079b 100644
--- a/addons/document_ftp/res_config.py
+++ b/addons/hw_posbox_upgrade/__openerp__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Business Applications
-#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,19 +19,28 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
-from openerp.tools import config
 
-class documnet_ftp_setting(osv.osv_memory):
-    _name = 'knowledge.config.settings'
-    _inherit = 'knowledge.config.settings'
-    _columns = {
-        'document_ftp_url': fields.char('Browse Documents', size=128,
-            help ="""Click the url to browse the documents""", readonly=True),               
-    }
+{
+    'name': 'PosBox Software Upgrader',
+    'version': '1.0',
+    'category': 'Hardware Drivers',
+    'sequence': 6,
+    'summary': 'Allows to remotely upgrade the PosBox software',
+    'description': """
+PosBox Software Upgrader
+========================
 
-    def get_default_ftp_config(self, cr, uid, fields, context=None):
-        action = self.pool.get('ir.model.data').get_object(cr, uid, 'document_ftp', 'action_document_browse')
-        return {'document_ftp_url': action.url}
+This module allows to remotely upgrade the PosBox software to a
+new version. This module is specific to the PosBox setup and environment
+and should not be installed on regular openerp servers.
+
+""",
+    'author': 'OpenERP SA',
+    'depends': ['hw_proxy'],
+    'test': [
+    ],
+    'installable':  False,
+    'auto_install': False,
+}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hw_posbox_upgrade/controllers/__init__.py b/addons/hw_posbox_upgrade/controllers/__init__.py
new file mode 100644
index 00000000000..b5f0bcc9ec6
--- /dev/null
+++ b/addons/hw_posbox_upgrade/controllers/__init__.py
@@ -0,0 +1,3 @@
+import main
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/hw_posbox_upgrade/controllers/main.py b/addons/hw_posbox_upgrade/controllers/main.py
new file mode 100644
index 00000000000..b741a7a9102
--- /dev/null
+++ b/addons/hw_posbox_upgrade/controllers/main.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+import logging
+import os
+import time
+
+import openerp
+import openerp.addons.hw_proxy.controllers.main as hw_proxy
+import threading
+from openerp import http
+from openerp.http import request
+from openerp.tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
+upgrade_template = """
+<!DOCTYPE HTML>
+<html>
+    <head>
+        <title>OpenERP's PosBox - Software Upgrade</title>
+        <script src="http://code.jquery.com/jquery-1.11.0.min.js"></script>
+        <script>
+        $(function(){
+            var upgrading = false;
+            $('#upgrade').click(function(){
+                console.log('click');
+                if(!upgrading){
+                    upgrading = true;
+                    $('#upgrade').text('Upgrading, Please Wait');
+                    $.ajax({
+                        url:'/hw_proxy/perform_upgrade/'
+                    }).then(function(status){
+                        $('#upgrade').html('Upgrade Successful<br \\>Click to Restart the PosBox');
+                        $('#upgrade').off('click');
+                        $('#upgrade').click(function(){
+                            $.ajax({ url:'hw_proxy/perform_restart' })
+                            $('#upgrade').text('Restarting');
+                            $('#upgrade').off('click');
+                            setTimeout(function(){
+                                window.location = '/'
+                            },30*1000);
+                        });
+
+                    },function(){
+                        $('#upgrade').text('Upgrade Failed');
+                    });
+                }
+            });
+        });
+        </script>
+        <style>
+        body {
+            width: 480px;
+            margin: 60px auto;
+            font-family: sans-serif;
+            text-align: justify;
+            color: #6B6B6B;
+        }
+        .centering{
+            text-align: center;
+        }
+        #upgrade {
+            padding: 20px;
+            background: rgb(121, 197, 107);
+            color: white;
+            border-radius: 3px;
+            text-align: center;
+            margin: 30px; 
+            text-decoration: none;
+            display: inline-block;
+        }
+        </style>
+    </head>
+    <body>
+        <h1>PosBox Software Upgrade</h1>
+        <p>
+        This tool will help you perform an upgrade of the PosBox's software.
+        However the preferred method to upgrade the posbox is to flash the sd-card with
+        the <a href='http://nightly.openerp.com/trunk/posbox/'>latest image</a>. The upgrade
+        procedure is explained into to the <a href='/hw_proxy/static/doc/manual.pdf'>PosBox manual</a>
+        </p>
+        <p>
+        To upgrade the posbox, click on the upgrade button. The upgrade will take a few minutes. <b>Do not reboot</b> the PosBox during the upgrade.
+        </p>
+        <div class='centering'>
+            <a href='#' id='upgrade'>Upgrade</a>
+        </div>
+    </body>
+</html>
+
+"""
+
+class PosboxUpgrader(hw_proxy.Proxy):
+    def __init__(self):
+        super(PosboxUpgrader,self).__init__()
+        self.upgrading = threading.Lock()
+        self.last_upgrade = 0
+
+    @http.route('/hw_proxy/upgrade', type='http', auth='none', )
+    def upgrade(self):
+        return upgrade_template 
+    
+    @http.route('/hw_proxy/perform_upgrade', type='http', auth='none')
+    def perform_upgrade(self):
+        self.upgrading.acquire()
+        if time.time() - self.last_upgrade < 30:
+            self.upgrading.release()
+            return 'UPTODATE'
+        else:
+            os.system('/bin/bash /home/pi/openerp/update.sh')
+            self.last_upgrade = time.time()
+            self.upgrading.release()
+            return 'SUCCESS'
+
+    @http.route('/hw_proxy/perform_restart', type='http', auth='none')
+    def perform_restart(self):
+        self.upgrading.acquire()
+        if time.time() - self.last_upgrade < 30:
+            self.upgrading.release()
+            return 'RESTARTED'
+        else:
+            os.system('/bin/bash /home/pi/openerp/restart.sh')
+            self.last_upgrade = time.time()
+            self.upgrading.release()
+            return 'SUCCESS'
+
+        
diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py
index 5293abd1f25..9e94e4817a4 100644
--- a/addons/hw_proxy/controllers/main.py
+++ b/addons/hw_proxy/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import logging
+import commands
 import simplejson
 import os
 import os.path
@@ -43,7 +44,32 @@ class Proxy(http.Controller):
 
     @http.route('/hw_proxy/status', type='http', auth='none', cors='*')
     def status_http(self):
-        resp = '<html>\n<body>\n<h1>Hardware Proxy Status</h1>\n'
+        resp = """
+<!DOCTYPE HTML>
+<html>
+    <head>
+        <title>OpenERP's PosBox</title>
+        <style>
+        body {
+            width: 480px;
+            margin: 60px auto;
+            font-family: sans-serif;
+            text-align: justify;
+            color: #6B6B6B;
+        }
+        .device {
+            border-bottom: solid 1px rgb(216,216,216);
+            padding: 9px;
+        }
+        .device:nth-child(2n) {
+            background:rgb(240,240,240);
+        }
+        </style>
+    </head>
+    <body>
+        <h1>Hardware Status</h1>
+        <p>The list of enabled drivers and their status</p>
+"""
         statuses = self.get_status()
         for driver in statuses:
 
@@ -56,12 +82,22 @@ class Proxy(http.Controller):
             else:
                 color = 'red'
 
-            resp += "<h2 style='color:"+color+";'>"+driver+' : '+status['status']+"</h2>\n"
+            resp += "<h3 style='color:"+color+";'>"+driver+' : '+status['status']+"</h3>\n"
             resp += "<ul>\n"
             for msg in status['messages']:
                 resp += '<li>'+msg+'</li>\n'
             resp += "</ul>\n"
-        resp += "<script>\n\tsetTimeout(function(){window.location.reload();},30000);\n</script>\n</body>\n</html>\n\n"
+        resp += """
+            <h2>Connected Devices</h2>
+            <p>The list of connected USB devices as seen by the posbox</p>
+        """
+        devices = commands.getoutput("lsusb").split('\n')
+        resp += "<div class='devices'>\n"
+        for device in devices:
+            device_name = device[device.find('ID')+2:]
+            resp+= "<div class='device' data-device='"+device+"'>"+device_name+"</div>\n"
+        resp += "</div>\n"
+        resp += "</body>\n</html>\n\n"
 
         return request.make_response(resp,{
             'Cache-Control': 'no-cache', 
diff --git a/addons/hw_proxy/static/doc/manual.pdf b/addons/hw_proxy/static/doc/manual.pdf
new file mode 100644
index 00000000000..5a55c56654d
Binary files /dev/null and b/addons/hw_proxy/static/doc/manual.pdf differ
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 5a3452836a5..118532db750 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -26,15 +26,8 @@ class knowledge_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_document': fields.boolean('Manage documents',
-            help='This is a complete document management system, with: user authentication, '
-                 'full document search (but pptx and docx are not supported), and a document dashboard.\n'
+            help='Document indexation, full text search of attachements.\n'
                  '-This installs the module document.'),
-        'module_document_ftp': fields.boolean('Share repositories (FTP)',
-            help='Access your documents in OpenERP through an FTP interface.\n'
-                 '-This installs the module document_ftp.'),
-        'module_document_webdav': fields.boolean('Share repositories (WebDAV)',
-            help='Access your documents in OpenERP through WebDAV.\n'
-                 '-This installs the module document_webdav.'),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index cbf9295b8ac..5a526f04b42 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -20,14 +20,6 @@
                                 <field name="module_document" class="oe_inline"/>
                                 <label for="module_document"/>
                             </div>
-                            <div name="module_document_ftp">
-                                <field name="module_document_ftp" class="oe_inline"/>
-                                <label for="module_document_ftp"/>
-                            </div>
-                            <div>
-                                <field name="module_document_webdav" class="oe_inline"/>
-                                <label for="module_document_webdav"/>
-                            </div>
                         </div>
                     </group>
                 </form>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 5a9f8751f2d..4ae47a96774 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -126,7 +126,7 @@ class mail_group(osv.Model):
         vals['menu_id'] = menu_id
 
         # Create group and alias
-        create_context = dict(context, alias_model_name=self._name, alias_parent_model_name=self._name)
+        create_context = dict(context, alias_model_name=self._name, alias_parent_model_name=self._name, mail_create_nolog=True)
         mail_group_id = super(mail_group, self).create(cr, uid, vals, context=create_context)
         group = self.browse(cr, uid, mail_group_id, context=context)
         self.pool.get('mail.alias').write(cr, uid, [group.alias_id.id], {"alias_force_thread_id": mail_group_id, 'alias_parent_thread_id': mail_group_id}, context)
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index b8bf703f604..17dd4b57cd0 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -76,8 +76,8 @@ openerp.mail = function (session) {
          */
         get_text2html: function (text) {
             return text
-                .replace(/[\n\r]/g,'<br/>')
                 .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ')
+                .replace(/[\n\r]/g,'<br/>')                
         },
 
         /* Returns the complete domain with "&" 
diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index 9af4e91b8ce..98949ed75dc 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.py
@@ -19,24 +19,22 @@
 #
 ##############################################################################
 
-from openerp.addons.web import http
-from openerp.addons.web.http import request
+from openerp.osv import osv
 
 
-class bom_structure(http.Controller):
+class bom_structure(osv.AbstractModel):
+    _name = 'report.mrp.report_mrpbomstructure'
 
-    @http.route(['/report/mrp.report_mrpbomstructure/<docids>'], type='http', auth='user', website=True, multilang=True)
-    def report_mrpbomstructure(self, docids):
-        ids = [int(i) for i in docids.split(',')]
-        ids = list(set(ids))
-        report_obj = request.registry['mrp.bom']
-        docs = report_obj.browse(request.cr, request.uid, ids, context=request.context)
+    def render_html(self, cr, uid, ids, data=None, context=None):
+        mrpbom_obj = self.pool['mrp.bom']
+        report_obj = self.pool['report']
+        docs = mrpbom_obj.browse(cr, uid, ids, context=context)
 
         docargs = {
             'docs': docs,
             'get_children': self.get_children,
         }
-        return request.registry['report'].render(request.cr, request.uid, [], 'mrp.report_mrpbomstructure', docargs)
+        return report_obj.render(cr, uid, [], 'mrp.report_mrpbomstructure', docargs, context=context)
 
     def get_children(self, object, level=0):
         result = []
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 54572ee3eb9..5e98bcba49e 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -19,5 +19,11 @@
         <field name="global" eval="True" />
         <field name="domain_force">[('company_id', '=', user.company_id.id)]</field>
     </record>
+    <record id="rule_pos_config_multi_company" model="ir.rule">
+        <field name="name">Point Of Sale Config</field>
+        <field name="model_id" ref="model_pos_config" />
+        <field name="global" eval="True" />
+        <field name="domain_force">[('warehouse_id.company_id','child_of',[user.company_id.id])]</field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 5db91924bce..f46b156371c 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -511,43 +511,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             return this.message('open_cashbox');
         },
 
-        /* ask the printer to print a receipt
-         * receipt is a JSON object with the following specs:
-         * receipt{
-         *  - orderlines : list of orderlines :
-         *     {
-         *          quantity:           (number) the number of items, or the weight, 
-         *          unit_name:          (string) the name of the item's unit (kg, dozen, ...)
-         *          price:              (number) the price of one unit of the item before discount
-         *          discount:           (number) the discount on the product in % [0,100] 
-         *          product_name:       (string) the name of the product
-         *          price_with_tax:     (number) the price paid for this orderline, tax included
-         *          price_without_tax:  (number) the price paid for this orderline, without taxes
-         *          tax:                (number) the price paid in taxes on this orderline
-         *          product_description:         (string) generic description of the product
-         *          product_description_sale:    (string) sales related information of the product
-         *     }
-         *  - paymentlines : list of paymentlines :
-         *     {
-         *          amount:             (number) the amount paid
-         *          journal:            (string) the name of the journal on wich the payment has been made  
-         *     }
-         *  - total_with_tax:     (number) the total of the receipt tax included
-         *  - total_without_tax:  (number) the total of the receipt without taxes
-         *  - total_tax:          (number) the total amount of taxes paid
-         *  - total_paid:         (number) the total sum paid by the client
-         *  - change:             (number) the amount of change given back to the client
-         *  - name:               (string) a unique name for this order
-         *  - client:             (string) name of the client. or null if no client is logged
-         *  - cashier:            (string) the name of the cashier
-         *  - date: {             the date at wich the payment has been done
-         *      year:             (number) the year  [2012, ...]
-         *      month:            (number) the month [0,11]
-         *      date:             (number) the day of the month [1,31]
-         *      day:              (number) the day of the week  [0,6] 
-         *      hour:             (number) the hour [0,23]
-         *      minute:           (number) the minute [0,59]
-         *    }
+        /* 
+         * ask the printer to print a receipt
          */
         print_receipt: function(receipt){
             var self = this;
@@ -558,7 +523,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             function send_printing_job(){
                 if (self.receipt_queue.length > 0){
                     var r = self.receipt_queue.shift();
-                    self.message('print_receipt',{ receipt: r },{ timeout: 5000 })
+                    self.message('print_xml_receipt',{ receipt: r },{ timeout: 5000 })
                         .then(function(){
                             send_printing_job();
                         },function(){
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index c8c87f1b3af..8de82b4dc0a 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -987,6 +987,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     hour: date.getHours(), 
                     minute: date.getMinutes() ,
                     isostring: date.toISOString(),
+                    localestring: date.toLocaleString(),
                 }, 
                 company:{
                     email: company.email,
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 937ee3f88d4..1d6f018ae1b 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -1172,7 +1172,10 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             }else{
                 this.pos.push_order(currentOrder) 
                 if(this.pos.config.iface_print_via_proxy){
-                    this.pos.proxy.print_receipt(currentOrder.export_for_printing());
+                    var receipt = currentOrder.export_for_printing();
+                    this.pos.proxy.print_receipt(QWeb.render('XmlReceipt',{
+                        receipt: receipt
+                    }));
                     this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
                 }else{
                     this.pos_widget.screen_selector.set_current_screen(this.next_screen);
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index d0cd945d4f4..baea81becb7 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -319,6 +319,155 @@
         </div>
     </t>
 
+    <t t-name="XmlReceipt">
+        <receipt align='center' width='40' value-thousands-separator='' >
+            <t t-if='receipt.company.logo'>
+                <img t-att-src='receipt.company.logo' />
+                <br/>
+            </t>
+            <t t-if='!receipt.company.logo'>
+                <h1><t t-esc='receipt.company.name' /></h1>
+                <br/>
+            </t>
+            <div font='b'>
+                <t t-if='receipt.shop.name'>
+                    <div><t t-esc='receipt.shop.name' /></div>
+                </t>
+                <t t-if='receipt.company.contact_address'>
+                    <div><t t-esc='receipt.company.contact_address' /></div>
+                </t>
+                <t t-if='receipt.company.phone'>
+                    <div>Tel:<t t-esc='receipt.company.phone' /></div>
+                </t>
+                <t t-if='receipt.company.vat'>
+                    <div>VAT:<t t-esc='receipt.company.vat' /></div>
+                </t>
+                <t t-if='receipt.company.email'>
+                    <div><t t-esc='receipt.company.email' /></div>
+                </t>
+                <t t-if='receipt.company.website'>
+                    <div><t t-esc='receipt.company.website' /></div>
+                </t>
+                <t t-if='receipt.header'>
+                    <div><t t-esc='receipt.header' /></div>
+                </t>
+                <t t-if='receipt.cashier'>
+                    <div>--------------------------------</div>
+                    <div>Served by <t t-esc='receipt.cashier' /></div>
+                </t>
+            </div>
+            <br /><br />
+
+            <!-- Orderlines -->
+
+            <div line-ratio='0.6'>
+                <t t-foreach='receipt.orderlines' t-as='line'>
+                    <t t-set='simple' t-value='line.discount === 0 and line.unit_name === "Unit(s)" and line.quantity === 1' />
+                    <t t-if='simple'>
+                        <line>
+                            <left><t t-esc='line.product_name' /></left>
+                            <right><value><t t-esc='line.price_display' /></value></right>
+                        </line>
+                    </t>
+                    <t t-if='!simple'>
+                        <line><left><t t-esc='line.product_name' /></left></line>
+                        <t t-if='line.discount !== 0'>
+                            <line indent='1'><left>Discount: <t t-esc='line.discount' />%</left></line>
+                        </t>
+                        <line indent='1'>
+                            <left>
+                                <value value-decimals='3' autoint='on'>
+                                    <t t-esc='line.quantity' />
+                                </value>
+                                <t t-if='line.unit_name !== "Unit(s)"'>
+                                    <t t-esc='line.unit_name' /> 
+                                </t>
+                                x 
+                                <value value-decimals='2'>
+                                    <t t-esc='line.price' />
+                                </value>
+                            </left>
+                            <right>
+                                <value><t t-esc='line.price_display' /></value>
+                            </right>
+                        </line>
+                    </t>
+                </t>
+            </div>
+
+            <!-- Subtotal -->
+
+            <t t-set='taxincluded' t-value='Math.abs(receipt.subtotal - receipt.total_with_tax) &lt;= 0.000001' />
+            <t t-if='!taxincluded'>
+                <line><right>--------</right></line>
+                <line><left>Subtotal</left><right> <value>receipt.subtotal</value></right></line>
+                <t t-foreach='receipt.tax_details' t-as='tax'>
+                    <line>
+                        <left><t t-esc='tax.name' /></left>
+                        <right><value><t t-esc='tax.amount' /></value></right>
+                    </line>
+                </t>
+            </t>
+
+            <!-- Total -->
+
+            <line><right>-------</right></line>
+            <line size='double-height'>
+                <left><pre>        TOTAL</pre></left>
+                <right><value><t t-esc='receipt.total_with_tax' /></value></right>
+            </line>
+            <br/><br/>
+
+            <!-- Payment Lines -->
+
+            <t t-foreach='receipt.paymentlines' t-as='line'>
+                <line>
+                    <left><t t-esc='line.journal' /></left>
+                    <right><value><t t-esc='line.amount'/></value></right>
+                </line>
+            </t>
+            <br/> 
+
+            <line size='double-height'>
+                <left><pre>        CHANGE</pre></left>
+                <right><value><t t-esc='receipt.change' /></value></right>
+            </line>
+            <br/>
+            
+            <!-- Extra Payment Info -->
+
+            <t t-if='receipt.total_discount'>
+                <line>
+                    <left>Discounts</left>
+                    <right><value><t t-esc='receipt.total_discount'/></value></right>
+                </line>
+            </t>
+            <t t-if='taxincluded'>
+                <t t-foreach='receipt.tax_details' t-as='tax'>
+                    <line>
+                        <left><t t-esc='tax.name' /></left>
+                        <right><value><t t-esc='tax.amount' /></value></right>
+                    </line>
+                </t>
+            </t>
+
+            <!-- Footer -->
+            <t t-if='receipt.footer'>
+                <br/>
+                <pre><t t-esc='receipt.footer' /></pre>
+                <br/>
+                <br/>
+            </t>
+
+            <br/>
+            <div font='b'>
+                <div><t t-esc='receipt.name' /></div>
+                <div><t t-esc='receipt.date.localestring' /></div>
+            </div>
+
+        </receipt>
+    </t>
+
     <t t-name="WelcomeScreenWidget">
         <div class="welcome-screen screen">
             <header class='rightpane-header'><h2>Welcome</h2></header>
diff --git a/addons/point_of_sale/wizard/pos_session_opening.xml b/addons/point_of_sale/wizard/pos_session_opening.xml
index 5aa3f8d4764..2f3f244c318 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.xml
+++ b/addons/point_of_sale/wizard/pos_session_opening.xml
@@ -10,7 +10,7 @@
                     <separator string="Select your Point of Sale" colspan="4" attrs="{'invisible' : [('show_config', '=', False)]}" />
                     <group attrs="{'invisible' : [('show_config', '=', False)]}">
                         <field name="pos_config_id" on_change="on_change_config(pos_config_id)"
-                            widget="selection" domain="[('state','=','active')]"
+                            options="{'no_create': True}" domain="[('state','=','active')]"
                             class="oe_inline"/>
                         <field name="pos_state" invisible="1" />
                     </group>
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
index 18eb15361a3..0fe2081fa45 100644
--- a/addons/portal/mail_mail.py
+++ b/addons/portal/mail_mail.py
@@ -39,7 +39,7 @@ class mail_mail(osv.Model):
         if partner and not partner.user_ids:
             contex_signup = dict(context, signup_valid=True)
             signup_url = partner_obj._get_signup_url_for_action(cr, SUPERUSER_ID, [partner.id],
-                                                                    action='login', model=mail.model, res_id=mail.res_id,
+                                                                    model=mail.model, res_id=mail.res_id,
                                                                     context=contex_signup)[partner.id]
             return _("""<span class='oe_mail_footer_access'><small>Access your messages and documents through <a style='color:inherit' href="%s">our Customer Portal</a></small></span>""") % signup_url
         else:
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index bbab8b16cd3..d94e541eb03 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -30,10 +30,3 @@ class portal(osv.osv):
     _columns = {
         'is_portal': fields.boolean('Portal', help="If checked, this group is usable as a portal."),
     }
-
-class res_users(osv.Model):
-    _inherit = 'res.users'
-    def _signup_create_user(self, cr, uid, values, context=None):
-    	values['share'] = True
-    	return super(res_users, self)._signup_create_user(cr, uid, values, context=context)
-
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 35dee070c71..273d1a8c463 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -6,9 +6,6 @@
         <record id="base.group_portal" model="res.groups">
             <field name="is_portal" eval="True"/>
         </record>
-        <record id="auth_signup.default_template_user" model="res.users">
-            <field name="share" eval="True"/>
-        </record>
 
     </data>
 </openerp>
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 3abc9c8cef5..f6e46708bbc 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -22,7 +22,6 @@
 Mr Demo Portal</field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
-            <field name="share" eval="True" />
         </record>
 
         <!-- Add the demo user to the portal (and therefore to the portal member group) -->
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index 66cb0958774..2c4d7ecf966 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -134,7 +134,8 @@ class test_portal(TestMail):
                             'invite: subject of invitation email is incorrect')
             self.assertIn('Administrator invited you to follow Discussion group document: Pigs', sent_email.get('body'),
                             'invite: body of invitation email is incorrect')
-            self.assertTrue(partner_carine.signup_url in sent_email.get('body'),
+            invite_url = partner_carine._get_signup_url_for_action(model='mail.group', res_id=self.group_pigs_id)[partner_carine.id]
+            self.assertTrue(invite_url in sent_email.get('body'),
                             'invite: body of invitation email does not contain signup url')
 
     def test_20_notification_url(self):
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 3973bf6b131..3422a41baff 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -209,7 +209,6 @@ class wizard_user(osv.osv_memory):
             'login': extract_email(wizard_user.email),
             'partner_id': wizard_user.partner_id.id,
             'groups_id': [(6, 0, [])],
-            'share': True,
         }
         user_id = res_users.create(cr, uid, values, context=create_context)
         return res_users.browse(cr, uid, user_id, context)
diff --git a/addons/project/project.py b/addons/project/project.py
index e5dcf5de2cf..f6bd55c2fb6 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -745,7 +745,7 @@ class task(osv.osv):
 
     _columns = {
         'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
-        'name': fields.char('Task Summary', size=128, required=True, select=True),
+        'name': fields.char('Task Summary', track_visibility='onchange', size=128, required=True, select=True),
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index b47320b1e79..ed131670737 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -446,12 +446,7 @@ class purchase_order(osv.osv):
         '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time'
         self.signal_send_rfq(cr, uid, ids)
-        datas = {
-                 'model': 'purchase.order',
-                 'ids': ids,
-                 'form': self.read(cr, uid, ids[0], context=context),
-        }
-        return {'type': 'ir.actions.report.xml', 'report_name': 'purchase.quotation', 'datas': datas, 'nodestroy': True}
+        return self.pool['report'].get_action(cr, uid, ids, 'purchase.report_purchasequotation', context=context)
 
     #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context=None):
@@ -634,10 +629,9 @@ class purchase_order(osv.osv):
             'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
             'date': self.date_to_datetime(cr, uid, order.date_order, context),
-            'partner_id': order.dest_address_id.id or order.partner_id.id,
+            'partner_id': order.partner_id.id,
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'type': 'in',
-            'partner_id': order.dest_address_id.id or order.partner_id.id,
             'purchase_id': order.id,
             'company_id': order.company_id.id,
             'move_lines' : [],
diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py
index 0dae5f41288..5cff7b4aae2 100644
--- a/addons/report/controllers/main.py
+++ b/addons/report/controllers/main.py
@@ -19,459 +19,62 @@
 #
 ##############################################################################
 
-from openerp.osv.osv import except_osv
-from openerp.addons.web import http
-from openerp.tools.translate import _
-from openerp.addons.web.http import request
-import openerp.tools.config as config
+from openerp.addons.web.http import Controller, route, request
 
-import time
-import base64
-import logging
-import tempfile
-import lxml.html
-import subprocess
 import simplejson
-try:
-    import cStringIO as StringIO
-except ImportError:
-    import StringIO
-import psutil
-import signal
-import os
-from distutils.version import LooseVersion
-
-
+import urlparse
 from werkzeug import exceptions
-from werkzeug.test import Client
-from werkzeug.wrappers import BaseResponse
-from werkzeug.datastructures import Headers
 from reportlab.graphics.barcode import createBarcodeDrawing
 
 
-_logger = logging.getLogger(__name__)
-try:
-    from pyPdf import PdfFileWriter, PdfFileReader
-except ImportError:
-    PdfFileWriter = PdfFileReader = None
+class ReportController(Controller):
 
-class Report(http.Controller):
-
-    @http.route(['/report/<reportname>/<docids>'], type='http', auth='user', website=True, multilang=True)
-    def report_html(self, reportname, docids, **kwargs):
-        """This is the generic route for QWeb reports. It is used for reports
-        which do not need to preprocess the data (i.e. reports that just display
-        fields of a record).
-
-        It is given a ~fully qualified report name, for instance 'account.report_invoice'.
-        Based on it, we know the module concerned and the name of the template. With the
-        name of the template, we will make a search on the ir.actions.reports.xml table and
-        get the record associated to finally know the model this template refers to.
-
-        There is a way to declare the report (in module_report(s).xml) that you must respect:
-            id="action_report_model"
-            model="module.model"  # To know which model the report refers to
-            string="Invoices"
-            report_type="qweb-pdf"  # or qweb-html
-            name="module.template_name"
-            file="module.template_name"
-
-        If you don't want your report listed under the print button, just add
-        'menu=False'.
-        """
-        ids = [int(i) for i in docids.split(',')]
-        ids = list(set(ids))
-        report = self._get_report_from_name(reportname)
-        report_obj = request.registry[report.model]
-        docs = report_obj.browse(request.cr, request.uid, ids, context=request.context)
-
-        docargs = {
-            'doc_ids': ids,
-            'doc_model': report.model,
-            'docs': docs,
-        }
-
-        return request.registry['report'].render(request.cr, request.uid, [], report.report_name,
-                                                 docargs, context=request.context)
-
-    @http.route(['/report/pdf/<path:path>'], type='http', auth="user", website=True)
-    def report_pdf(self, path=None, landscape=False, **post):
-        """Route converting any reports to pdf. It will get the html-rendered report, extract
-        header, page and footer in order to prepare minimal html pages that will be further passed
-        to wkhtmltopdf.
-
-        :param path: URL of the report (e.g. /report/account.report_invoice/1)
-        :returns: a response with 'application/pdf' headers and the pdf as content
-        """
+    #------------------------------------------------------
+    # Generic reports controller
+    #------------------------------------------------------
+    @route('/report/<reportname>/<docids>', type='http', auth='user', website=True, multilang=True)
+    def report_html(self, reportname, docids):
         cr, uid, context = request.cr, request.uid, request.context
+        docids = self._eval_params(docids)
+        return request.registry['report'].get_html(cr, uid, docids, reportname, context=context)
 
-        # Get the report we are working on.
-        # Pattern is /report/module.reportname(?a=1)
-        reportname_in_path = path.split('/')[1].split('?')[0]
-        report = self._get_report_from_name(reportname_in_path)
-
-        # Check attachment_use field. If set to true and an existing pdf is already saved, load
-        # this one now. If not, mark save it.
-        save_in_attachment = {}
-
-        if report.attachment_use is True:
-            # Get the record ids we are working on.
-            path_ids = [int(i) for i in path.split('/')[2].split('?')[0].split(',')]
-
-            save_in_attachment['model'] = report.model
-            save_in_attachment['loaded_documents'] = {}
-
-            for path_id in path_ids:
-                obj = request.registry[report.model].browse(cr, uid, path_id)
-                filename = eval(report.attachment, {'object': obj, 'time': time})
-
-                if filename is False:  # May be false if, for instance, the record is in draft state
-                    continue
-                else:
-                    alreadyindb = [('datas_fname', '=', filename),
-                                   ('res_model', '=', report.model),
-                                   ('res_id', '=', path_id)]
-
-                    attach_ids = request.registry['ir.attachment'].search(cr, uid, alreadyindb)
-                    if attach_ids:
-                        # Add the loaded pdf in the loaded_documents list
-                        pdf = request.registry['ir.attachment'].browse(cr, uid, attach_ids[0]).datas
-                        pdf = base64.decodestring(pdf)
-                        save_in_attachment['loaded_documents'][path_id] = pdf
-                        _logger.info('The PDF document %s was loaded from the database' % filename)
-                    else:
-                        # Mark current document to be saved
-                        save_in_attachment[path_id] = filename
-
-        # Get the paperformat associated to the report. If there is not, get the one associated to
-        # the company.
-        if not report.paperformat_id:
-            user = request.registry['res.users'].browse(cr, uid, uid, context=context)
-            paperformat = user.company_id.paperformat_id
-        else:
-            paperformat = report.paperformat_id
-
-        # Get the html report.
-        html = self._get_url_content('/' + path, post)[0]
-        subst = self._get_url_content('/report/static/src/js/subst.js')[0]  # Used in age numbering
-        css = ''  # Local css
-
-        headerhtml = []
-        contenthtml = []
-        footerhtml = []
-        base_url = request.registry['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
-
-        minimalhtml = """
-<base href="{3}">
-<!DOCTYPE html>
-<html style="height: 0;">
-    <head>
-        <link href="/report/static/src/css/reset.min.css" rel="stylesheet"/>
-        <link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/>
-        <link href="/website/static/src/css/website.css" rel="stylesheet"/>
-        <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/>
-
-        <style type='text/css'>{0}</style>
-
-        <script type='text/javascript'>{1}</script>
-    </head>
-    <body class="container" onload='subst()'>
-        {2}
-    </body>
-</html>"""
-
-        # The retrieved html report must be simplified. We convert it into a xml tree
-        # via lxml in order to extract headers, footers and content.
-        try:
-            root = lxml.html.fromstring(html)
-
-            for node in root.xpath("//html/head/style"):
-                css += node.text
-
-            for node in root.xpath("//div[@class='header']"):
-                body = lxml.html.tostring(node)
-                header = minimalhtml.format(css, subst, body, base_url)
-                headerhtml.append(header)
-
-            for node in root.xpath("//div[@class='footer']"):
-                body = lxml.html.tostring(node)
-                footer = minimalhtml.format(css, subst, body, base_url)
-                footerhtml.append(footer)
-
-            for node in root.xpath("//div[@class='page']"):
-                # Previously, we marked some reports to be saved in attachment via their ids, so we
-                # must set a relation between report ids and report's content. We use the QWeb
-                # branding in order to do so: searching after a node having a data-oe-model
-                # attribute with the value of the current report model and read its oe-id attribute
-                oemodelnode = node.find(".//*[@data-oe-model='" + report.model + "']")
-                if oemodelnode is not None:
-                    reportid = oemodelnode.get('data-oe-id', False)
-                    if reportid is not False:
-                        reportid = int(reportid)
-                else:
-                    reportid = False
-
-                body = lxml.html.tostring(node)
-                reportcontent = minimalhtml.format(css, '', body, base_url)
-                contenthtml.append(tuple([reportid, reportcontent]))
-
-        except lxml.etree.XMLSyntaxError:
-            contenthtml = []
-            contenthtml.append(html)
-            save_in_attachment = {}  # Don't save this potentially malformed document
-
-        # Get paperformat arguments set in the root html tag. They are prioritized over
-        # paperformat-record arguments.
-        specific_paperformat_args = {}
-        for attribute in root.items():
-            if attribute[0].startswith('data-report-'):
-                specific_paperformat_args[attribute[0]] = attribute[1]
-
-        # Execute wkhtmltopdf process.
-        pdf = self._generate_wkhtml_pdf(headerhtml, footerhtml, contenthtml, landscape,
-                                        paperformat, specific_paperformat_args, save_in_attachment)
-
-        return self._make_pdf_response(pdf)
-
-    def _get_url_content(self, url, post=None):
-        """Resolve an internal webpage url and return its content with the help of
-        werkzeug.test.client.
-
-        :param url: string representing the url to resolve
-        :param post: a dict representing the query string
-        :returns: a tuple str(html), int(statuscode)
-        """
-        # Rebuilding the query string.
-        if post:
-            url += '?'
-            url += '&'.join('%s=%s' % (k, v) for (k, v) in post.iteritems())
-
-        # We have to pass the current headers in order to see the report.
-        reqheaders = Headers(request.httprequest.headers)
-        response = Client(request.httprequest.app, BaseResponse).get(url, headers=reqheaders,
-                                                                     follow_redirects=True)
-        content = response.data
-
-        try:
-            content = content.decode('utf-8')
-        except UnicodeDecodeError:
-            pass
-
-        return tuple([content, response.headers])
-
-    def _generate_wkhtml_pdf(self, headers, footers, bodies, landscape,
-                             paperformat, spec_paperformat_args=None, save_in_attachment=None):
-        """Execute wkhtmltopdf as a subprocess in order to convert html given in input into a pdf
-        document.
-
-        :param header: list of string containing the headers
-        :param footer: list of string containing the footers
-        :param bodies: list of string containing the reports
-        :param landscape: boolean to force the pdf to be rendered under a landscape format
-        :param paperformat: ir.actions.report.paperformat to generate the wkhtmltopf arguments
-        :param specific_paperformat_args: dict of prioritized paperformat arguments
-        :param save_in_attachment: dict of reports to save/load in/from the db
-        :returns: Content of the pdf as a string
-        """
-        command = ['wkhtmltopdf']
-        tmp_dir = tempfile.gettempdir()
-
-        command_args = []
-        # Passing the cookie in order to resolve URL.
-        command_args.extend(['--cookie', 'session_id', request.httprequest.cookies['session_id']])
-
-        # Display arguments
-        if paperformat:
-            command_args.extend(self._build_wkhtmltopdf_args(paperformat, spec_paperformat_args))
-
-        if landscape and '--orientation' in command_args:
-            command_args_copy = list(command_args)
-            for index, elem in enumerate(command_args_copy):
-                if elem == '--orientation':
-                    del command_args[index]
-                    del command_args[index]
-                    command_args.extend(['--orientation', 'landscape'])
-        elif landscape and not '--orientation' in command_args:
-            command_args.extend(['--orientation', 'landscape'])
-
-        pdfdocuments = []
-        # HTML to PDF thanks to WKhtmltopdf
-        for index, reporthtml in enumerate(bodies):
-            command_arg_local = []
-            pdfreport = tempfile.NamedTemporaryFile(suffix='.pdf', prefix='report.tmp.',
-                                                    mode='w+b')
-            # Directly load the document if we have it
-            if save_in_attachment and save_in_attachment['loaded_documents'].get(reporthtml[0]):
-                pdfreport.write(save_in_attachment['loaded_documents'].get(reporthtml[0]))
-                pdfreport.seek(0)
-                pdfdocuments.append(pdfreport)
-                continue
-
-            # Header stuff
-            if headers:
-                head_file = tempfile.NamedTemporaryFile(suffix='.html', prefix='report.header.tmp.',
-                                                        dir=tmp_dir, mode='w+')
-                head_file.write(headers[index])
-                head_file.seek(0)
-                command_arg_local.extend(['--header-html', head_file.name])
-
-            # Footer stuff
-            if footers:
-                foot_file = tempfile.NamedTemporaryFile(suffix='.html', prefix='report.footer.tmp.',
-                                                        dir=tmp_dir, mode='w+')
-                foot_file.write(footers[index])
-                foot_file.seek(0)
-                command_arg_local.extend(['--footer-html', foot_file.name])
-
-            # Body stuff
-            content_file = tempfile.NamedTemporaryFile(suffix='.html', prefix='report.body.tmp.',
-                                                       dir=tmp_dir, mode='w+')
-            content_file.write(reporthtml[1])
-            content_file.seek(0)
-
-            try:
-                # If the server is running with only one worker, increase it to two to be able
-                # to serve the http request from wkhtmltopdf.
-                if config['workers'] == 1:
-                    ppid = psutil.Process(os.getpid()).ppid
-                    os.kill(ppid, signal.SIGTTIN)
-
-                wkhtmltopdf = command + command_args + command_arg_local
-                wkhtmltopdf += [content_file.name] + [pdfreport.name]
-
-                process = subprocess.Popen(wkhtmltopdf, stdout=subprocess.PIPE,
-                                           stderr=subprocess.PIPE)
-                out, err = process.communicate()
-
-                if config['workers'] == 1:
-                    os.kill(ppid, signal.SIGTTOU)
-
-                if process.returncode != 0:
-                    raise except_osv(_('Report (PDF)'),
-                                     _('wkhtmltopdf failed with error code = %s. '
-                                       'Message: %s') % (str(process.returncode), err))
-
-                # Save the pdf in attachment if marked
-                if reporthtml[0] is not False and save_in_attachment.get(reporthtml[0]):
-                    attachment = {
-                        'name': save_in_attachment.get(reporthtml[0]),
-                        'datas': base64.encodestring(pdfreport.read()),
-                        'datas_fname': save_in_attachment.get(reporthtml[0]),
-                        'res_model': save_in_attachment.get('model'),
-                        'res_id': reporthtml[0],
-                    }
-                    request.registry['ir.attachment'].create(request.cr, request.uid, attachment)
-                    _logger.info('The PDF document %s is now saved in the '
-                                 'database' % attachment['name'])
-
-                pdfreport.seek(0)
-                pdfdocuments.append(pdfreport)
-
-                if headers:
-                    head_file.close()
-                if footers:
-                    foot_file.close()
-            except:
-                raise
-
-        # Get and return the full pdf
-        if len(pdfdocuments) == 1:
-            content = pdfdocuments[0].read()
-            pdfdocuments[0].close()
-        else:
-            content = self._merge_pdf(pdfdocuments)
-
-        return content
-
-    def _build_wkhtmltopdf_args(self, paperformat, specific_paperformat_args=None):
-        """Build arguments understandable by wkhtmltopdf from an ir.actions.report.paperformat
-        record.
-
-        :paperformat: ir.actions.report.paperformat record associated to a document
-        :specific_paperformat_args: a dict containing prioritized wkhtmltopdf arguments
-        :returns: list of string containing the wkhtmltopdf arguments
-        """
-        command_args = []
-        if paperformat.format and paperformat.format != 'custom':
-            command_args.extend(['--page-size', paperformat.format])
-
-        if paperformat.page_height and paperformat.page_width and paperformat.format == 'custom':
-            command_args.extend(['--page-width', str(paperformat.page_width) + 'in'])
-            command_args.extend(['--page-height', str(paperformat.page_height) + 'in'])
-
-        if specific_paperformat_args and specific_paperformat_args['data-report-margin-top']:
-            command_args.extend(['--margin-top',
-                                 str(specific_paperformat_args['data-report-margin-top'])])
-        elif paperformat.margin_top:
-            command_args.extend(['--margin-top', str(paperformat.margin_top)])
-
-        if paperformat.margin_left:
-            command_args.extend(['--margin-left', str(paperformat.margin_left)])
-        if paperformat.margin_bottom:
-            command_args.extend(['--margin-bottom', str(paperformat.margin_bottom)])
-        if paperformat.margin_right:
-            command_args.extend(['--margin-right', str(paperformat.margin_right)])
-        if paperformat.orientation:
-            command_args.extend(['--orientation', str(paperformat.orientation)])
-        if paperformat.header_spacing:
-            command_args.extend(['--header-spacing', str(paperformat.header_spacing)])
-        if paperformat.header_line:
-            command_args.extend(['--header-line'])
-        if paperformat.dpi:
-            command_args.extend(['--dpi', str(paperformat.dpi)])
-
-        return command_args
-
-    def _get_report_from_name(self, report_name):
-        """Get the first record of ir.actions.report.xml having the argument as value for
-        the field report_name.
-        """
-        report_obj = request.registry['ir.actions.report.xml']
-        qwebtypes = ['qweb-pdf', 'qweb-html']
-
-        idreport = report_obj.search(request.cr, request.uid,
-                                     [('report_type', 'in', qwebtypes),
-                                      ('report_name', '=', report_name)])
-
-        report = report_obj.browse(request.cr, request.uid, idreport[0],
-                                   context=request.context)
-        return report
-
-    def _make_pdf_response(self, pdf):
-        """Make a request response for a PDF file with correct http headers.
-
-        :param pdf: content of a pdf in a string
-        :returns: request response for a pdf document
-        """
-        pdfhttpheaders = [('Content-Type', 'application/pdf'),
-                          ('Content-Length', len(pdf))]
+    @route('/report/pdf/report/<reportname>/<docids>', type='http', auth="user", website=True)
+    def report_pdf(self, reportname, docids):
+        cr, uid, context = request.cr, request.uid, request.context
+        docids = self._eval_params(docids)
+        pdf = request.registry['report'].get_pdf(cr, uid, docids, reportname, context=context)
+        pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
         return request.make_response(pdf, headers=pdfhttpheaders)
 
-    def _merge_pdf(self, documents):
-        """Merge PDF files into one.
+    #------------------------------------------------------
+    # Particular reports controller
+    #------------------------------------------------------
+    @route('/report/<reportname>', type='http', auth='user', website=True, multilang=True)
+    def report_html_particular(self, reportname, **data):
+        cr, uid, context = request.cr, request.uid, request.context
+        report_obj = request.registry['report']
+        data = self._eval_params(data)  # Sanitizing
+        return report_obj.get_html(cr, uid, [], reportname, data=data, context=context)
 
-        :param documents: list of pdf files
-        :returns: string containing the merged pdf
-        """
-        writer = PdfFileWriter()
-        for document in documents:
-            reader = PdfFileReader(file(document.name, "rb"))
-            for page in range(0, reader.getNumPages()):
-                writer.addPage(reader.getPage(page))
-            document.close()
-        merged = StringIO.StringIO()
-        writer.write(merged)
-        merged.seek(0)
-        content = merged.read()
-        merged.close()
-        return content
+    @route('/report/pdf/report/<reportname>', type='http', auth='user', website=True, multilang=True)
+    def report_pdf_particular(self, reportname, **data):
+        cr, uid, context = request.cr, request.uid, request.context
+        report_obj = request.registry['report']
+        data = self._eval_params(data)  # Sanitizing
+        pdf = report_obj.get_pdf(cr, uid, [], reportname, data=data, context=context)
+        pdfhttpheaders = [('Content-Type', 'application/pdf'), ('Content-Length', len(pdf))]
+        return request.make_response(pdf, headers=pdfhttpheaders)
 
-    @http.route(['/report/barcode', '/report/barcode/<type>/<path:value>'], type='http', auth="user")
-    def barcode(self, type, value, width=300, height=50):
+    #------------------------------------------------------
+    # Misc. route utils
+    #------------------------------------------------------
+    @route(['/report/barcode', '/report/barcode/<type>/<path:value>'], type='http', auth="user")
+    def report_barcode(self, type, value, width=300, height=50):
         """Contoller able to render barcode images thanks to reportlab.
         Samples: 
             <img t-att-src="'/report/barcode/QR/%s' % o.name"/>
-            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('QR', o.name, 200, 200)"/>
+            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % 
+                ('QR', o.name, 200, 200)"/>
 
         :param type: Accepted types: 'Codabar', 'Code11', 'Code128', 'EAN13', 'EAN8', 'Extended39',
         'Extended93', 'FIM', 'I2of5', 'MSI', 'POSTNET', 'QR', 'Standard39', 'Standard93',
@@ -488,52 +91,69 @@ class Report(http.Controller):
 
         return request.make_response(barcode, headers=[('Content-Type', 'image/png')])
 
-    @http.route('/report/download', type='http', auth="user")
-    def report_attachment(self, data, token):
+    @route(['/report/download'], type='http', auth="user", website=True)
+    def report_download(self, data, token):
         """This function is used by 'qwebactionmanager.js' in order to trigger the download of
-        a report of any type.
+        a pdf report.
 
-        :param data: a javasscript array JSON.stringified containg report internal url ([0]) and
+        :param data: a javascript array JSON.stringified containg report internal url ([0]) and
         type [1]
         :returns: Response with a filetoken cookie and an attachment header
         """
         requestcontent = simplejson.loads(data)
         url, type = requestcontent[0], requestcontent[1]
-        file, fileheaders = self._get_url_content(url)
-
         if type == 'qweb-pdf':
-            response = self._make_pdf_response(file)
-            response.headers.add('Content-Disposition', 'attachment; filename=report.pdf;')
-        elif type == 'controller':
-            response = request.make_response(file)
-            response.headers.add('Content-Disposition', fileheaders['Content-Disposition'])
-            response.headers.add('Content-Type', fileheaders['Content-Type'])
+            reportname = url.split('/report/pdf/report/')[1].split('?')[0].split('/')[0]
+
+            if '?' not in url:
+                # Generic report:
+                docids = url.split('/')[-1]
+                response = self.report_pdf(reportname, docids)
+            else:
+                # Particular report:
+                querystring = url.split('?')[1]
+                querystring = dict(urlparse.parse_qsl(querystring))
+                response = self.report_pdf_particular(reportname, **querystring)
+
+            response.headers.add('Content-Disposition', 'attachment; filename=%s.pdf;' % reportname)
+            response.set_cookie('fileToken', token)
+            return response
+        elif type =='controller':
+            from werkzeug.test import Client
+            from werkzeug.wrappers import BaseResponse
+            from werkzeug.datastructures import Headers
+            reqheaders = Headers(request.httprequest.headers)
+            response = Client(request.httprequest.app, BaseResponse).get(url, headers=reqheaders, follow_redirects=True)
+            response.set_cookie('fileToken', token)
+            return response
         else:
             return
 
-        response.headers.add('Content-Length', len(file))
-        response.set_cookie('fileToken', token)
-        return response
-
-    @http.route('/report/check_wkhtmltopdf', type='json', auth="user")
+    @route(['/report/check_wkhtmltopdf'], type='json', auth="user")
     def check_wkhtmltopdf(self):
-        """Check the presence of wkhtmltopdf and return its version. If wkhtmltopdf
-        cannot be found, return False.
+        return request.registry['report']._check_wkhtmltopdf()
+
+    def _eval_params(self, param):
+        """Parse a dict generated by the webclient (javascript) into a python dict.
         """
-        try:
-            process = subprocess.Popen(['wkhtmltopdf', '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            out, err = process.communicate()
-            if err:
-                raise
-
-            version = out.splitlines()[1].strip()
-            version = version.split(' ')[1]
-
-            if LooseVersion(version) < LooseVersion('0.12.0'):
-                _logger.warning('Upgrade WKHTMLTOPDF to (at least) 0.12.0')
-                return 'upgrade'
-
-            return True
-        except:
-            _logger.error('You need WKHTMLTOPDF to print a pdf version of this report.')
-            return False
+        if isinstance(param, dict):
+            for key, value in param.iteritems():
+                if value.lower() == 'false':
+                    param[key] = False
+                elif value.lower() == 'true':
+                    param[key] = True
+                elif ',' in value:
+                    param[key] = [int(i) for i in value.split(',')]
+                else:
+                    try:
+                        param[key] = int(value)
+                    except (ValueError, TypeError):
+                        pass
+        else:
+            if isinstance(param, (str, unicode)):
+                param = [int(i) for i in param.split(',')]
+            if isinstance(param, list):
+                param = list(set(param))
+            if isinstance(param, int):
+                param = [param]
+        return param
diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index 8a2bc21b3b0..8abe8e544eb 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -19,54 +19,85 @@
 #
 ##############################################################################
 
-from openerp.addons.web.http import request
 from openerp.osv import osv
-from openerp.osv.fields import float as float_field, function as function_field, datetime as datetime_field
-from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, config
+from openerp.osv.fields import float as float_field, function as function_field, datetime as datetime_field
 
+import os
 import time
+import psutil
+import signal
+import base64
+import logging
+import tempfile
+import lxml.html
+import cStringIO
+import subprocess
 from datetime import datetime
-
-from werkzeug.datastructures import Headers
-from werkzeug.wrappers import BaseResponse
-from werkzeug.test import Client
+from functools import partial
+from distutils.version import LooseVersion
+try:
+    from pyPdf import PdfFileWriter, PdfFileReader
+except ImportError:
+    PdfFileWriter = PdfFileReader = None
 
 
-def get_date_length(date_format=DEFAULT_SERVER_DATE_FORMAT):
-    return len((datetime.now()).strftime(date_format))
+_logger = logging.getLogger(__name__)
 
 
-class report(osv.Model):
+"""Check the presence of wkhtmltopdf and return its version."""
+wkhtmltopdf_state = 'install'
+try:
+    process = subprocess.Popen(
+        ['wkhtmltopdf', '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE
+    )
+except OSError:
+    _logger.error('You need wkhtmltopdf to print a pdf version of the reports.')
+else:
+    out, err = process.communicate()
+    version = out.splitlines()[1].strip()
+    version = version.split(' ')[1]
+    if LooseVersion(version) < LooseVersion('0.12.0'):
+        _logger.warning('Upgrade wkhtmltopdf to (at least) 0.12.0')
+        wkhtmltopdf_state = 'upgrade'
+    wkhtmltopdf_state = 'ok'
+
+
+class Report(osv.Model):
     _name = "report"
     _description = "Report"
 
     public_user = None
 
-    def get_digits(self, obj=None, f=None, dp=None):
+    #--------------------------------------------------------------------------
+    # Extension of ir_ui_view.render with arguments frequently used in reports
+    #--------------------------------------------------------------------------
+
+    def _get_digits(self, cr, uid, obj=None, f=None, dp=None):
         d = DEFAULT_DIGITS = 2
         if dp:
             decimal_precision_obj = self.pool['decimal.precision']
-            ids = decimal_precision_obj.search(request.cr, request.uid, [('name', '=', dp)])
+            ids = decimal_precision_obj.search(cr, uid, [('name', '=', dp)])
             if ids:
-                d = decimal_precision_obj.browse(request.cr, request.uid, ids)[0].digits
+                d = decimal_precision_obj.browse(cr, uid, ids)[0].digits
         elif obj and f:
             res_digits = getattr(obj._columns[f], 'digits', lambda x: ((16, DEFAULT_DIGITS)))
             if isinstance(res_digits, tuple):
                 d = res_digits[1]
             else:
-                d = res_digits(request.cr)[1]
+                d = res_digits(cr)[1]
         elif (hasattr(obj, '_field') and
                 isinstance(obj._field, (float_field, function_field)) and
                 obj._field.digits):
                 d = obj._field.digits[1] or DEFAULT_DIGITS
         return d
 
-    def _get_lang_dict(self):
+    def _get_lang_dict(self, cr, uid):
         pool_lang = self.pool['res.lang']
         lang = self.localcontext.get('lang', 'en_US') or 'en_US'
-        lang_ids = pool_lang.search(request.cr, request.uid, [('code', '=', lang)])[0]
-        lang_obj = pool_lang.browse(request.cr, request.uid, lang_ids)
+        lang_ids = pool_lang.search(cr, uid, [('code', '=', lang)])[0]
+        lang_obj = pool_lang.browse(cr, uid, lang_ids)
         lang_dict = {
             'lang_obj': lang_obj,
             'date_format': lang_obj.date_format,
@@ -76,7 +107,7 @@ class report(osv.Model):
         self.default_lang[lang] = self.lang_dict.copy()
         return True
 
-    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False, currency_obj=False):
+    def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False, currency_obj=False, cr=None, uid=None):
         """
             Assuming 'Account' decimal.precision=3:
                 formatLang(value) -> digits=2 (default)
@@ -84,17 +115,20 @@ class report(osv.Model):
                 formatLang(value, dp='Account') -> digits=3
                 formatLang(value, digits=5, dp='Account') -> digits=5
         """
+        def get_date_length(date_format=DEFAULT_SERVER_DATE_FORMAT):
+            return len((datetime.now()).strftime(date_format))
+
         if digits is None:
             if dp:
-                digits = self.get_digits(dp=dp)
+                digits = self._get_digits(cr, uid, dp=dp)
             else:
-                digits = self.get_digits(value)
+                digits = self._get_digits(cr, uid, value)
 
         if isinstance(value, (str, unicode)) and not value:
             return ''
 
         if not self.lang_dict_called:
-            self._get_lang_dict()
+            self._get_lang_dict(cr, uid)
             self.lang_dict_called = True
 
         if date or date_time:
@@ -117,9 +151,7 @@ class report(osv.Model):
                 date = datetime(*value.timetuple()[:6])
             if date_time:
                 # Convert datetime values to the expected client/context timezone
-                date = datetime_field.context_timestamp(request.cr, request.uid,
-                                                        timestamp=date,
-                                                        context=self.localcontext)
+                date = datetime_field.context_timestamp(cr, uid, timestamp=date, context=self.localcontext)
             return date.strftime(date_format.encode('utf-8'))
 
         res = self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
@@ -150,7 +182,7 @@ class report(osv.Model):
             'tz': context.get('tz'),
             'uid': context.get('uid'),
         }
-        self._get_lang_dict()
+        self._get_lang_dict(cr, uid)
 
         view_obj = self.pool['ir.ui.view']
 
@@ -177,51 +209,180 @@ class report(osv.Model):
                 qcontext['o'] = self.pool[model].browse(cr, uid, doc_id, context=ctx)
             return view_obj.render(cr, uid, template, qcontext, context=ctx)
 
-        current_user = self.pool['res.users'].browse(cr, uid, uid, context=context)
-
-        # Website independance code
-        website = False
-        res_company = current_user.company_id
-
-        try:
-            website = request.website
-            res_company = request.website.company_id
-        except:
-            pass
-
         values.update({
             'time': time,
-            'user': current_user,
-            'user_id': current_user.id,
-            'formatLang': self.formatLang,
-            'get_digits': self.get_digits,
+            'formatLang': partial(self.formatLang, cr=cr, uid=uid),
+            'get_digits': self._get_digits,
             'render_doc': render_doc,
-            'website': website,
-            'res_company': res_company,
+            'editable': True,  # Will active inherit_branding
+            'res_company': self.pool['res.users'].browse(cr, uid, uid).company_id,
+            'website': False,  # Will be overidden by ir.ui.view if the request has website enabled
         })
 
         return view_obj.render(cr, uid, template, values, context=context)
 
-    def get_pdf(self, report, record_id, context=None):
-        """Used to return the content of a generated PDF.
+    #--------------------------------------------------------------------------
+    # Main reports methods
+    #--------------------------------------------------------------------------
 
-        :returns: pdf
+    def get_html(self, cr, uid, ids, report_name, data=None, context=None):
+        """This method generates and returns html version of a report.
         """
-        url = '/report/pdf/report/' + report.report_file + '/' + str(record_id)
-        reqheaders = Headers(request.httprequest.headers)
-        reqheaders.pop('Accept')
-        reqheaders.add('Accept', 'application/pdf')
-        reqheaders.pop('Content-Type')
-        reqheaders.add('Content-Type', 'text/plain')
-        response = Client(request.httprequest.app, BaseResponse).get(url, headers=reqheaders,
-                                                                     follow_redirects=True)
-        return response.data
+        # If the report is using a custom model to render its html, we must use it.
+        # Otherwise, fallback on the generic html rendering.
+        try:
+            report_model_name = 'report.%s' % report_name
+            particularreport_obj = self.pool[report_model_name]
+            return particularreport_obj.render_html(cr, uid, ids, data={'form': data}, context=context)
+        except KeyError:
+            report = self._get_report_from_name(cr, uid, report_name)
+            report_obj = self.pool[report.model]
+            docs = report_obj.browse(cr, uid, ids, context=context)
+            docargs = {
+                'doc_ids': ids,
+                'doc_model': report.model,
+                'docs': docs,
+            }
+            return self.render(cr, uid, [], report.report_name, docargs, context=context)
+
+    def get_pdf(self, cr, uid, ids, report_name, html=None, data=None, context=None):
+        """This method generates and returns pdf version of a report.
+        """
+        if context is None:
+            context = {}
+
+        if html is None:
+            html = self.get_html(cr, uid, ids, report_name, data=data, context=context)
+
+        html = html.decode('utf-8')
+
+        # Get the ir.actions.report.xml record we are working on.
+        report = self._get_report_from_name(cr, uid, report_name)
+
+        # Check attachment_use field. If set to true and an existing pdf is already saved, load
+        # this one now. Else, mark save it.
+        save_in_attachment = {}
+
+        if report.attachment_use is True:
+            save_in_attachment['model'] = report.model
+            save_in_attachment['loaded_documents'] = {}
+
+            for record_id in ids:
+                obj = self.pool[report.model].browse(cr, uid, record_id)
+                filename = eval(report.attachment, {'object': obj, 'time': time})
+
+                if filename is False:  # May be false if, for instance, the record is in draft state
+                    continue
+                else:
+                    alreadyindb = [('datas_fname', '=', filename),
+                                   ('res_model', '=', report.model),
+                                   ('res_id', '=', record_id)]
+
+                    attach_ids = self.pool['ir.attachment'].search(cr, uid, alreadyindb)
+                    if attach_ids:
+                        # Add the loaded pdf in the loaded_documents list
+                        pdf = self.pool['ir.attachment'].browse(cr, uid, attach_ids[0]).datas
+                        pdf = base64.decodestring(pdf)
+                        save_in_attachment['loaded_documents'][record_id] = pdf
+                        _logger.info('The PDF document %s was loaded from the database' % filename)
+                    else:
+                        # Mark current document to be saved
+                        save_in_attachment[id] = filename
+
+        # Get the paperformat associated to the report, otherwise fallback on the company one.
+        if not report.paperformat_id:
+            user = self.pool['res.users'].browse(cr, uid, uid)
+            paperformat = user.company_id.paperformat_id
+        else:
+            paperformat = report.paperformat_id
+
+        # Preparing the minimal html pages
+        #subst = self._get_url_content('/report/static/src/js/subst.js')[0]  # Used in age numbering
+        subst = "<script src='/report/static/src/js/subst.js'></script> "
+        css = ''  # Will contain local css
+
+        headerhtml = []
+        contenthtml = []
+        footerhtml = []
+        base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
+
+        minimalhtml = """
+<base href="{base_url}">
+<!DOCTYPE html>
+<html style="height: 0;">
+    <head>
+        <link href="/report/static/src/css/reset.min.css" rel="stylesheet"/>
+        <link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/>
+        <link href="/website/static/src/css/website.css" rel="stylesheet"/>
+        <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/>
+        <style type='text/css'>{css}</style>
+        {subst}
+    </head>
+    <body class="container" onload='subst()'>
+        {body}
+    </body>
+</html>"""
+
+        # The retrieved html report must be simplified. We convert it into a xml tree
+        # via lxml in order to extract headers, footers and content.
+        try:
+            root = lxml.html.fromstring(html)
+
+            for node in root.xpath("//html/head/style"):
+                css += node.text
+
+            for node in root.xpath("//div[@class='header']"):
+                body = lxml.html.tostring(node)
+                header = minimalhtml.format(css=css, subst=subst, body=body, base_url=base_url)
+                headerhtml.append(header)
+
+            for node in root.xpath("//div[@class='footer']"):
+                body = lxml.html.tostring(node)
+                footer = minimalhtml.format(css=css, subst=subst, body=body, base_url=base_url)
+                footerhtml.append(footer)
+
+            for node in root.xpath("//div[@class='page']"):
+                # Previously, we marked some reports to be saved in attachment via their ids, so we
+                # must set a relation between report ids and report's content. We use the QWeb
+                # branding in order to do so: searching after a node having a data-oe-model
+                # attribute with the value of the current report model and read its oe-id attribute
+                oemodelnode = node.find(".//*[@data-oe-model='%s']" % report.model)
+                if oemodelnode is not None:
+                    reportid = oemodelnode.get('data-oe-id')
+                    if reportid:
+                        reportid = int(reportid)
+                else:
+                    reportid = False
+
+                body = lxml.html.tostring(node)
+                reportcontent = minimalhtml.format(css=css, subst='', body=body, base_url=base_url)
+                contenthtml.append(tuple([reportid, reportcontent]))
+
+        except lxml.etree.XMLSyntaxError:
+            contenthtml = []
+            contenthtml.append(html)
+            save_in_attachment = {}  # Don't save this potentially malformed document
+
+        # Get paperformat arguments set in the root html tag. They are prioritized over
+        # paperformat-record arguments.
+        specific_paperformat_args = {}
+        for attribute in root.items():
+            if attribute[0].startswith('data-report-'):
+                specific_paperformat_args[attribute[0]] = attribute[1]
+
+        # Run wkhtmltopdf process
+        pdf = self._generate_wkhtml_pdf(
+            cr, uid, headerhtml, footerhtml, contenthtml, context.get('landscape'),
+            paperformat, specific_paperformat_args, save_in_attachment
+        )
+        return pdf
 
     def get_action(self, cr, uid, ids, report_name, datas=None, context=None):
-        """Used to return an action of type ir.actions.report.xml.
+        """Return an action of type ir.actions.report.xml.
 
         :param report_name: Name of the template to generate an action for
         """
+        # TODO: return the action for the ids passed in args
         if context is None:
             context = {}
 
@@ -249,26 +410,203 @@ class report(osv.Model):
 
         return action
 
-    def eval_params(self, dict_param):
-        """Parse a dictionary generated by the webclient (javascript) into a dictionary
-        understandable by a wizard controller (python).
-        """
-        for key, value in dict_param.iteritems():
-            if value.lower() == 'false':
-                dict_param[key] = False
-            elif value.lower() == 'true':
-                dict_param[key] = True
-            elif ',' in value:
-                dict_param[key] = [int(i) for i in value.split(',')]
-            elif '%2C' in value:
-                dict_param[key] = [int(i) for i in value.split('%2C')]
-            else:
-                try:
-                    i = int(value)
-                    dict_param[key] = i
-                except (ValueError, TypeError):
-                    pass
+    #--------------------------------------------------------------------------
+    # Report generation helpers
+    #--------------------------------------------------------------------------
 
-        data = {}
-        data['form'] = dict_param
-        return data
+    def _check_wkhtmltopdf(self):
+        return wkhtmltopdf_state
+
+    def _generate_wkhtml_pdf(self, cr, uid, headers, footers, bodies, landscape, paperformat, spec_paperformat_args=None, save_in_attachment=None):
+        """Execute wkhtmltopdf as a subprocess in order to convert html given in input into a pdf
+        document.
+
+        :param header: list of string containing the headers
+        :param footer: list of string containing the footers
+        :param bodies: list of string containing the reports
+        :param landscape: boolean to force the pdf to be rendered under a landscape format
+        :param paperformat: ir.actions.report.paperformat to generate the wkhtmltopf arguments
+        :param specific_paperformat_args: dict of prioritized paperformat arguments
+        :param save_in_attachment: dict of reports to save/load in/from the db
+        :returns: Content of the pdf as a string
+        """
+        command = ['wkhtmltopdf']
+        command_args = []
+        tmp_dir = tempfile.gettempdir()
+
+        # Passing the cookie to wkhtmltopdf in order to resolve URL.
+        try:
+            from openerp.addons.web.http import request
+            command_args.extend(['--cookie', 'session_id', request.session.sid])
+        except AttributeError:
+            pass
+
+        # Display arguments
+        if paperformat:
+            command_args.extend(self._build_wkhtmltopdf_args(paperformat, spec_paperformat_args))
+
+        if landscape and '--orientation' in command_args:
+            command_args_copy = list(command_args)
+            for index, elem in enumerate(command_args_copy):
+                if elem == '--orientation':
+                    del command_args[index]
+                    del command_args[index]
+                    command_args.extend(['--orientation', 'landscape'])
+        elif landscape and not '--orientation' in command_args:
+            command_args.extend(['--orientation', 'landscape'])
+
+        pdfdocuments = []
+        # HTML to PDF thanks to WKhtmltopdf
+        for index, reporthtml in enumerate(bodies):
+            command_arg_local = []
+            pdfreport = tempfile.NamedTemporaryFile(suffix='.pdf', prefix='report.tmp.',
+                                                    mode='w+b')
+            # Directly load the document if we have it
+            if save_in_attachment and save_in_attachment['loaded_documents'].get(reporthtml[0]):
+                pdfreport.write(save_in_attachment['loaded_documents'].get(reporthtml[0]))
+                pdfreport.flush()
+                pdfdocuments.append(pdfreport)
+                continue
+
+            # Header stuff
+            if headers:
+                head_file = tempfile.NamedTemporaryFile(suffix='.html', prefix='report.header.tmp.',
+                                                        dir=tmp_dir, mode='w+')
+                head_file.write(headers[index])
+                head_file.flush()
+                command_arg_local.extend(['--header-html', head_file.name])
+
+            # Footer stuff
+            if footers:
+                foot_file = tempfile.NamedTemporaryFile(suffix='.html', prefix='report.footer.tmp.',
+                                                        dir=tmp_dir, mode='w+')
+                foot_file.write(footers[index])
+                foot_file.flush()
+                command_arg_local.extend(['--footer-html', foot_file.name])
+
+            # Body stuff
+            content_file = tempfile.NamedTemporaryFile(suffix='.html', prefix='report.body.tmp.',
+                                                       dir=tmp_dir, mode='w+')
+            content_file.write(reporthtml[1])
+            content_file.flush()
+
+            try:
+                # If the server is running with only one worker, ask to create a secund to be able
+                # to serve the http request of wkhtmltopdf subprocess.
+                if config['workers'] == 1:
+                    ppid = psutil.Process(os.getpid()).ppid
+                    os.kill(ppid, signal.SIGTTIN)
+
+                wkhtmltopdf = command + command_args + command_arg_local
+                wkhtmltopdf += [content_file.name] + [pdfreport.name]
+
+                process = subprocess.Popen(wkhtmltopdf, stdout=subprocess.PIPE,
+                                           stderr=subprocess.PIPE)
+                out, err = process.communicate()
+
+                if config['workers'] == 1:
+                    os.kill(ppid, signal.SIGTTOU)
+
+                if process.returncode != 0:
+                    raise osv.except_osv(_('Report (PDF)'),
+                                         _('wkhtmltopdf failed with error code = %s. '
+                                           'Message: %s') % (str(process.returncode), err))
+
+                # Save the pdf in attachment if marked
+                if reporthtml[0] is not False and save_in_attachment.get(reporthtml[0]):
+                    attachment = {
+                        'name': save_in_attachment.get(reporthtml[0]),
+                        'datas': base64.encodestring(pdfreport.read()),
+                        'datas_fname': save_in_attachment.get(reporthtml[0]),
+                        'res_model': save_in_attachment.get('model'),
+                        'res_id': reporthtml[0],
+                    }
+                    self.pool['ir.attachment'].create(cr, uid, attachment)
+                    _logger.info('The PDF document %s is now saved in the '
+                                 'database' % attachment['name'])
+
+                pdfreport.flush()
+                pdfdocuments.append(pdfreport)
+
+                if headers:
+                    head_file.close()
+                if footers:
+                    foot_file.close()
+            except:
+                raise
+
+        # Get and return the full pdf
+        if len(pdfdocuments) == 1:
+            content = pdfdocuments[0].read()
+            pdfdocuments[0].close()
+        else:
+            content = self._merge_pdf(pdfdocuments)
+
+        return content
+
+    def _get_report_from_name(self, cr, uid, report_name):
+        """Get the first record of ir.actions.report.xml having the ``report_name`` as value for
+        the field report_name.
+        """
+        report_obj = self.pool['ir.actions.report.xml']
+        qwebtypes = ['qweb-pdf', 'qweb-html']
+        conditions = [('report_type', 'in', qwebtypes), ('report_name', '=', report_name)]
+        idreport = report_obj.search(cr, uid, conditions)[0]
+        return report_obj.browse(cr, uid, idreport)
+
+    def _build_wkhtmltopdf_args(self, paperformat, specific_paperformat_args=None):
+        """Build arguments understandable by wkhtmltopdf from a report.paperformat record.
+
+        :paperformat: report.paperformat record
+        :specific_paperformat_args: a dict containing prioritized wkhtmltopdf arguments
+        :returns: list of string representing the wkhtmltopdf arguments
+        """
+        command_args = []
+        if paperformat.format and paperformat.format != 'custom':
+            command_args.extend(['--page-size', paperformat.format])
+
+        if paperformat.page_height and paperformat.page_width and paperformat.format == 'custom':
+            command_args.extend(['--page-width', str(paperformat.page_width) + 'in'])
+            command_args.extend(['--page-height', str(paperformat.page_height) + 'in'])
+
+        if specific_paperformat_args and specific_paperformat_args['data-report-margin-top']:
+            command_args.extend(['--margin-top',
+                                 str(specific_paperformat_args['data-report-margin-top'])])
+        elif paperformat.margin_top:
+            command_args.extend(['--margin-top', str(paperformat.margin_top)])
+
+        if paperformat.margin_left:
+            command_args.extend(['--margin-left', str(paperformat.margin_left)])
+        if paperformat.margin_bottom:
+            command_args.extend(['--margin-bottom', str(paperformat.margin_bottom)])
+        if paperformat.margin_right:
+            command_args.extend(['--margin-right', str(paperformat.margin_right)])
+        if paperformat.orientation:
+            command_args.extend(['--orientation', str(paperformat.orientation)])
+        if paperformat.header_spacing:
+            command_args.extend(['--header-spacing', str(paperformat.header_spacing)])
+        if paperformat.header_line:
+            command_args.extend(['--header-line'])
+        if paperformat.dpi:
+            command_args.extend(['--dpi', str(paperformat.dpi)])
+
+        return command_args
+
+    def _merge_pdf(self, documents):
+        """Merge PDF files into one.
+
+        :param documents: list of pdf files
+        :returns: string containing the merged pdf
+        """
+        writer = PdfFileWriter()
+        for document in documents:
+            reader = PdfFileReader(file(document.name, "rb"))
+            for page in range(0, reader.getNumPages()):
+                writer.addPage(reader.getPage(page))
+            document.close()
+        merged = cStringIO.StringIO()
+        writer.write(merged)
+        merged.seek(0)
+        content = merged.read()
+        merged.close()
+        return content
diff --git a/addons/report/static/src/js/qwebactionmanager.js b/addons/report/static/src/js/qwebactionmanager.js
index 8d1550a6e2c..b75003942d2 100644
--- a/addons/report/static/src/js/qwebactionmanager.js
+++ b/addons/report/static/src/js/qwebactionmanager.js
@@ -1,4 +1,5 @@
 openerp.report = function(instance) {
+    var wkhtmltopdf_state;
 
     instance.web.ActionManager = instance.web.ActionManager.extend({
         ir_actions_report_xml: function(action, options) {
@@ -11,8 +12,7 @@ openerp.report = function(instance) {
 
             // QWeb reports
             if ('report_type' in action && (action.report_type == 'qweb-html' || action.report_type == 'qweb-pdf' || action.report_type == 'controller')) {
-                
-                var report_url = ''
+                var report_url = '';
                 switch (action.report_type) {
                     case 'qweb-html':
                         report_url = '/report/' + action.report_name;
@@ -49,41 +49,49 @@ openerp.report = function(instance) {
                 }
                 if (action.report_type == 'qweb-html') {
                     // Open the html report in a popup
-                    window.open(report_url, '_blank', 'height=768,width=1024');
+                    window.open(report_url, '_blank', 'height=900,width=1280');
                     instance.web.unblockUI();
                     return;
                 } else {
-                    // Trigger the download of the pdf/custom controller report
+                    // Trigger the download of the pdf/controller report
                     var c = openerp.webclient.crashmanager;
-                    var response = new Array()
-                    response[0] = report_url
-                    response[1] = action.report_type
+                    var response = new Array();
+                    response[0] = report_url;
+                    response[1] = action.report_type;
 
-                    openerp.session.rpc('/report/check_wkhtmltopdf').then(function (presence) {
-                        // Fallback of qweb-pdf if wkhtmltopdf is not installed
-                        if (!presence && action.report_type == 'qweb-pdf') {
-                            self.do_notify(_t('Report'), _t('Unable to find Wkhtmltopdf on this \
-system. The report will be shown in html.<br><br><a href="http://wkhtmltopdf.org/" _target="blank">\
-wkhtmltopdf.org</a>'), true);
-                            window.open(report_url.substring(12), '_blank', 'height=768,width=1024');
-                            instance.web.unblockUI();
-                        }
-                        else {
-                            if (presence == 'upgrade') {
-                                self.do_notify(_t('Report'), _t('You should upgrade your version of\
- Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\
- support for table-breaking between pages.<br><br><a href="http://wkhtmltopdf.org/" \
- target="_blank">wkhtmltopdf.org</a>'), true);
+                    if (action.report_type == 'qweb-pdf') {
+                        (wkhtmltopdf_state = wkhtmltopdf_state || openerp.session.rpc('/report/check_wkhtmltopdf')).then(function (presence) {
+                            // Fallback of qweb-pdf if wkhtmltopdf is not installed
+                            if (presence == 'install' && action.report_type == 'qweb-pdf') {
+                                self.do_notify(_t('Report'), _t('Unable to find Wkhtmltopdf on this \
+    system. The report will be shown in html.<br><br><a href="http://wkhtmltopdf.org/" target="_blank">\
+    wkhtmltopdf.org</a>'), true);
+                                window.open(report_url.substring(12), '_blank', 'height=768,width=1024');
+                                instance.web.unblockUI();
+                            } else {
+                                if (presence == 'upgrade') {
+                                    self.do_notify(_t('Report'), _t('You should upgrade your version of\
+     Wkhtmltopdf to at least 0.12.0 in order to get a correct display of headers and footers as well as\
+     support for table-breaking between pages.<br><br><a href="http://wkhtmltopdf.org/" \
+     target="_blank">wkhtmltopdf.org</a>'), true);
+                                }
+                                self.session.get_file({
+                                    url: '/report/download',
+                                    data: {data: JSON.stringify(response)},
+                                    complete: openerp.web.unblockUI,
+                                    error: c.rpc_error.bind(c)
+                                });
                             }
-                            self.session.get_file({
-                                url: '/report/download',
-                                data: {data: JSON.stringify(response)},
-                                complete: openerp.web.unblockUI,
-                                error: c.rpc_error.bind(c)
-                            });
-                        }
-                    });
-                }
+                        });
+                    } else {
+                        self.session.get_file({
+                            url: '/report/download',
+                            data: {data: JSON.stringify(response)},
+                            complete: openerp.web.unblockUI,
+                            error: c.rpc_error.bind(c)
+                        });          
+                    }   
+                }                     
             } else {
                 return self._super(action, options);
             }
diff --git a/addons/report/tests/test_reports.py b/addons/report/tests/test_reports.py
index 361e0a7aa0f..dda14442709 100644
--- a/addons/report/tests/test_reports.py
+++ b/addons/report/tests/test_reports.py
@@ -1,26 +1,36 @@
 # -*- coding: utf-8 -*-
-import logging
 
+import logging
 import openerp
-import urllib2
+
 
 _logger = logging.getLogger(__name__)
 
-class TestReports(openerp.tests.HttpCase):
+
+@openerp.tests.common.at_install(False)
+@openerp.tests.common.post_install(True)
+class TestReports(openerp.tests.TransactionCase):
     def test_reports(self):
+        return  # commented out until post_install tests are working
+
         registry, cr, uid = self.registry, self.cr, self.uid
         r_model = registry('ir.actions.report.xml')
-        domain = [('report_type','like','qweb')]
+        domain = [('report_type', 'like', 'qweb')]
         for r in r_model.browse(cr, uid, r_model.search(cr, uid, domain)):
+            report_model = 'report.%s' % r.report_name
+            particular_model = registry('ir.model').search(cr, uid, [('model', '=', report_model)])
+
+            # Only test the generic reports here
+            if particular_model:
+                continue
+
+            _logger.info("testing report %s", r.report_name)
             report_model = registry(r.model)
             report_model_ids = report_model.search(cr, uid, [], limit=10)
             if not report_model_ids:
                 _logger.info("no record found skipping report %s", r.report_name)
-                continue
             if not r.multi:
                 report_model_ids = report_model_ids[:1]
-            url = "/report/%s/%s" % (r.report_name, ','.join(str(i) for i in report_model_ids))
-            _logger.info("testing report %s", url)
-            # TODO sle: uncomment this
-            #content = self.url_open(url)
 
+            # Test report generation
+            registry('report').get_html(cr, uid, report_model_ids, r.report_name)
diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml
index 73c5ce03244..588775fc41e 100644
--- a/addons/report/views/layouts.xml
+++ b/addons/report/views/layouts.xml
@@ -4,9 +4,7 @@
 <template id="html_container">
     &lt;!DOCTYPE html&gt;
     <html t-att-lang="lang and lang.replace('_', '-')"
-          t-att-data-website-id="website.id if editable else None"
           t-att-data-editable="'1' if editable else None"
-          t-att-data-translatable="'1' if translatable else None"
           t-att-data-view-xmlid="xmlid if editable else None"
           t-att-data-main-object="repr(main_object) if editable else None">
         <head>
diff --git a/addons/report/views/views.xml b/addons/report/views/views.xml
index c5d07f5287b..4c5f1b5092f 100644
--- a/addons/report/views/views.xml
+++ b/addons/report/views/views.xml
@@ -85,6 +85,7 @@
                             class="oe_link"
                             string="Search associated QWeb views"
                             name="associated_view"
+                            attrs="{'invisible':[('report_type', 'not in', ['qweb-pdf', 'qweb-html'])]}"
                         />
                     </xpath>
                 </data>
diff --git a/addons/report_webkit/default_header.html b/addons/report_webkit/default_header.html
index 0798209a5b7..37fd4135b62 100644
--- a/addons/report_webkit/default_header.html
+++ b/addons/report_webkit/default_header.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
     <head>
         <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 4f56d7efea7..60fb536ca96 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -112,6 +112,7 @@ def webkit_report_extender(report_name):
         return fct
     return fct1
 
+
 class WebKitParser(report_sxw):
     """Custom class that use webkit to render HTML reports
        Code partially taken from report openoffice. Thanks guys :)
@@ -173,7 +174,7 @@ class WebKitParser(report_sxw):
                                  ),
                                 'w'
                             )
-            head_file.write(header.encode('utf-8'))
+            head_file.write(self._sanitize_html(header.encode('utf-8')))
             head_file.close()
             file_to_del.append(head_file.name)
             command.extend(['--header-html', head_file.name])
@@ -184,7 +185,7 @@ class WebKitParser(report_sxw):
                                  ),
                                 'w'
                             )
-            foot_file.write(footer.encode('utf-8'))
+            foot_file.write(self._sanitize_html(footer.encode('utf-8')))
             foot_file.close()
             file_to_del.append(foot_file.name)
             command.extend(['--footer-html', foot_file.name])
@@ -205,7 +206,7 @@ class WebKitParser(report_sxw):
         for html in html_list :
             html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
             count += 1
-            html_file.write(html.encode('utf-8'))
+            html_file.write(self._sanitize_html(html.encode('utf-8')))
             html_file.close()
             file_to_del.append(html_file.name)
             command.append(html_file.name)
@@ -366,7 +367,6 @@ class WebKitParser(report_sxw):
         pdf = self.generate_pdf(bin, report_xml, head, foot, htmls)
         return (pdf, 'pdf')
 
-
     def create(self, cursor, uid, ids, data, context=None):
         """We override the create function in order to handle generator
            Code taken from report openoffice. Thanks guys :) """
@@ -387,11 +387,18 @@ class WebKitParser(report_sxw):
             report_xml.report_sxw = None
         else:
             return super(WebKitParser, self).create(cursor, uid, ids, data, context)
-        if report_xml.report_type != 'webkit' :
+        if report_xml.report_type != 'webkit':
             return super(WebKitParser, self).create(cursor, uid, ids, data, context)
         result = self.create_source_pdf(cursor, uid, ids, data, report_xml, context)
         if not result:
             return (False,False)
         return result
 
+    def _sanitize_html(self, html):
+        """wkhtmltopdf expects the html page to declare a doctype.
+        """
+        if html and html[:9].upper() != "<!DOCTYPE":
+            html = "<!DOCTYPE html>\n" + html
+        return html
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 3712feda20b..170259824f7 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -55,11 +55,12 @@ class sale_make_invoice(osv.osv_memory):
                 raise osv.except_osv(_('Warning!'), _("You shouldn't manually invoice the following sale order %s") % (sale_order.name))
 
         order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_invoice=data['invoice_date'])
-
-        for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context):
+        orders = order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context)
+        for o in orders:
             for i in o.invoice_ids:
                 newinv.append(i.id)
-
+        # Dummy call to workflow, will not create another invoice but bind the new invoice to the subflow
+        order_obj.signal_manual_invoice(cr, uid, [o.id for o in orders if o.order_policy == 'manual'])
         result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index 30200133f8e..702522478dd 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -38,9 +38,25 @@ class res_groups(osv.osv):
 class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
+
+    def _is_share(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for user in self.browse(cr, uid, ids, context=context):
+            res[user.id] = not self.has_group(cr, user.id, 'base.group_user')
+        return res
+
+    def _get_users_from_group(self, cr, uid, ids, context=None):
+        result = set()
+        for group in self.pool['res.groups'].browse(cr, uid, ids, context=context):
+            result.update(user.id for user in group.users)
+        return list(result)
+
     _columns = {
-        'share': fields.boolean('Share User', readonly=True,
-                    help="External user with limited access, created only for the purpose of sharing data.")
+        'share': fields.function(_is_share, string='Share User', type='boolean',
+            store={
+                'res.users': (lambda self, cr, uid, ids, c={}: ids, None, 50),
+                'res.groups': (_get_users_from_group, None, 50),
+            }, help="External user with limited access, created only for the purpose of sharing data."),
      }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/share/share_data.xml b/addons/share/share_data.xml
index aba154a6403..c64a9099721 100644
--- a/addons/share/share_data.xml
+++ b/addons/share/share_data.xml
@@ -3,7 +3,6 @@
     <data noupdate="1">
         <record id="base.public_user" model="res.users">
             <field eval="[(4, ref('group_share_user'))]" name="groups_id"/>
-            <field name="share" eval="True" />
         </record>
     </data>
 </openerp>
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 10937015dd6..551b08d02cf 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -258,7 +258,6 @@ class share_wizard(osv.TransientModel):
                         'name': new_user,
                         'email': new_user,
                         'groups_id': [(6,0,[group_id])],
-                        'share': True,
                         'company_id': current_user.company_id.id,
                         'company_ids': [(6, 0, [current_user.company_id.id])],
                 }, context)
@@ -276,7 +275,6 @@ class share_wizard(osv.TransientModel):
                 'password': new_pass,
                 'name': new_login,
                 'groups_id': [(6,0,[group_id])],
-                'share': True,
                 'company_id': current_user.company_id.id,
                 'company_ids': [(6, 0, [current_user.company_id.id])],
             }, context)
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 01ed6f2409a..cf4099ac3ba 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -33,6 +33,10 @@ class stock_change_product_qty(osv.osv_memory):
         'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
+    _defaults = {
+        'new_quantity': 1,
+        'product_id': lambda self, cr, uid, ctx: ctx and ctx.get('active_id', False) or False
+    }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if context is None: context = {}
@@ -54,20 +58,22 @@ class stock_change_product_qty(osv.osv_memory):
          @param context: A standard dictionary
          @return: A dictionary which of fields with values.
         """
-        product_id = context and context.get('active_id', False) or False
+
         res = super(stock_change_product_qty, self).default_get(cr, uid, fields, context=context)
 
-        if 'new_quantity' in fields:
-            res.update({'new_quantity': 1})
-        if 'product_id' in fields:
-            res.update({'product_id': product_id})
         if 'location_id' in fields:
-            try:
-                model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
-                self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
-            except (orm.except_orm, ValueError):
-                location_id = False
-            res.update({'location_id': location_id})
+            location_id = res.get('location_id', False)
+            if not location_id:
+                try:
+                    model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+                except (orm.except_orm, ValueError):
+                    pass
+            if location_id:
+                try:
+                    self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+                except (orm.except_orm, ValueError):
+                   pass
+            res['location_id'] = location_id
         return res
 
     def change_product_qty(self, cr, uid, ids, context=None):
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 5dc0d0d824c..f2bc40d9a3f 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -67,6 +67,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="context">{'form_view_ref': False}</field>
         </record>
 
         <record id="view_split_in_lots" model="ir.ui.view">
@@ -124,6 +125,7 @@
                 <field name="view_type">form</field>
                 <field name="view_mode">form</field>
                 <field name="target">new</field>
+                <field name="context">{'form_view_ref': False}</field>
             </record>
 
     </data>
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index b301525eb42..5f8a1d1338b 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -37,7 +37,7 @@ e.g. To have an invoice generated automatically periodically:
       above. Specify the interval information and partner to be invoice.
     """,
     'author': 'OpenERP SA',
-    'depends': [],
+    'depends': ['base'],
     'data': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
     'demo': ['subscription_demo.xml',],
     'installable': True,
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 44d3bec7f6e..e16d0d6ce77 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -128,23 +128,14 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
             for use in exist_user:
                 new_user.append(use.id)
         for id in survey_ref.browse(cr, uid, survey_ids):
-            report = self.create_report(cr, uid, [id.id], 'report.survey.form', id.title)
-            file = open(get_module_resource('survey', 'report') + id.title +".pdf")
-            file_data = ""
-            while 1:
-                line = file.readline()
-                file_data += line
-                if not line:
-                    break
-            file.close()
-            attachments[id.title +".pdf"] = file_data
-            os.remove(get_module_resource('survey', 'report') + id.title +".pdf")
+            result, format = openerp.report.render_report(cr, uid, [id.id], 'survey.form', {}, {})
+            attachments[id.title +".pdf"] = result
 
         for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
             if not partner.email:
                 skipped+= 1
                 continue
-            user = user_ref.search(cr, uid, [('login', "=", partner.email)])
+            user = user_ref.search(cr, uid, [('partner_id', "=", partner.id)])
             if user:
                 if user[0] not in new_user:
                     new_user.append(user[0])
@@ -185,6 +176,8 @@ Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'we
                 if ans:
                     res_data = {'name': partner.name or _('Unknown'),
                                 'login': partner.email,
+                                'email': partner.email,
+                                'partner_id': partner.id,
                                 'password': passwd,
                                 'address_id': partner.id,
                                 'groups_id': [[6, 0, [group_id]]],
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index aee0997e4b4..9872db219ec 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -296,7 +296,7 @@ class Website(openerp.addons.web.controllers.main.Home):
     #------------------------------------------------------
     # Helpers
     #------------------------------------------------------
-    @http.route(['/website/kanban/'], type='http', auth="public", methods=['POST'], website=True)
+    @http.route(['/website/kanban'], type='http', auth="public", methods=['POST'], website=True)
     def kanban(self, **post):
         return request.website.kanban_col(**post)
 
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index f173b3bee38..5459fe2ad8e 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -92,7 +92,12 @@ class ir_http(orm.AbstractModel):
             assert path is not None
         except Exception:
             return self._handle_exception(werkzeug.exceptions.NotFound())
-        if path != request.httprequest.path:
+
+        generated_path = werkzeug.url_unquote_plus(path)
+        current_path = werkzeug.url_unquote_plus(request.httprequest.path)
+        if generated_path != current_path:
+            if request.lang != request.website.default_lang_code:
+                path = '/' + request.lang + path
             return werkzeug.utils.redirect(path)
 
     def _serve_attachment(self):
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 64aad94c83e..ef60aefbeff 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -381,42 +381,8 @@ class RelativeDatetime(orm.AbstractModel):
 
 class Contact(orm.AbstractModel):
     _name = 'website.qweb.field.contact'
-    _inherit = ['website.qweb.field', 'website.qweb.field.many2one']
+    _inherit = ['ir.qweb.field.contact', 'website.qweb.field.many2one']
 
-    def from_html(self, cr, uid, model, column, element, context=None):
-        # FIXME: this behavior is really weird, what if the user wanted to edit the name of the related thingy? Should m2os really be editable without a widget?
-        divs = element.xpath(".//div")
-        for div in divs:
-            if div != divs[0]:
-                div.getparent().remove(div)
-        return super(Contact, self).from_html(cr, uid, model, column, element, context=context)
-
-    def record_to_html(self, cr, uid, field_name, record, column, options=None, context=None):
-        opf = options.get('fields') or ["name", "address", "phone", "mobile", "fax", "email"]
-
-        if not getattr(record, field_name):
-            return None
-
-        id = getattr(record, field_name).id
-        field_browse = self.pool[column._obj].browse(cr, openerp.SUPERUSER_ID, id, context={"show_address": True})
-        value = werkzeug.utils.escape( field_browse.name_get()[0][1] )
-
-        val = {
-            'name': value.split("\n")[0],
-            'address': werkzeug.utils.escape("\n".join(value.split("\n")[1:])),
-            'phone': field_browse.phone,
-            'mobile': field_browse.mobile,
-            'fax': field_browse.fax,
-            'city': field_browse.city,
-            'country_id': field_browse.country_id and field_browse.country_id.name_get()[0][1],
-            'email': field_browse.email,
-            'fields': opf,
-            'options': options
-        }
-
-        html = self.pool["ir.ui.view"].render(cr, uid, "website.contact", val, engine='website.qweb', context=context).decode('utf8')
-
-        return ir_qweb.HTMLSafe(html)
 
 def html_to_text(element):
     """ Converts HTML content with HTML-specified line breaks (br, p, div, ...)
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 857b99d40d2..67781cc02a0 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -168,20 +168,9 @@ class view(osv.osv):
         arch_no_whitespace = etree.fromstring(
             etree.tostring(arch, encoding='utf-8'),
             parser=etree.XMLParser(encoding='utf-8', remove_blank_text=True))
-        arch_pretty_indent_2 = etree.tostring(
+        return etree.tostring(
             arch_no_whitespace, encoding='unicode', pretty_print=True)
 
-        # pretty_print uses a fixed indent level of 2, we want an indent of 4,
-        # double up leading spaces.
-        def repl(m):
-            indent = len(m.group(0)) / 2
-            return u' ' * 4 * indent
-        # FIXME: If py2.7 only, can use re.M in sub and don't have to do replacement line by line
-        return u'\n'.join(
-            re.sub(ur'^((?:  )+)', repl, line)
-            for line in arch_pretty_indent_2.split(u'\n')
-        )
-
     def save(self, cr, uid, res_id, value, xpath=None, context=None):
         """ Update a view section. The view section may embed fields to write
 
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 64a2d7b255c..a516f5cb96f 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -249,7 +249,7 @@ class website(osv.osv):
             pmin = pmax - scope if pmax - scope > 0 else 1
 
         def get_url(page):
-            _url = "%spage/%s/" % (url, page) if page > 1 else url
+            _url = "%s/page/%s" % (url, page) if page > 1 else url
             if url_args:
                 _url = "%s?%s" % (_url, werkzeug.url_encode(url_args))
             return _url
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 24c97bce311..c965c5ef834 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1790,6 +1790,9 @@
                 if (node.nodeName === 'BR' && node.getAttribute('type') === '_moz') {
                     // <br type="_moz"> appears when focusing RTE in FF, ignore
                     continue;
+                } else if (node.nodeName === 'DIV' && $(node).hasClass('oe_drop_zone')) {
+                    // ignore dropzone inserted by snippets
+                    continue
                 }
             }
 
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index b475223ecd9..77a086790fa 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -48,7 +48,7 @@
                     }
                 }).then(function (val, field, $dialog) {
                     if (val) {
-                        var url = '/website/add/' + encodeURI(val);
+                        var url = '/website/add' + encodeURI(val);
                         if ($dialog.find('input[type="checkbox"]').is(':checked')) url +="?add_menu=1";
                         document.location = url;
                     }
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 065928df1cf..31e39b3bbc4 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -53,6 +53,7 @@
     /* ----------------------------------------------------
        Widgets
        ---------------------------------------------------- */ 
+
     website.prompt = function (options) {
         /**
          * A bootstrapped version of prompt() albeit asynchronous
@@ -198,7 +199,7 @@
                 var page = +$a.attr("href").split(",").pop().split('-')[1];
                 data['page'] = page;
 
-                $.post('/website/kanban/', data, function (col) {
+                $.post('/website/kanban', data, function (col) {
                     $col.find("> .thumbnail").remove();
                     $pagination.last().before(col);
                 });
diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/website.mobile.js
index 59c2328e09b..88a558f5094 100644
--- a/addons/website/static/src/js/website.mobile.js
+++ b/addons/website/static/src/js/website.mobile.js
@@ -18,9 +18,9 @@
         },
         start: function () {
             if (!window.location.origin) { // fix for ie9
-                window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '') + '/';
+                window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
             }
-            document.getElementById("mobile-viewport").src = window.location.origin + window.location.pathname + "#mobile-preview";
+            document.getElementById("mobile-viewport").src = window.location.origin + (window.location.pathname.length ? '/' : '') + window.location.pathname + "#mobile-preview";
             this.$el.modal();
         },
         destroy: function () {
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 1eee1fee65b..52deeabf5e6 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1,6 +1,136 @@
 (function () {
     'use strict';
 
+/*  Building block / Snippet Editor
+ 
+    The building blocks appear in the edit bar website. These prebuilt html block
+    allowing the designer to easily generate content on a page (drag and drop).
+    Options allow snippets to add customizations part html code according to their
+    selector (jQuery) and javascript object.
+    
+    How to create content?
+
+    Designers can add their own html block in the "snippets" (/website/views/snippets.xml).
+    The block must be added in one of four menus (structure, content, feature or effect).
+    Structure:
+        <div>
+            <div class="oe_snippet_thumbnail">
+                <img class="oe_snippet_thumbnail_img" src="...image src..."/>
+                <span class="oe_snippet_thumbnail_title">...Block Name...</span>
+            </div>
+            <div class="oe_snippet_body">
+                ...
+                <!-- 
+                    The block with class 'oe_snippet_body' is inserted in the page.
+                    This class is removed when the block is dropped.
+                    The block can be made of any html tag and content. -->
+            </div>
+        </div>
+
+    How to create options?
+
+    Designers can add their own html block in the "snippet_options" (/website/views/snippets.xml).
+    Structure:
+
+        <div data-snippet-option-id='...'           <!-- Required: javascript object id (but javascript
+                                                        for this option object is not required) -->
+            data-selector="..."                     <!-- Required: jQuery selector.
+                                                        Apply options on all The part of html who 
+                                                        match with this jQuery selector.
+                                                        E.g.: If the selector is div, all div will be selected
+                                                        and can be highlighted and assigned an editor.  -->
+            data-selector-siblings="..."            <!-- Optional: jQuery selector.
+                                                        The html part can be insert or move beside
+                                                        the selected html block -->
+            data-selector-children="..."            <!-- Optional: jQuery selector.
+                                                        The html part can be insert or move inside
+                                                        the selected html block -->
+            data-selector-vertical-children='...'>  <!-- Optional: jQuery selector.
+                                                        The html part can be insert or move inside
+                                                        the selected html block. The drop zone is
+                                                        displayed vertically -->
+                ...
+                <li><a href="#">...</a></li>        <!-- Optional: html li list.
+                                                        List of menu items displayed in customize
+                                                        menu. If the li tag have 'data-class', the
+                                                        class is automaticcally added or removed to
+                                                        the html content when the user select this item. -->
+                ...
+                <li class="dropdown-submenu"                <!-- Optional: html li list exemple. !-->
+                    data-required="true">                   <!-- Optional: if only one item can be selected
+                                                                and can't be unselect. !-->
+                    <a tabindex="-1" href="#">...</a>       <!-- bootstrap dropdown button !-->
+                    <ul class="dropdown-menu">
+                        <li data-value="text_only"><a>...</a></li>      <!-- by default data-value is apply
+                                                                            like a class to html block !-->
+                    </ul>
+                </li>
+        </div>
+
+        How to create a javascript object for an options?
+
+        openerp.website.snippet.options["...option-id..."] = website.snippet.Option.extend({
+            // start is called when the user click into a block or when the user drop a block 
+            // into the page (just after the init method).
+            // start is usually used to bind event.
+            //
+            // this.$target: block html inserted inside the page
+            // this.$el: html li list of this options
+            // this.$overlay: html editor overlay who content resize bar, customize menu...
+            start: function () {},
+
+
+            // onFocus is called when the user click inside the block inserted in page
+            // and when the user drop on block into the page
+            onFocus : function () {},
+
+
+            // onBlur is called when the user click outside the block inserted in page, if
+            // the block is focused
+            onBlur : function () {},
+
+
+            // on_clone is called when the snippet is duplicate
+            // @variables: $clone is allready inserted is the page
+            on_clone: function ($clone) {},
+
+
+            // on_remove is called when the snippet is removed (dom is removing after this tigger)
+            on_remove: function () {},
+
+
+            // drop_and_build_snippet is called just after that a thumbnail is drag and dropped
+            // into a drop zone. The content is already inserted in the page.
+            drop_and_build_snippet: function () {},
+
+            // select is called when a user select an item in the li list of options
+            // By default, if the li item have a data-value attribute, the data-vlue it's apply
+            // like a class to the html block (this.$target)
+            // @variables: next_previous = {$next, $prev}
+            //      $next = next item selected or false
+            //      $prev = previous item selected or false
+            select: function (event, next_previous) {}
+
+            // preview is called when a user is on mouse over or mouse out of an item
+            // variables: next_previous = {$next, $prev}
+            //      $next = next item selected or false
+            //      $prev = previous item selected or false
+            preview: function (event, next_previous) {}
+
+            // clean_for_save
+            // clean_for_save is called just before to save the vue
+            // Sometime it's important to remove or add some datas (contentEditable, added 
+            // classes to a running animation...)
+            clean_for_save: function () {}
+        });
+
+
+    // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
+    // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
+
+*/
+
+
     var website = openerp.website;
     website.add_template_file('/website/static/src/xml/website.snippets.xml');
 
@@ -19,23 +149,11 @@
         edit: function () {
             var self = this;
             $("[data-oe-model] *, [data-oe-type=html] *").off('click');
-            website.snippet.stop_animation();
             window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
             this.snippets.appendTo(this.$el);
             this.on('rte:ready', this, function () {
                 self.snippets.$button.removeClass("hidden");
-                website.snippet.start_animation();
-                $(website.snippet.readyAnimation).each(function() {
-                    var animation = $(this).data("snippet-view");
-                    if (animation) {
-                        animation.$target.on('focus', '*', function(){
-                            animation.stop();
-                        });
-                        animation.$target.on('blur', '*', function(){
-                            animation.start();
-                        });
-                    }
-                });
+                  website.snippet.stop_animation();
             });
 
             return this._super.apply(this, arguments);
@@ -56,9 +174,6 @@
         }
     });
 
-    // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
-    // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
-
     if (!website.snippet) website.snippet = {};
     website.snippet.templateOptions = {};
     website.snippet.globalSelector = "";
@@ -397,18 +512,17 @@
                             $("#oe_snippets").trigger('snippet-dropped', $target);
 
                             website.snippet.start_animation(true, $target);
-
                             // drop_and_build_snippet
                             self.create_overlay($target);
                             if ($target.data("snippet-editor")) {
-                                $target.data("snippet-editor").drop_and_build_snippet($target);
+                                $target.data("snippet-editor").drop_and_build_snippet();
                             }
                             for (var k in website.snippet.templateOptions) {
                                 $target.find(website.snippet.templateOptions[k].selector).each(function () {
                                     var $snippet = $(this);
                                     self.create_overlay($snippet);
                                     if ($snippet.data("snippet-editor")) {
-                                        $snippet.data("snippet-editor").drop_and_build_snippet($snippet);
+                                        $snippet.data("snippet-editor").drop_and_build_snippet();
                                     }
                                 });
                             }
@@ -665,80 +779,12 @@
                     self.set_active();
                     self.$target.trigger("snippet-style-change", [self, np]);
                 },0);
-                this.select(event, {'$next': $next, '$prev': $prev});
+                this.select({'$next': $next, '$prev': $prev});
             } else {
                 setTimeout(function () {
                     self.$target.trigger("snippet-style-preview", [self, np]);
                 },0);
-                this.preview(event, np);
-            }
-        },
-        // start is call just after the init
-        start: function () {
-        },
-        /* onFocus
-        *  This method is called when the user click inside the snippet in the dom
-        */
-        onFocus : function () {
-        },
-
-        /* onFocus
-        *  This method is called when the user click outside the snippet in the dom, after a focus
-        */
-        onBlur : function () {
-        },
-
-        /* on_clone
-        *  This method is called when the snippet is cloned ($clone is allready inserted)
-        */
-        on_clone: function ($clone) {
-        },
-
-        /* on_remove
-        *  This method is called when the snippet is removed (dom is removing after this call)
-        */
-        on_remove: function () {
-        },
-
-        /*
-        *  drop_and_build_snippet
-        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
-        *  (after the insertion of this.$body, if this.$body exists)
-        */
-        drop_and_build_snippet: function ($target) {
-        },
-        /* select
-        *  called when a user select an item
-        *  li must have data-value attribute
-        *  variables: np = {$next, $prev}
-        *       $next is false if they are no next item selected
-        *       $prev is false if they are no previous item selected
-        */
-        select: function (event, np) {
-            var self = this;
-            // add or remove html class
-            if (np.$prev) {
-                this.$target.removeClass(np.$prev.data('value' || ""));
-            }
-            if (np.$next) {
-                this.$target.addClass(np.$next.data('value') || "");
-            }
-        },
-        /* preview
-        *  called when a user is on mouse over or mouse out of an item
-        *  variables: np = {$next, $prev}
-        *       $next is false if they are no next item selected
-        *       $prev is false if they are no previous item selected
-        */
-        preview: function (event, np) {
-            var self = this;
-
-            // add or remove html class
-            if (np.$prev) {
-                this.$target.removeClass(np.$prev.data('value') || "");
-            }
-            if (np.$next) {
-                this.$target.addClass(np.$next.data('value') || "");
+                this.preview(np);
             }
         },
         /* set_active
@@ -757,9 +803,48 @@
                 .addClass("active");
             this.$el.find('li:has(li[data-value].active)').addClass("active");
         },
-        /* clean_for_save
-        *  function called just before save vue
-        */
+
+        start: function () {
+        },
+
+        onFocus : function () {
+        },
+
+        onBlur : function () {
+        },
+
+        on_clone: function ($clone) {
+        },
+
+        on_remove: function () {
+        },
+
+        drop_and_build_snippet: function () {
+        },
+
+        select: function (np) {
+            var self = this;
+            // add or remove html class
+            if (np.$prev && this.required) {
+                this.$target.removeClass(np.$prev.data('value' || ""));
+            }
+            if (np.$next) {
+                this.$target.addClass(np.$next.data('value') || "");
+            }
+        },
+
+        preview: function (np) {
+            var self = this;
+
+            // add or remove html class
+            if (np.$prev && this.required) {
+                this.$target.removeClass(np.$prev.data('value') || "");
+            }
+            if (np.$next) {
+                this.$target.addClass(np.$next.data('value') || "");
+            }
+        },
+
         clean_for_save: function () {
         }
     });
@@ -776,9 +861,9 @@
             var src = this._get_bg();
             this.$el.find("li[data-value].active.oe_custom_bg").data("src", src);
         },
-        select: function(event, np) {
+        select: function(np) {
             var self = this;
-            this._super(event, np);
+            this._super(np);
             if (np.$next) {
                 if (np.$next.hasClass("oe_custom_bg")) {
                     var editor = new website.editor.ImageDialog();
@@ -803,8 +888,8 @@
                 this.$target.removeClass(np.$prev.data("value"));
             }
         },
-        preview: function (event, np) {
-            this._super(event, np);
+        preview: function (np) {
+            this._super(np);
             if (np.$next) {
                 this._set_bg(np.$next.data("src"));
             }
@@ -872,6 +957,7 @@
         start : function () {
             var self = this;
             this._super();
+            this.$target.carousel({interval: false});
             this.id = this.$target.attr("id");
             this.$inner = this.$target.find('.carousel-inner');
             this.$indicators = this.$target.find('.carousel-indicators');
@@ -1539,9 +1625,9 @@
         *  This method is called just after that a thumbnail is drag and dropped into a drop zone
         *  (after the insertion of this.$body, if this.$body exists)
         */
-        drop_and_build_snippet: function ($target) {
+        drop_and_build_snippet: function () {
             for (var i in this.styles){
-                this.styles[i].drop_and_build_snippet($target);
+                this.styles[i].drop_and_build_snippet();
             }
         },
 
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 61b8f851339..b7e55fe166b 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -1,11 +1,30 @@
 (function () {
     'use strict';
 
-var website = openerp.website;
+// raise an error in test mode if openerp don't exist
+if (typeof openerp === "undefined") {
+    var error = "openerp is undefined"
+                + "\nhref: " + window.location.href
+                + "\nreferrer: " + document.referrer
+                + "\nlocalStorage: " + JSON.stringify(window.localStorage);
+    if (typeof $ !== "undefined") {
+        error += '\n\n' + $("body").html();
+    }
+    throw new Error(error);
+}
+
+var website = window.openerp.website;
+
+// don't rewrite website.Tour in test mode
+if (typeof website.Tour !== "undefined") {
+    return;
+}
 
 // don't need template to use bootstrap Tour in automatic mode
-if (typeof QWeb2 !== "undefined")
-website.add_template_file('/website/static/src/xml/website.tour.xml');
+if (typeof QWeb2 !== "undefined") {
+    website.add_template_file('/website/static/src/xml/website.tour.xml');
+
+}
 
 // don't need to use bootstrap Tour to launch an automatic tour
 function bootstrap_tour_stub () {
@@ -19,27 +38,28 @@ function bootstrap_tour_stub () {
 
 
 
-if (website.EditorBar)
-website.EditorBar.include({
-    tours: [],
-    start: function () {
-        var self = this;
-        var menu = $('#help-menu');
-        _.each(this.tours, function (tour) {
-            var $menuItem = $($.parseHTML('<li><a href="#">'+tour.name+'</a></li>'));
-            $menuItem.click(function () {
-                tour.reset();
-                tour.run();
+if (website.EditorBar) {
+    website.EditorBar.include({
+        tours: [],
+        start: function () {
+            var self = this;
+            var menu = $('#help-menu');
+            _.each(this.tours, function (tour) {
+                var $menuItem = $($.parseHTML('<li><a href="#">'+tour.name+'</a></li>'));
+                $menuItem.click(function () {
+                    tour.reset();
+                    tour.run();
+                });
+                menu.append($menuItem);
             });
-            menu.append($menuItem);
-        });
-        return this._super();
-    },
-    registerTour: function (tour) {
-        website.Tour.add(tour);
-        this.tours.push(tour);
-    }
-});
+            return this._super();
+        },
+        registerTour: function (tour) {
+            website.Tour.add(tour);
+            this.tours.push(tour);
+        }
+    });
+}
 
 
 /////////////////////////////////////////////////
@@ -308,7 +328,8 @@ website.Tour = openerp.Class.extend({
                 self.timer = setTimeout(checkNext, self.defaultDelay);
             } else {
                 self.reset();
-                throw new Error("Time overlaps to arrive to step " + step.stepId + ": '" + step._title + "'"
+                throw new Error("Can't arrive to step " + step.stepId + ": '" + step._title + "'"
+                    + '\nhref: ' + window.location.href
                     + '\nelement: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden")))
                     + '\nwaitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size())
                     + '\nwaitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size())
@@ -363,12 +384,13 @@ website.Tour = openerp.Class.extend({
         }
     },
     endTour: function () {
-        if (parseInt(this.localStorage.getItem("tour-"+this.id+"-test"),10) >= this.steps.length-1) {
+        var test = parseInt(this.localStorage.getItem("tour-"+this.id+"-test"),10) >= this.steps.length-1;
+        this.reset();
+        if (test) {
             console.log('ok');
         } else {
             console.log('error');
         }
-        this.reset();
     },
     autoNextStep: function () {
         var self = this;
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 55bd7679b66..eb1f8c988d7 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -923,7 +923,7 @@
     </div>
 
     <div data-snippet-option-id='carousel-style'
-        data-selector="div[data-snippet-id='carousel']">
+        data-selector=".carousel:not(.quotecarousel)">
         <li class="dropdown-submenu" data-required="true">
             <a tabindex="-1" href="#">Layout</a>
             <ul class="dropdown-menu">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 4b4cca1a19a..3df96cb65f2 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -289,8 +289,7 @@
 
 <template id="debugger" inherit_option_id="website.layout" name="Debugger &amp; Tests">
     <xpath expr='//t[@name="layout_head"]' position="after">
-        <script type="text/javascript" src="/website/static/src/js/website.tour.test.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.tour.test.admin.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
     </xpath>
 </template>
 
@@ -760,23 +759,5 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
     </t>
 </template>
 
-<template id="contact">
-    <address t-ignore="true" class="mb0" itemscope="itemscope" itemtype="http://schema.org/Organization">
-        <div t-att-class="'name' not in fields and 'css_non_editable_mode_hidden'"><span itemprop="name" t-esc="name"/></div>
-        <div itemprop="address" itemscope="itemscope" itemtype="http://schema.org/PostalAddress">
-            <div t-if="address and 'address' in fields" class='css_editable_mode_hidden'>
-                <i t-if="not options.get('no_marker')" class='fa fa-map-marker'/> <span itemprop="streetAddress" t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or ('&lt;br/&gt;%s' % ('' if options.get('no_marker') else '&amp;nbsp; &amp;nbsp; ')))"/>
-            </div>
-            <div t-if="city and 'city' in fields" class='css_editable_mode_hidden'>
-                <i t-if="not options.get('no_marker')" class='fa fa-map-marker'/> <span itemprop="addressLocality" t-raw="city"/>, <span itemprop="addressCountry" t-raw="country_id"/>
-            </div>
-            <div t-if="phone and 'phone' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-phone'/> <span itemprop="telephone" t-esc="phone"/></div>
-            <div t-if="mobile and 'mobile' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-mobile-phone'/> <span itemprop="telephone" t-esc="mobile"/></div>
-            <div t-if="fax and 'fax' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-file-text-o'/> <span itemprop="faxNumber" t-esc="fax"/></div>
-            <div t-if="email and 'email' in fields" class='css_editable_mode_hidden'><i t-if="not options.get('no_marker')" class='fa fa-envelope'/> <span itemprop="email" t-esc="email"/></div>
-        </div>
-    </address>
-</template>
-
      </data>
 </openerp>
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index 2e1477e8f2d..a1b4d9d5035 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -42,7 +42,7 @@ class WebsiteBlog(http.Controller):
 
     @http.route([
         '/blog',
-        '/blog/page/<int:page>/',
+        '/blog/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
     def blogs(self, page=1):
         BYPAGE = 60
@@ -50,7 +50,7 @@ class WebsiteBlog(http.Controller):
         blog_obj = request.registry['blog.post']
         total = blog_obj.search(cr, uid, [], count=True, context=context)
         pager = request.website.pager(
-            url='/blog/',
+            url='/blog',
             total=total,
             page=page,
             step=BYPAGE,
@@ -63,14 +63,14 @@ class WebsiteBlog(http.Controller):
         })
 
     @http.route([
-        '/blog/<model("blog.blog"):blog>/',
-        '/blog/<model("blog.blog"):blog>/page/<int:page>/',
-        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/',
-        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/page/<int:page>/',
-        '/blog/<model("blog.blog"):blog>/date/<string(length=21):date>/',
-        '/blog/<model("blog.blog"):blog>/date/<string(length=21):date>/page/<int:page>/',
-        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/date/<string(length=21):date>/',
-        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/date/<string(length=21):date>/page/<int:page>/',
+        '/blog/<model("blog.blog"):blog>',
+        '/blog/<model("blog.blog"):blog>/page/<int:page>',
+        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>',
+        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/page/<int:page>',
+        '/blog/<model("blog.blog"):blog>/date/<string(length=21):date>',
+        '/blog/<model("blog.blog"):blog>/date/<string(length=21):date>/page/<int:page>',
+        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/date/<string(length=21):date>',
+        '/blog/<model("blog.blog"):blog>/tag/<model("blog.tag"):tag>/date/<string(length=21):date>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
     def blog(self, blog=None, tag=None, date=None, page=1, **opt):
         """ Prepare all values to display the blog.
@@ -106,13 +106,13 @@ class WebsiteBlog(http.Controller):
         domain = []
 
         if blog:
-            path_filter += "%s/" % blog.id
+            path_filter += "%s" % blog.id
             domain += [("id", "in", [post.id for post in blog.blog_post_ids])]
         if tag:
-            path_filter += 'tag/%s/' % tag.id
+            path_filter += 'tag/%s' % tag.id
             domain += [("id", "in", [post.id for post in tag.blog_post_ids])]
         if date:
-            path_filter += "date/%s/" % date
+            path_filter += "date/%s" % date
             domain += [("create_date", ">=", date.split("_")[0]), ("create_date", "<=", date.split("_")[1])]
 
         blog_post_ids = blog_post_obj.search(cr, uid, domain, context=context)
@@ -147,7 +147,7 @@ class WebsiteBlog(http.Controller):
         return request.website.render("website_blog.blog_post_short", values)
 
     @http.route([
-        '/blogpost/<model("blog.post"):blog_post>/',
+        '/blogpost/<model("blog.post"):blog_post>',
     ], type='http', auth="public", website=True, multilang=True)
     def blog_post(self, blog_post, tag=None, date=None, page=1, enable_editor=None, **post):
         """ Prepare all values to display the blog.
@@ -245,7 +245,7 @@ class WebsiteBlog(http.Controller):
                 'content': '',
                 'website_published': False,
             }, context=create_context)
-        return werkzeug.utils.redirect("/blogpost/%s/?enable_editor=1" % new_blog_post_id)
+        return werkzeug.utils.redirect("/blogpost/%s?enable_editor=1" % new_blog_post_id)
 
     @http.route('/blogpost/duplicate', type='http', auth="public", website=True)
     def blog_post_copy(self, blog_post_id, **post):
@@ -258,4 +258,4 @@ class WebsiteBlog(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         create_context = dict(context, mail_create_nosubscribe=True)
         new_blog_post_id = request.registry['blog.post'].copy(cr, uid, blog_post_id, {}, context=create_context)
-        return werkzeug.utils.redirect("/blogpost/%s/?enable_editor=1" % new_blog_post_id)
+        return werkzeug.utils.redirect("/blogpost/%s?enable_editor=1" % new_blog_post_id)
diff --git a/addons/website_blog/static/description/index.html b/addons/website_blog/static/description/index.html
index 3f44eea9b4d..1f198c11678 100644
--- a/addons/website_blog/static/description/index.html
+++ b/addons/website_blog/static/description/index.html
@@ -1,7 +1,7 @@
 <section class="oe_container">
     <div class="oe_row oe_spaced">
         <div class="oe_span12">
-            <h2 class="oe_slogan">Awesome Open Source Blogging Plateform</h2>
+            <h2 class="oe_slogan">Awesome Open Source Blogging Platform</h2>
             <h3 class="oe_slogan">Write, Design, Promote, Engage</h3>
         </div>
         <div class="oe_span6">
@@ -15,7 +15,7 @@
         <div class="oe_span6">
             <p class='oe_mt32'>
 				Express yourself with the OpenERP enterprise grade blogging
-				plateform. Write beautiful blog posts, engage with visitors,
+				platform. Write beautiful blog posts, engage with visitors,
 				translate content and moderate social streams.
             </p><p>
 				Get your blog posts efficiently referenced in Google and
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 179b1b49ff0..dc976614a24 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -12,7 +12,7 @@
 <!-- Layout add nav and footer -->
 <template id="header_footer_custom" inherit_id="website.layout" name="Footer News Blog Link">
     <xpath expr="//footer//div[@name='info']/ul" position="inside">
-        <li><a t-attf-href="/blog/%(website_blog.blog_blog_1)d/">News</a></li>
+        <li><a t-attf-href="/blog/%(website_blog.blog_blog_1)d">News</a></li>
     </xpath>
 </template>
 
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index fbfb1908a14..6d6dda59a99 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -13,21 +13,21 @@ class WebsiteCrmPartnerAssign(http.Controller):
     _references_per_page = 20
 
     @http.route([
-        '/partners/',
-        '/partners/page/<int:page>/',
+        '/partners',
+        '/partners/page/<int:page>',
 
         '/partners/grade/<int:grade_id>',
-        '/partners/grade/<int:grade_id>/page/<int:page>/',
+        '/partners/grade/<int:grade_id>/page/<int:page>',
 
         '/partners/country/<int:country_id>',
         '/partners/country/<country_name>-<int:country_id>',
-        '/partners/country/<int:country_id>/page/<int:page>/',
-        '/partners/country/<country_name>-<int:country_id>/page/<int:page>/',
+        '/partners/country/<int:country_id>/page/<int:page>',
+        '/partners/country/<country_name>-<int:country_id>/page/<int:page>',
         
-        '/partners/grade/<int:grade_id>/country/<int:country_id>/',
+        '/partners/grade/<int:grade_id>/country/<int:country_id>',
         '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>',
-        '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>/',
-        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>/',
+        '/partners/grade/<int:grade_id>/country/<int:country_id>/page/<int:page>',
+        '/partners/grade/<int:grade_id>/country/<country_name>-<int:country_id>/page/<int:page>',
         
     ], type='http', auth="public", website=True, multilang=True)
     def partners(self, country_id=0, grade_id=0, page=0, **post):
@@ -72,7 +72,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         partner_ids = partner_obj.search(
             request.cr, openerp.SUPERUSER_ID, partner_domain,
             context=request.context)
-        pager = request.website.pager(url="/partners/", total=len(partner_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
+        pager = request.website.pager(url="/partners", total=len(partner_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
 
         # search for partners to display
         partners_data = partner_obj.search_read(request.cr, openerp.SUPERUSER_ID,
@@ -110,7 +110,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
         }
         return request.website.render("website_crm_partner_assign.index", values)
 
-    @http.route(['/partners/<int:partner_id>/', '/partners/<partner_name>-<int:partner_id>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
     def partners_ref(self, partner_id, **post):
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
         values = website_partner.get_partner_template_value(partner)
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index cd2e3cb58bd..56ac22d1eee 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -5,7 +5,7 @@
 <!-- Layout add nav and footer -->
 <template id="footer_custom" inherit_id="website.layout" name="Footer Partners Link">
     <xpath expr="//footer//div[@name='info']/ul" position="inside">
-        <li><a href="/partners/">Resellers</a></li>
+        <li><a href="/partners">Resellers</a></li>
     </xpath>
 </template>
 
@@ -55,7 +55,7 @@
                     <t t-foreach="countries" t-as="country_dict">
                         <t t-if="country_dict['country_id']">
                             <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                                <a t-attf-href="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners/' }#{ search_path }">
+                                <a t-attf-href="#{ country_dict['country_id'][0] and ('/partners/country/%s' % slug(country_dict['country_id'])) or '/partners' }#{ search_path }">
                                     <span class="badge pull-right" t-esc="country_dict['country_id_count'] or ''"/>
                                     <t t-esc="country_dict['country_id'][1]"/> 
                                 </a>
@@ -93,11 +93,11 @@
                             <t t-set="internal_gid" t-value="partner_data['grade_id'][1]"/>
                         </t>
                         <div class="media">
-                            <a class="pull-left" t-attf-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                            <a class="pull-left" t-attf-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                                 <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data['image_small']}"/>
                             </a>
                             <div class="media-body" style="min-height: 64px;">
-                                <a class="media-heading" t-attf-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"><t t-if="partner_data['parent_id']"><span t-esc="partner_data['parent_id'][1]"/></t> <span t-esc="partner_data['name']"/></a> - <span t-esc="partner_data['grade_id'][1]"/>
+                                <a class="media-heading" t-attf-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }"><t t-if="partner_data['parent_id']"><span t-esc="partner_data['parent_id'][1]"/></t> <span t-esc="partner_data['name']"/></a> - <span t-esc="partner_data['grade_id'][1]"/>
                                 <div t-esc="partner_data['website_short_description']"/>
                             </div>
                         </div>
@@ -112,7 +112,7 @@
     <xpath expr="//ul[@id='reseller_countries']" position="after">
         <h3>World Map</h3>
         <ul class="nav">
-            <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
+            <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners"
                 style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
         </ul>
     </xpath>
diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py
index 173b0871dbe..5f0825e132c 100644
--- a/addons/website_customer/controllers/main.py
+++ b/addons/website_customer/controllers/main.py
@@ -12,12 +12,12 @@ class WebsiteCustomer(http.Controller):
     _references_per_page = 20
 
     @http.route([
-        '/customers/',
-        '/customers/page/<int:page>/',
+        '/customers',
+        '/customers/page/<int:page>',
         '/customers/country/<int:country_id>',
         '/customers/country/<country_name>-<int:country_id>',
-        '/customers/country/<int:country_id>/page/<int:page>/',
-        '/customers/country/<country_name>-<int:country_id>/page/<int:page>/',
+        '/customers/country/<int:country_id>/page/<int:page>',
+        '/customers/country/<country_name>-<int:country_id>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
     def customers(self, country_id=0, page=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
@@ -62,7 +62,7 @@ class WebsiteCustomer(http.Controller):
 
         # pager
         pager = request.website.pager(
-            url="/customers/", total=len(partner_ids), page=page, step=self._references_per_page,
+            url="/customers", total=len(partner_ids), page=page, step=self._references_per_page,
             scope=7, url_args=post
         )
 
@@ -83,7 +83,7 @@ class WebsiteCustomer(http.Controller):
         }
         return request.website.render("website_customer.index", values)
 
-    @http.route(['/customers/<int:partner_id>/', '/customers/<partner_name>-<int:partner_id>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/customers/<int:partner_id>', '/customers/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
     def customer(self, partner_id, **post):
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
         values = website_partner.get_partner_template_value(partner)
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index ad924cba55d..ba89f456e23 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -5,7 +5,7 @@
 <!-- Layout add nav and footer -->
 <template id="footer_custom" inherit_id="website.layout" name="Footer Customer References Link">
     <xpath expr="//footer//div[@name='info']/ul" position="inside">
-        <li><a href="/customers/">Our References</a></li>
+        <li><a href="/customers">Our References</a></li>
     </xpath>
 </template>
 
@@ -44,11 +44,11 @@
                             </t>
                             <t t-foreach="partners_data" t-as="partner_data" class="media">
                                 <div class="media">
-                                    <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                                    <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                                         <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
                                     </a>
                                     <div class="media-body" style="min-height: 64px;">
-                                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/" t-esc="partner_data.get('name')"/>
+                                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }" t-esc="partner_data.get('name')"/>
                                         <div t-raw="partner_data.get('website_short_description') or ''"/>
                                     </div>
                                 </div>
@@ -68,7 +68,7 @@
 <template id="opt_country" inherit_option_id="website_customer.index" name="Show Map">
     <xpath expr="//div[@id='ref_left_column']" position="inside">
 
-        <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed/"
+        <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed"
             style="width:100%; border:0; padding:0; margin:0;"></iframe>
     </xpath>
 </template>
@@ -80,7 +80,7 @@
             <t t-foreach="countries" t-as="country_dict">
                 <t t-if="country_dict['country_id']">
                     <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                        <a t-attf-href="/customers/#{ country_dict['country_id'][0] and 'country/%s/' % slug(country_dict['country_id']) or '' }#{ search_path }">
+                        <a t-attf-href="/customers/#{ country_dict['country_id'][0] and 'country/%s' % slug(country_dict['country_id']) or '' }#{ search_path }">
                             <span class="badge pull-right" t-esc="country_dict['country_id_count'] or '0'"/>
                             <t t-esc="country_dict['country_id'][1]"/>
                         </a>
@@ -143,7 +143,7 @@
                         </div>
                     </address>
                     <div>
-                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/#references/" t-if="implemented_partner_ids">
+                        <a t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/#references" t-if="implemented_partner_ids">
                             <t t-esc="len(implemented_partner_ids)"/> references
                         </a>
                     </div>
@@ -158,11 +158,11 @@
         <t t-if="implemented_partners_data">
             <h3 id="references">References</h3>
             <div t-foreach="implemented_partners_data" t-as="partner_data" class="media">
-                <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                <a class="pull-left" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                     <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
                 </a>
                 <div class="media-body" style="min-height: 64px;">
-                    <a class="media-heading" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                    <a class="media-heading" t-attf-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                         <t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/>
                     </a>
                     <div t-if="partner_data.get('website_short_description')" t-raw="partner_data.get('website_short_description')"/>
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index eb38e2dbe55..dad603f47ef 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -33,7 +33,7 @@ from openerp import tools
 import werkzeug.urls
 
 class website_event(http.Controller):
-    @http.route(['/event/', '/event/page/<int:page>'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event', '/event/page/<int:page>'], type='http', auth="public", website=True, multilang=True)
     def events(self, page=1, **searches):
         cr, uid, context = request.cr, request.uid, request.context
         event_obj = request.registry['event.event']
@@ -134,7 +134,7 @@ class website_event(http.Controller):
         event_count = event_obj.search(
             request.cr, request.uid, dom_without("none"), count=True,
             context=request.context)
-        pager = request.website.pager(url="/event/", total=event_count, page=page, step=step, scope=5)
+        pager = request.website.pager(url="/event", total=event_count, page=page, step=step, scope=5)
 
         order = 'website_published desc, date_begin'
         if searches.get('date','all') == 'old':
@@ -202,4 +202,4 @@ class website_event(http.Controller):
             'date_end': (date_begin + timedelta(days=(1))).strftime('%Y-%m-%d'),
         }
         event_id = Event.create(request.cr, request.uid, vals, context=context)
-        return request.redirect("/event/%s/?enable_editor=1" % event_id)
+        return request.redirect("/event/%s?enable_editor=1" % event_id)
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 20d3499cf4a..3d019ba7417 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -50,7 +50,7 @@
                         <li t-foreach="event_ids" t-as="event" class="media">
                             <div itemscope="itemscope" itemtype="http://schema.org/Event" class="media-body">
                                 <h4 class="media-heading">
-                                    <a itemprop="url" t-att-class="event.state == 'done' and 'text-success'" t-attf-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register/' or ''}"><span itemprop="name" t-field="event.name"> </span></a>
+                                    <a itemprop="url" t-att-class="event.state == 'done' and 'text-success'" t-attf-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register' or ''}"><span itemprop="name" t-field="event.name"> </span></a>
                                     <small t-if="not event.website_published" class="label label-danger">not published</small>
                                 </h4>
                                 <div>
@@ -248,7 +248,7 @@
                 <div class="container">
                     <h1 class="mt32">Event not found!</h1>
                     <p>Sorry, the requested event is not available anymore.</p>
-                    <p><a t-attf-href="/event/">Return to the event list.</a></p>
+                    <p><a t-attf-href="/event">Return to the event list.</a></p>
                 </div>
             </div>
         </div>
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index cc9ddc0ad56..2db874cf5b7 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -78,7 +78,7 @@ class website_event(website_event):
             order_obj.write(request.cr, SUPERUSER_ID, [order.id], {'order_line': [(4, order_line_id)]}, context=request.context)
 
         if not _values:
-            return request.redirect("/event/%s/" % event_id)
+            return request.redirect("/event/%s" % event_id)
         return request.redirect("/shop/checkout")
 
     def _add_event(self, event_name="New Event", context={}, **kwargs):
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
index 3c74cc2317e..48b9b62b349 100644
--- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -7,7 +7,6 @@
         id: 'event_buy_tickets',
         name: "Try to buy tickets for event",
         path: '/event',
-        testPath: '/(event|shop)',
         init: function () {
             var self = this;
             self.steps = [
@@ -44,7 +43,7 @@
                 {
                     title:     "Complete checkout",
                     waitFor:   '#top_menu .my_cart_quantity:contains(5)',
-                    element:   'form[action="/shop/confirm_order/"] .btn:contains("Confirm")',
+                    element:   'form[action="/shop/confirm_order"] .btn:contains("Confirm")',
                     onload: function (tour) {
                         if ($("input[name='name']").val() === "")
                             $("input[name='name']").val("website_sale-test-shoptest");
diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index 6405bbd4cbf..b5950aaec54 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -5,13 +5,15 @@ inject = [
     "./../../../website_event_sale/static/src/js/website.tour.event_sale.js",
 ]
 
+@openerp.tests.common.at_install(False)
+@openerp.tests.common.post_install(True)
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('banner')", "openerp.website.Tour")
+        self.phantom_js("/", "openerp.website.Tour.run_test('event_buy_tickets')", "openerp.website.Tour", inject=inject)
 
     def test_demo(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", login="demo", password="demo", inject=inject);
+        self.phantom_js("/", "openerp.website.Tour.run_test('event_buy_tickets')", "openerp.website.Tour", login="demo", password="demo", inject=inject);
 
     def test_public(self):
-        self.phantom_js("/", "openerp.website.Tour.run_test('login_edit')", "openerp.website.Tour", login=None, inject=inject);
+        self.phantom_js("/", "openerp.website.Tour.run_test('event_buy_tickets')", "openerp.website.Tour", login=None, inject=inject);
 
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py
index d4b7177814d..466e3d37a40 100644
--- a/addons/website_event_track/controllers/event.py
+++ b/addons/website_event_track/controllers/event.py
@@ -38,7 +38,7 @@ class website_event(http.Controller):
         return request.website.render("website_event_track.track_view", values)
 
     # TODO: not implemented
-    @http.route(['/event/<model("event.event"):event>/agenda/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/agenda'], type='http', auth="public", website=True, multilang=True)
     def event_agenda(self, event, tag=None, **post):
         values = {
             'event': event,
@@ -47,7 +47,7 @@ class website_event(http.Controller):
         return request.website.render("website_event_track.agenda", values)
 
     @http.route([
-        '/event/<model("event.event"):event>/track/',
+        '/event/<model("event.event"):event>/track',
         '/event/<model("event.event"):event>/track/tag/<model("event.track.tag"):tag>'
         ], type='http', auth="public", website=True, multilang=True)
     def event_tracks(self, event, tag=None, **post):
@@ -74,7 +74,7 @@ class website_event(http.Controller):
         }
         return request.website.render("website_event_track.tracks", values)
 
-    @http.route(['/event/<model("event.event"):event>/track_proposal/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/event/<model("event.event"):event>/track_proposal'], type='http', auth="public", website=True, multilang=True)
     def event_track_proposal(self, event, **post):
         values = { 'event': event }
         return request.website.render("website_event_track.event_track_proposal", values)
diff --git a/addons/website_event_track/models/event.py b/addons/website_event_track/models/event.py
index cfba63cfc6b..bb7c8db17d9 100644
--- a/addons/website_event_track/models/event.py
+++ b/addons/website_event_track/models/event.py
@@ -142,12 +142,12 @@ class event_event(osv.osv):
         context = context or {}
         result = super(event_event, self)._get_new_menu_pages(cr, uid, event, context=context)
         if event.show_tracks:
-            result.append( (_('Talks'), '/event/%s/track/' % slug(event)))
-            result.append( (_('Agenda'), '/event/%s/agenda/' % slug(event)))
+            result.append( (_('Talks'), '/event/%s/track' % slug(event)))
+            result.append( (_('Agenda'), '/event/%s/agenda' % slug(event)))
         if event.blog_id:
-            result.append( (_('News'), '/blogpost/'+slug(event.blog_ig)))
+            result.append( (_('News'), '/blogpost'+slug(event.blog_ig)))
         if event.show_track_proposal:
-            result.append( (_('Talk Proposals'), '/event/%s/track_proposal/' % slug(event)))
+            result.append( (_('Talk Proposals'), '/event/%s/track_proposal' % slug(event)))
         return result
 
 #
@@ -171,6 +171,7 @@ class event_sponsors(osv.osv):
         'partner_id': fields.many2one('res.partner', 'Sponsor/Customer', required=True),
         'url': fields.text('Sponsor Website'),
         'sequence': fields.related('sponsor_type_id', 'sequence', string='Sequence', store=True),
+        'image_medium': fields.related('partner_id', 'image_medium', string='Logo')
     }
 
     def has_access_to_partner(self, cr, uid, ids, context=None):
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 03f6f750b6f..f7c018bead1 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -15,10 +15,10 @@
                 <h2 class="text-center mb32">Our Sponsors</h2>
             </section>
             <div class="row">
-                <div t-attf-class="col-md-#{(len(event.sponsor_ids) > 6) and 2 or (12/ len(event.sponsor_ids))} text-center" t-foreach="event.sponsor_ids" t-as="sponsor">
+                <div t-attf-class="col-md-#{(len(event.sponsor_ids) > 6) and 2 or (12/ len(event.sponsor_ids))} text-center mb16" t-foreach="event.sponsor_ids" t-as="sponsor">
                     <t t-if="sponsor.url">
                         <a t-att-href="sponsor.url" style="position: relative; display: inline-block;">
-                            <span t-field="sponsor.partner_id.image"
+                            <span t-field="sponsor.image_medium"
                                 t-field-options='{"widget": "image", "class": "shadow"}'/>
                             <div class="ribbon-wrapper">
                                 <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
@@ -27,7 +27,7 @@
                     </t>
                     <t t-if="not sponsor.url">
                         <span style="position: relative; display: inline-block;">
-                            <span t-field="sponsor.partner_id.image"
+                            <span t-field="sponsor.image_medium"
                                 t-field-options='{"widget": "image", "class": "shadow"}'/>
                             <div class="ribbon-wrapper">
                                 <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
@@ -174,7 +174,7 @@
 <template id="tracks_filter" inherit_id="website_event_track.tracks" inherit_option_id="website_event_track.tracks" name="Filter on Tags">
     <xpath expr="//div[@id='left_column']" position="inside">
         <ul class="nav nav-pills nav-stacked">
-            <li t-att-class="'' if searches.get('tag') else 'active'"><a t-attf-href="/event/#{ slug(event) }/track/">All Tags</a></li>
+            <li t-att-class="'' if searches.get('tag') else 'active'"><a t-attf-href="/event/#{ slug(event) }/track">All Tags</a></li>
             <t t-foreach="tags" t-as="tag">
                 <li t-att-class="searches.get('tag') == tag.id and 'active' or ''">
                     <a t-attf-href="/event/#{ slug(event) }/track/tag/#{ slug(tag) }">
diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py
index 98a86230d7e..01a0cc3b85e 100644
--- a/addons/website_google_map/controllers/main.py
+++ b/addons/website_google_map/controllers/main.py
@@ -7,7 +7,7 @@ from datetime import datetime
 
 class google_map(http.Controller):
 
-    @http.route(['/google_map/'], type='http', auth="public", website=True)
+    @http.route(['/google_map'], type='http', auth="public", website=True)
     def google_map(self, *arg, **post):
         values = {
             'partner_ids': post.get('partner_ids', ""),
@@ -28,7 +28,7 @@ class google_map(http.Controller):
         return partner_obj.google_map_json(request.cr, openerp.SUPERUSER_ID,
                                            partner_ids, request.context)
 
-    @http.route(['/google_map/set_partner_position/'], type='http', auth="public", website=True)
+    @http.route(['/google_map/set_partner_position'], type='http', auth="public", website=True)
     def google_map_set_partner_position(self, *arg, **post):
         partner_obj = request.registry['res.partner']
 
diff --git a/addons/website_google_map/static/src/js/google_map.js b/addons/website_google_map/static/src/js/google_map.js
index df5b7011ed7..19f4a5e6423 100644
--- a/addons/website_google_map/static/src/js/google_map.js
+++ b/addons/website_google_map/static/src/js/google_map.js
@@ -38,7 +38,7 @@ function initialize(pt) {
         if (status == google.maps.GeocoderStatus.OK) {
           var location = results[0].geometry.location;
 
-          $.post("/google_map/set_partner_position/", {
+          $.post("/google_map/set_partner_position", {
               'partner_id': partner.id,
               'latitude': location.ob,
               'longitude': location.pb
diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py
index 26036350004..26aad8ae1b8 100644
--- a/addons/website_hr_recruitment/models/hr_job.py
+++ b/addons/website_hr_recruitment/models/hr_job.py
@@ -9,7 +9,7 @@ class hr_job(osv.osv):
     def _website_url(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, '')
         for job in self.browse(cr, uid, ids, context=context):
-            res[job.id] = "/jobs/detail/%s/" % job.id
+            res[job.id] = "/jobs/detail/%s" % job.id
         return res
 
     def job_open(self, cr, uid, ids, context=None):
diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml
index 9dab6c6accc..3246eb19931 100644
--- a/addons/website_hr_recruitment/views/templates.xml
+++ b/addons/website_hr_recruitment/views/templates.xml
@@ -236,7 +236,7 @@
             <li t-att-class=" '' if department_id else 'active' "><a href="/jobs">All Departments</a></li>
             <t t-foreach="departments" t-as="department">
                 <li t-att-class="'active' if department_id == department.id else ''">
-                    <a t-attf-href="/jobs/department/#{ slug(department) }/" ><span t-field="department.name"/></a>
+                    <a t-attf-href="/jobs/department/#{ slug(department) }" ><span t-field="department.name"/></a>
                 </li>
             </t>
         </ul>
@@ -255,7 +255,7 @@
             <li t-att-class=" '' if office_id else 'active' "><a href="/jobs">All Offices</a></li>
             <t t-foreach="offices" t-as="thisoffice">
                 <li t-att-class=" 'active' if office_id == thisoffice.id else '' ">
-                    <a t-attf-href="/jobs/office/#{ slug(thisoffice) }/" >
+                    <a t-attf-href="/jobs/office/#{ slug(thisoffice) }" >
                         <span t-field="thisoffice.city"/><t t-if="thisoffice.country_id">,
                             <span t-field="thisoffice.country_id.name"/>
                         </t>
diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py
index 3eb3c32ac96..fc10abccf2a 100644
--- a/addons/website_mail/controllers/email_designer.py
+++ b/addons/website_mail/controllers/email_designer.py
@@ -7,7 +7,7 @@ from openerp.addons.web.http import request
 
 class WebsiteEmailDesigner(http.Controller):
 
-    @http.route('/website_mail/email_designer/<model("email.template"):template>/', type='http', auth="user", website=True, multilang=True)
+    @http.route('/website_mail/email_designer/<model("email.template"):template>', type='http', auth="user", website=True, multilang=True)
     def index(self, template, **kw):
         values = {
             'template': template,
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 601e1387f0a..a6b400ec4a1 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -26,43 +26,67 @@ from openerp.addons.web.http import request
 
 class WebsiteMail(http.Controller):
 
-    def _find_or_create_partner(self, email, context=None):
-        # TDE TODO: FIXME: use mail_thread method
+    @http.route(['/website_mail/follow'], type='json', auth="public", website=True)
+    def website_message_subscribe(self, id=0, object=None, message_is_follower="on", email=False, **post):
+        cr, uid, context = request.cr, request.uid, request.context
+
         partner_obj = request.registry['res.partner']
         user_obj = request.registry['res.users']
-        partner_ids = []
-        if email and email != u'false':  # post contains stringified booleans
-            partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", email)], context=request.context)
-            if not partner_ids:
-                partner_ids = [partner_obj.name_create(request.cr, SUPERUSER_ID, email, request.context)[0]]
-        else:
-            partner_ids = [user_obj.browse(request.cr, request.uid, request.uid, request.context).partner_id.id]
-        return partner_ids
+        website = request.registry['website']
 
-    @http.route(['/website_mail/follow/'], type='json', auth="public", website=True)
-    def website_message_subscribe(self, id=0, object=None, message_is_follower="on", email=False, **post):
         _id = int(id)
         _message_is_follower = message_is_follower == 'on'
         _object = request.registry[object]
-        partner_ids = self._find_or_create_partner(email, request.context)
 
-        if _message_is_follower:
-            _object.check_access_rule(request.cr, request.uid, [_id], 'read', request.context)
-            _object.message_unsubscribe(request.cr, SUPERUSER_ID, [_id], partner_ids, context=request.context)
+        # search partner_id
+        public_id = website.get_public_user(cr, uid, context)
+        if uid != public_id:
+            partner_ids = [user_obj.browse(cr, uid, uid, context).partner_id.id]
         else:
-            _object.check_access_rule(request.cr, request.uid, [_id], 'read', request.context)
-            _object.message_subscribe(request.cr, SUPERUSER_ID, [_id], partner_ids, context=request.context)
-        obj = _object.browse(request.cr, request.uid, _id)
-        follower_ids = [p.id for p in obj.message_follower_ids]
+            # mail_thread method
+            partner_ids = _object._find_partner_from_emails(
+                cr, SUPERUSER_ID, _id, [email], context=context, check_followers=True)
+            if not partner_ids or not partner_ids[0]:
+                partner_ids = [partner_obj.create(cr, SUPERUSER_ID, {'name': email, 'email': email}, context=context)]
 
-        return partner_ids[0] in follower_ids and 1 or 0
+        # add or remove follower
+        if _message_is_follower:
+            _object.check_access_rule(cr, uid, [_id], 'read', context)
+            _object.message_unsubscribe(cr, SUPERUSER_ID, [_id], partner_ids, context=context)
+            return False
+        else:
+            _object.check_access_rule(cr, uid, [_id], 'read', context)
+            # add partner to session
+            request.session['partner_id'] = partner_ids[0]
+            _object.message_subscribe(cr, SUPERUSER_ID, [_id], partner_ids, context=context)
+            return True
 
-    @http.route(['/website_mail/is_follower/'], type='json', auth="public", website=True)
+    @http.route(['/website_mail/is_follower'], type='json', auth="public", website=True)
     def call(self, model, id, **post):
-        email = request.registry['res.users'].browse(request.cr, request.uid, request.uid, request.context).partner_id.email
-        value = request.registry.get(model).read(request.cr, request.uid, [id], ['message_is_follower'], request.context)
+        cr, uid, context = request.cr, request.uid, request.context
+
+        partner_obj = request.registry.get('res.partner')
+        users_obj = request.registry.get('res.users')
+        obj = request.registry.get(model)
+        website = request.registry['website']
+
+        partner_id = None
+        public_id = website.get_public_user(cr, uid, context)
+        if uid != public_id:
+            partner_id = users_obj.browse(cr, SUPERUSER_ID, uid, context).partner_id
+        elif request.session.get('partner_id'):
+            partner_id = partner_obj.browse(cr, SUPERUSER_ID, request.session.get('partner_id'), context)
+        
+        email = ""
+        is_follower = False
+        if partner_id:
+            email = partner_id and partner_id.email
+            is_follower = partner_id.id in [
+                fol.id for fol in obj.browse(cr, SUPERUSER_ID, id, context).message_follower_ids]
+
         return {
-            'email': email, 
-            'is_follower': value and value[0]['message_is_follower'] or False
+            'is_user': uid != public_id,
+            'email': email,
+            'is_follower': is_follower
         }
 
diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py
index 12c35f3e83f..a376d391a33 100644
--- a/addons/website_mail/models/mail_message.py
+++ b/addons/website_mail/models/mail_message.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+from openerp.tools import html2plaintext
 from openerp.tools.translate import _
 from openerp.osv import osv, fields
 
@@ -26,7 +27,21 @@ from openerp.osv import osv, fields
 class MailMessage(osv.Model):
     _inherit = 'mail.message'
 
+    def _get_description_short(self, cr, uid, ids, name, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        for message in self.browse(cr, uid, ids, context=context):
+            if message.subject:
+                res[message.id] = message.subject
+            else:
+                plaintext_ct = html2plaintext(message.body)
+                res[message.id] = plaintext_ct + '%s' % (' [...]' if len(plaintext_ct) >= 20 else '')
+        return res
+
     _columns = {
+        'description': fields.function(
+            _get_description_short, type='char',
+            help='Message description: either the subject, or the beginning of the body'
+        ),
         'website_published': fields.boolean(
             'Published', help="Visible on the website as a comment"
         ),
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css
index 25d88ebf191..5678442416c 100644
--- a/addons/website_mail/static/src/css/website_mail.css
+++ b/addons/website_mail/static/src/css/website_mail.css
@@ -1,5 +1,4 @@
 .js_follow[data-follow='on'] .js_follow_btn ,
-.js_follow[data-follow='on'] .js_follow_email,
 .js_follow[data-follow='off'] .js_unfollow_btn {
     display: none;
 }
\ No newline at end of file
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/website_mail.js
index 672a21324a8..bd34b526ddd 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/website_mail.js
@@ -9,13 +9,14 @@
             var self = this;
 
             // set value and display button
-            openerp.jsonRpc('/website_mail/is_follower/', 'call', {
+            self.$target.find("input").removeClass("hidden");
+            openerp.jsonRpc('/website_mail/is_follower', 'call', {
                 model: this.$target.data('object'),
                 id: +this.$target.data('id'),
             }).always(function (data) {
                 self.$target.find('input.js_follow_email')
                     .val(data.email ? data.email : "")
-                    .attr("disabled", data.email.length ? "disabled" : false);
+                    .attr("disabled", data.is_follower && data.email.length ? "disabled" : false);
                 self.$target.attr("data-follow", data.is_follower ? 'on' : 'off');
                 self.$target.removeClass("hidden");
             });
@@ -47,8 +48,10 @@
                 'email': $email.length ? $email.val() : false,
             }).then(function (follow) {
                 if (follow) {
-                    self.$target.find(" > *").toggleClass("hidden");
+                    self.$target.find(".js_follow_email, .input-group-btn").addClass("hidden");
+                    self.$target.find(".alert").removeClass("hidden");
                 }
+                self.$target.find('input.js_follow_email').attr("disabled", follow ? "disabled" : false);
                 self.$target.attr("data-follow", follow ? 'on' : 'off');
             });
         },
diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml
index 196ad39dac8..a930f2852a1 100644
--- a/addons/website_mail/views/snippets.xml
+++ b/addons/website_mail/views/snippets.xml
@@ -509,8 +509,8 @@
                       class="js_follow_email form-control"
                       placeholder="your email..."/>
                 <span class="input-group-btn">
-                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
-                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
+                    <a href="#" class="btn btn-default js_unfollow_btn">Unsubscribe</a>
+                    <a href="#" class="btn btn-primary js_follow_btn">Subscribe</a>
                 </span>
                 <div class="alert alert-success hidden">thanks for your subscription!</div>
             </div>
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index a6f3adcd522..628aa874e7f 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -1,34 +1,29 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
 
+import datetime
+
+from openerp import tools
 from openerp.addons.web import http
+from openerp.addons.website.models.website import slug
 from openerp.addons.web.http import request
 
 
 class MailGroup(http.Controller):
     _thread_per_page = 10
 
-    @http.route([
-        "/groups",
-    ], type='http', auth="public", website=True)
+    def _get_archives(self, group_id):
+        MailMessage = request.registry['mail.message']
+        groups = MailMessage.read_group(
+            request.cr, request.uid, [('model', '=', 'mail.group'), ('res_id', '=', group_id)], ['subject', 'date'],
+            groupby="date", orderby="date asc", context=request.context)
+        for group in groups:
+            begin_date = datetime.datetime.strptime(group['__domain'][0][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
+            end_date = datetime.datetime.strptime(group['__domain'][1][2], tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
+            group['date_begin'] = '%s' % datetime.date.strftime(begin_date, tools.DEFAULT_SERVER_DATE_FORMAT)
+            group['date_end'] = '%s' % datetime.date.strftime(end_date, tools.DEFAULT_SERVER_DATE_FORMAT)
+        return groups
+
+    @http.route("/groups", type='http', auth="public", website=True)
     def view(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
@@ -37,7 +32,7 @@ class MailGroup(http.Controller):
         return request.website.render('website_mail_group.mail_groups', values)
 
     @http.route(["/groups/subscription/"], type='json', auth="user")
-    def subscription(self, group_id=0, action=False ,**post):
+    def subscription(self, group_id=0, action=False, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
         if action:
@@ -47,45 +42,50 @@ class MailGroup(http.Controller):
         return []
 
     @http.route([
-        "/groups/<model('mail.group'):group>/<any(thread,list):mode>",
-        "/groups/<model('mail.group'):group>/<any(thread,list):mode>/page/<int:page>"
+        "/groups/<model('mail.group'):group>",
+        "/groups/<model('mail.group'):group>/page/<int:page>"
     ], type='http', auth="public", website=True)
-    def thread(self, group, mode='thread', page=1, **post):
+    def thread_headers(self, group, page=1, mode='thread', date_begin=None, date_end=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
-
         thread_obj = request.registry.get('mail.message')
-        domain = [('model','=','mail.group'), ('res_id','=',group.id)]
-        if mode=='thread':
-            domain.append(('parent_id','=',False))
+
+        domain = [('model', '=', 'mail.group'), ('res_id', '=', group.id)]
+        if mode == 'thread':
+            domain += [('parent_id', '=', False)]
+        if date_begin and date_end:
+            domain += [('date', '>=', date_begin), ('date', '<=', date_end)]
+
         thread_count = thread_obj.search_count(cr, uid, domain, context=context)
         pager = request.website.pager(
-            url='/groups/%s/%s' % (group.id, mode),
+            url='/groups/%s' % slug(group),
             total=thread_count,
             page=page,
             step=self._thread_per_page,
+            url_args={'mode': mode, 'date_begin': date_begin or '', 'date_end': date_end or ''},
         )
         thread_ids = thread_obj.search(cr, uid, domain, limit=self._thread_per_page, offset=pager['offset'])
-
         messages = thread_obj.browse(cr, uid, thread_ids, context)
-        for m in messages:
-            print m.subject
         values = {
             'messages': messages,
             'group': group,
             'pager': pager,
-            'mode': mode
+            'mode': mode,
+            'archives': self._get_archives(group.id),
+            'date_begin': date_begin,
+            'date_end': date_end,
         }
         return request.website.render('website_mail_group.group_messages', values)
 
     @http.route([
-        "/groups/<model('mail.group'):group>/message/<model('mail.message'):message>",
+        "/groups/<model('mail.group'):group>/<model('mail.message'):message>",
     ], type='http', auth="public", website=True)
-    def get_thread(self, group, message, mode='thread', page=1, **post):
+    def thread_discussion(self, group, message, mode='thread', date_begin=None, date_end=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
         values = {
             'message': message,
             'group': group,
             'mode': mode,
-            'page': page,
+            'date_begin': date_begin,
+            'date_end': date_end,
         }
         return request.website.render('website_mail_group.group_message', values)
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index 9e4b41329b4..87f8755c04a 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -16,24 +16,9 @@
                     <div class="col-sm-4" style="height: 140px" t-foreach="groups" t-as="group">
                         <img t-att-src="'/website/image?model=mail.group&amp;field=image_small&amp;id='+str(group['id'])" class="pull-left"/>
                         <div>
-                            <strong><a t-attf-href="/groups/#{ slug(group) }/thread" t-esc="group.name"/></strong>
+                            <strong><a t-attf-href="/groups/#{ slug(group) }" t-esc="group.name"/></strong>
                             <div t-esc="group.description" class="text-muted"/>
-
-                            <div class="input-group js_follow"
-                                      t-att-data-id="group.id"
-                                      data-object="mail.group"
-                                      data-follow="off">
-                                <input
-                                      type="email"
-                                      name="email"
-                                      class="js_follow_email form-control"
-                                      placeholder="your email..."/>
-                                <span class="input-group-btn">
-                                    <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
-                                    <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
-                                </span>
-                                <div class="alert alert-success hidden">You have been subscribed!</div>
-                            </div>
+                            <t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>
                         </div>
                     </div>
                 </div>
@@ -45,13 +30,13 @@
         <t t-call="website.layout">
             <section class="container">
                 <div class="row mt8">
-                    <div class="col-md-5">
-                        <ol class="breadcrumb mb8">
+                    <div class="col-md-5 mt16">
+                        <ol class="breadcrumb">
                             <li><a href="/groups">Mailing Lists</a></li>
                             <li class="active" t-esc="group.name"/>
                         </ol>
                     </div>
-                    <div class="col-md-5">
+                    <div class="col-md-5 pull-right">
                         <t t-call="website.pager"/>
                     </div>
                 </div>
@@ -63,10 +48,20 @@
                     <div class="col-md-3">
                         <ul class="nav nav-pills nav-stacked" id="group_mode">
                             <li t-attf-class="#{mode=='thread' and 'active' or ''}">
-                                <a t-attf-href="/groups/#{ slug(group) }/thread">By thread</a>
+                                <a t-attf-href="/groups/#{ slug(group) }?mode=thread">By thread</a>
                             </li>
-                            <li t-attf-class="#{mode=='list' and 'active' or ''}">
-                                <a t-attf-href="/groups/#{ slug(group) }/list">By date</a>
+                            <li t-attf-class="#{mode=='date' and not date_begin and 'active' or ''}">
+                                <a t-attf-href="/groups/#{ slug(group) }?mode=date">By date</a>
+                                <ul class="nav nav-pills nav-stacked" style="margin-left: 8px;">
+                                    <t t-foreach="archives" t-as="month_archive">
+                                    <li t-att-class="month_archive['date_begin'] == date_begin and 'active' or None">
+                                        <a t-ignore="True" t-attf-href="/groups/#{ slug(group) }?mode=date&amp;date_begin=#{ month_archive['date_begin'] }&amp;date_end=#{month_archive['date_end']}">
+                                            <t t-esc="month_archive['date']"/>
+                                            <span class="pull-right badge" t-esc="month_archive['date_count']"/>
+                                        </a>
+                                    </li>
+                                    </t>
+                                </ul>
                             </li>
                         </ul>
                     </div>
@@ -86,7 +81,7 @@
                         <ol class="breadcrumb mb8">
                             <li><a href="/groups">Mailing Lists</a></li>
                             <li>
-                                <a t-attf-href="/groups/#{ slug(group) }/#{mode}/page/#{str(page)}">
+                                <a t-attf-href="/groups/#{slug(group)}?mode=#{mode}&amp;date_begin=#{date_begin}&amp;date_end=#{date_end}">
                                     <span t-field="group.name"/>
                                 </a>
                             </li>
@@ -98,7 +93,13 @@
                 <h1 t-field="message.subject"/>
                 <img class="img-rounded pull-left" t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(message.id)" style="width : 30px"/>
                 <h4 class="mt0 mb32">
-                     <span t-field="message.author_id.name"/>
+                    <t t-if="message.author_id">
+                         <span t-field="message.author_id" style="display: inline-block;" t-field-options='{
+                                "widget": "contact",
+                                "fields": ["name"]
+                            }'/>
+                    </t>
+                    <t t-if="not message.author_id"><t t-esc="message.email_from"/></t>
                     on <span t-field="message.date"/>
                 </h4>
                 <div t-raw="message.body"/>
@@ -136,25 +137,7 @@
                         Join this mailing list to follow or participate to this discussion.<br/>
                         <span t-field="group.name"/>: <i t-field="group.description"/>
                     </p>
-
-                    <div style="max-width: 400px">
-                        <div class="input-group js_follow"
-                                  t-att-data-id="group.id"
-                                  data-object="mail.group"
-                                  data-follow="off">
-                            <input
-                                  type="email"
-                                  name="email"
-                                  class="js_follow_email form-control"
-                                  placeholder="your email..."/>
-                            <span class="input-group-btn">
-                                <a href="#" class="btn btn-default js_unfollow_btn">unsubscribe</a>
-                                <a href="#" class="btn btn-primary js_follow_btn">subscribe</a>
-                            </span>
-                            <div class="alert alert-success hidden">You have been subscribed!</div>
-                        </div>
-                    </div>
-
+                    <t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>
                 </div>
             </div>
         </t>
@@ -163,16 +146,25 @@
     <template id="messages_short">
         <ul class="media-list">
             <li t-foreach="messages" t-as="thread" class="media">
-                <a t-attf-href="/groups/#{group.id}/message/#{ slug(thread) }?mode=#{mode}" class="pull-left">
-                    <img class="img-rounded pull-right mt0" style="height: 40px"
-                        t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
-                </a>
+                <img class="img-rounded pull-left mt0 media-object" style="height: 40px"
+                    t-att-src="'/website/image?model=mail.message&amp;field=author_avatar&amp;id='+str(thread.id)"/>
                 <div class="media-body">
                     <h4 class="media-heading">
-                        <a t-attf-href="/groups/#{ slug(group) }/message/#{ slug(thread) }" t-esc="thread.subject"/>
-                        <br/>
-                        <small>by <t t-esc="thread.author_id.name and thread.author_id.name or thread.email_from"/> on <t t-esc="thread.date"/></small>
+                        <a t-attf-href="/groups/#{slug(group)}/#{slug(thread)}?mode=#{mode}&amp;date_begin=#{date_begin}&amp;date_end=#{date_end}" t-esc="thread.description"/>
                     </h4>
+                    <small>
+                        by
+                        <t t-if="thread.author_id">
+                            <span t-field="thread.author_id" style="display: inline-block;" t-field-options='{
+                                "widget": "contact",
+                                "fields": ["name"]
+                            }'/>
+                        </t>
+                        <t t-if="not thread.author_id"><t t-esc="thread.email_from"/></t>
+                        <span class="fa fa-comment-o">
+                            <t t-raw="len(thread.child_ids)"/> replies
+                        </span>
+                    </small>
                 </div>
             </li>
         </ul>
diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py
index a4932c1b46c..11e764f0eac 100644
--- a/addons/website_membership/controllers/main.py
+++ b/addons/website_membership/controllers/main.py
@@ -14,20 +14,20 @@ class WebsiteMembership(http.Controller):
     _references_per_page = 20
 
     @http.route([
-        '/members/',
-        '/members/page/<int:page>/',
-        '/members/association/<int:membership_id>/',
-        '/members/association/<int:membership_id>/page/<int:page>/',
+        '/members',
+        '/members/page/<int:page>',
+        '/members/association/<int:membership_id>',
+        '/members/association/<int:membership_id>/page/<int:page>',
 
         '/members/country/<int:country_id>',
         '/members/country/<country_name>-<int:country_id>',
-        '/members/country/<int:country_id>/page/<int:page>/',
-        '/members/country/<country_name>-<int:country_id>/page/<int:page>/',
+        '/members/country/<int:country_id>/page/<int:page>',
+        '/members/country/<country_name>-<int:country_id>/page/<int:page>',
 
         '/members/association/<int:membership_id>/country/<country_name>-<int:country_id>',
         '/members/association/<int:membership_id>/country/<int:country_id>',
-        '/members/association/<int:membership_id>/country/<country_name>-<int:country_id>/page/<int:page>/',
-        '/members/association/<int:membership_id>/country/<int:country_id>/page/<int:page>/',
+        '/members/association/<int:membership_id>/country/<country_name>-<int:country_id>/page/<int:page>',
+        '/members/association/<int:membership_id>/country/<int:country_id>/page/<int:page>',
     ], type='http', auth="public", website=True, multilang=True)
     def members(self, membership_id=None, country_name=None, country_id=0, page=0, **post):
         cr, uid, context = request.cr, request.uid, request.context
@@ -88,7 +88,7 @@ class WebsiteMembership(http.Controller):
         memberships = product_obj.browse(cr, uid, membership_ids, context=context)
 
         # request pager for lines
-        pager = request.website.pager(url="/members/", total=len(membership_line_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
+        pager = request.website.pager(url="/members", total=len(membership_line_ids), page=page, step=self._references_per_page, scope=7, url_args=post)
 
         values = {
             'partners_data': partners_data,
@@ -105,7 +105,7 @@ class WebsiteMembership(http.Controller):
         }
         return request.website.render("website_membership.index", values)
 
-    @http.route(['/members/<int:partner_id>/', '/members/<partner_name>-<int:partner_id>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/members/<int:partner_id>', '/members/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
     def partners_ref(self, partner_id, **post):
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
         values = website_partner.get_partner_template_value(partner)
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index 94a7c95fb5d..6b7f8c088b6 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -5,7 +5,7 @@
 <!-- Layout add nav and footer -->
 <template id="footer_custom" inherit_id="website.layout" name="Footer Associations Link">
     <xpath expr="//footer//div[@name='info']/ul" position="inside">
-        <li><a href="/members/">Members</a></li>
+        <li><a href="/members">Members</a></li>
     </xpath>
 </template>
 
@@ -31,10 +31,10 @@
             <div class="col-md-4 mb32" id="left_column">
                 <ul class="nav nav-pills nav-stacked mt16">
                     <li class="nav-header"><h3>Associations</h3></li>
-                    <li t-att-class="'' if membership else 'active'"><a href="/members/">All</a></li>
+                    <li t-att-class="'' if membership else 'active'"><a href="/members">All</a></li>
                     <t t-foreach="memberships" t-as="membership_id">
                         <li t-att-class="membership and membership_id.id == membership.id and 'active' or ''">
-                            <a t-attf-href="/members/association/#{ membership_id.id }/#{current_country and 'country/%s/' % slug(current_country) or ''}#{ search }"><t t-esc="membership_id.name"/></a>
+                            <a t-attf-href="/members/association/#{ membership_id.id }#{current_country and '/country/%s' % slug(current_country) or ''}#{ search }"><t t-esc="membership_id.name"/></a>
                         </li>
                     </t>
                 </ul>
@@ -61,11 +61,11 @@
                         </t>
                         <t t-set="partner_data" t-value="partners_data[membership_line_id.partner.id]"/>
                         <div class="media">
-                            <a class="pull-left" t-attf-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                            <a class="pull-left" t-attf-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }">
                                 <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
                             </a>
                             <div class="media-body" style="min-height: 64px;">
-                                <a class="media-heading" t-attf-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"><t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/></a>
+                                <a class="media-heading" t-attf-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }"><t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/></a>
                                 <div t-raw="partner_data.get('website_short_description')"/>
                             </div>
                         </div>
@@ -87,7 +87,7 @@
             <li class="nav-header"><h3>Location</h3></li>
             <t t-foreach="countries">
                 <li t-if="country_id" t-att-class="country_id[0] == current_country_id and 'active' or ''">
-                    <a t-attf-href="/members/#{ membership and 'association/%s/' % membership.id or '' }#{ country_id[0] and 'country/%s/' % slug(country_id) or '' }#{ search }"><t t-esc="country_id[1]"/>
+                    <a t-attf-href="/members#{ membership and '/association/%s' % membership.id or '' }#{ country_id[0] and '/country/%s' % slug(country_id) or '' }#{ search }"><t t-esc="country_id[1]"/>
                         <span class="badge pull-right"><t t-esc="country_id_count or '0'"/></span>
                     </a>
                 </li>
@@ -103,7 +103,7 @@
         <ul class="nav nav-pills nav-stacked mt16">
             <li class="nav-header"><h3>World Map</h3></li>
             <ul class="nav">
-                <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
+                <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members"
                     style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
             </ul>
         </ul>
diff --git a/addons/website_partner/controllers/main.py b/addons/website_partner/controllers/main.py
index 6b0dc18a1f8..1e6cb9afb61 100644
--- a/addons/website_partner/controllers/main.py
+++ b/addons/website_partner/controllers/main.py
@@ -33,7 +33,7 @@ def get_partner_template_value(partner):
     return values
 
 class WebsitePartner(http.Controller):
-    @http.route(['/partners/<int:partner_id>/', '/partners/<partner_name>-<int:partner_id>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/partners/<int:partner_id>', '/partners/<partner_name>-<int:partner_id>'], type='http', auth="public", website=True, multilang=True)
     def partner(self, partner_id, **post):
         """ Route for displaying a single partner / customer. """
         partner = request.registry['res.partner'].browse(request.cr, SUPERUSER_ID, partner_id, context=request.context)
diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
index 4940a521072..e487a981996 100644
--- a/addons/website_project/controllers/main.py
+++ b/addons/website_project/controllers/main.py
@@ -40,7 +40,7 @@ class Website(osv.Model):
 
 class website_project(http.Controller):
 
-    @http.route(['/project/<model("project.project"):project>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/project/<model("project.project"):project>'], type='http', auth="public", website=True, multilang=True)
     def project(self, project=None, **post):
         cr, uid, context = request.cr, request.uid, request.context
         render_values = {
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 514194083f2..1d511ba3ef1 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -6,7 +6,7 @@
 <template id="footer_custom" inherit_id="website.layout" name="Footer Project's Links">
     <xpath expr="//footer//ul[@name='products']" position="inside">
         <li t-foreach="website_project_ids" t-as="project">
-            <a t-attf-href="/project/#{ project.id }/"><span t-field="project.name"/></a>
+            <a t-attf-href="/project/#{ project.id }"><span t-field="project.name"/></a>
         </li>
     </xpath>
 </template>
diff --git a/addons/website_quote/static/src/js/website_quotation.js b/addons/website_quote/static/src/js/website_quotation.js
index b24ab58a3fb..646cbe25375 100644
--- a/addons/website_quote/static/src/js/website_quotation.js
+++ b/addons/website_quote/static/src/js/website_quotation.js
@@ -6,7 +6,7 @@ $(document).ready(function () {
         var order_id = href.match(/order_id=([0-9]+)/);
         var line_id = href.match(/update_line\/([0-9]+)/);
         var token = href.match(/token=(.*)/);
-        openerp.jsonRpc("/quote/update_line/", 'call', {
+        openerp.jsonRpc("/quote/update_line", 'call', {
                 'line_id': line_id[1],
                 'order_id': parseInt(order_id[1]),
                 'token': token[1],
@@ -52,7 +52,7 @@ $(document).ready(function () {
         if (is_empty || ! signer_name)
             return false;
 
-        openerp.jsonRpc("/quote/accept/", 'call', {
+        openerp.jsonRpc("/quote/accept", 'call', {
             'order_id': parseInt(order_id[1]),
             'token': token,
             'signer': signer_name,
diff --git a/addons/website_report/views/layouts.xml b/addons/website_report/views/layouts.xml
index 091bb8dd3db..f5deb483374 100644
--- a/addons/website_report/views/layouts.xml
+++ b/addons/website_report/views/layouts.xml
@@ -2,6 +2,11 @@
 <openerp>
 <data>
 <template id="editor_head" inherit_id="report.html_container" name="Editor" groups="base.group_website_publisher">
+    <xpath expr="//html" position="attributes">
+        <attribute name="t-att-data-website-id">website.id if editable and website else None</attribute>
+        <attribute name="t-att-data-translatable">'1' if translatable else None</attribute>
+    </xpath>
+
     <xpath expr="//body" position="attributes">
         <attribute name="style">padding-top: 51px;</attribute>
     </xpath>
@@ -42,16 +47,18 @@
 
         <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
         <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
-        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
         <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
         <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
         <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
         <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
         <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
         <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
         <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
 
+        <script type="text/javascript" src="/website/static/lib/jquery.placeholder/jquery.placeholder.js"></script>
+
         <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
         <script type="text/javascript" src="/website/static/src/js/website.editor.newpage.js" groups="base.group_website_designer"></script>
         <script type="text/javascript" src="/website/static/src/js/website.menu.js" groups="base.group_website_designer"></script>
@@ -65,7 +72,7 @@
     </xpath>
 
     <xpath expr='//body[@class="container"]/div[@id="wrapwrap"]' position="before">
-        <t t-set="languages" t-value="website.get_languages()"/>
+        <t t-set="languages" t-value="website.get_languages() if website else list()"/>
         <ul class="list-inline js_language_selector mt16" t-if="(len(languages) &gt; 1 or editable)">
             <li t-foreach="languages" t-as="lg">
                 <a t-att-href="url_for('', lang=lg[0]) + '?' + keep_query()"
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 2d84c95119f..ed6cb147828 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -151,7 +151,7 @@ class Ecommerce(http.Controller):
                 return key_val
         return False
 
-    @http.route(['/shop/filters/'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/filters'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
     def filters(self, category=None, **post):
         index = []
         filters = []
@@ -177,10 +177,10 @@ class Ecommerce(http.Controller):
                     filters[index.index(cat_id)].append( cat[2] )
             post.pop(key)
 
-        url = "/shop/"
+        url = "/shop"
         if category:
             category_obj = request.registry.get('product.public.category')
-            url = "%scategory/%s/" % (url, slug(category_obj.browse(request.cr, request.uid, int(category), context=request.context)))
+            url = "%scategory/%s" % (url, slug(category_obj.browse(request.cr, request.uid, int(category), context=request.context)))
         if filters:
             url = "%s?filters=%s" % (url, simplejson.dumps(filters))
         if post.get("search"):
@@ -215,18 +215,19 @@ class Ecommerce(http.Controller):
     @http.route(['/shop/pricelist'], type='http', auth="public", website=True, multilang=True)
     def shop_promo(self, promo=None, **post):
         request.registry['website']._ecommerce_change_pricelist(request.cr, request.uid, code=promo, context=request.context)
-        return request.redirect("/shop/mycart/")
+        return request.redirect("/shop/mycart")
 
     @http.route([
-        '/shop/',
-        '/shop/page/<int:page>/',
-        '/shop/category/<model("product.public.category"):category>/',
-        '/shop/category/<model("product.public.category"):category>/page/<int:page>/'
+        '/shop',
+        '/shop/page/<int:page>',
+        '/shop/category/<model("product.public.category"):category>',
+        '/shop/category/<model("product.public.category"):category>/page/<int:page>'
     ], type='http', auth="public", website=True, multilang=True)
     def shop(self, category=None, page=0, filters='', search='', **post):
         cr, uid, context = request.cr, request.uid, request.context
         product_obj = request.registry.get('product.template')
-        domain = request.registry.get('website').ecommerce_get_product_domain()
+        base_domain = request.registry.get('website').ecommerce_get_product_domain()
+        domain = list(base_domain)
         if search:
             domain += ['|',
                 ('name', 'ilike', search),
@@ -241,14 +242,14 @@ class Ecommerce(http.Controller):
                 ids = self.attributes_to_ids(cr, uid, filters)
                 domain.append(('id', 'in', ids or [0]))
 
-        url = "/shop/"
+        url = "/shop"
         product_count = product_obj.search_count(cr, uid, domain, context=context)
         if search:
             post["search"] = search
         if filters:
             post["filters"] = filters
         if category:
-            url = "/shop/category/%s/" % slug(category)
+            url = "/shop/category/%s" % slug(category)
         pager = request.website.pager(url=url, total=product_count, page=page, step=PPG, scope=7, url_args=post)
 
         request.context['pricelist'] = self.get_pricelist()
@@ -265,9 +266,15 @@ class Ecommerce(http.Controller):
             pass
 
         category_obj = request.registry.get('product.public.category')
-        category_ids = category_obj.search(cr, uid, [], context=context)
+        category_ids = [product['public_categ_id'][0] for product in product_obj.read_group(cr, uid, base_domain, ['public_categ_id'], ['public_categ_id'], context=context) if product['public_categ_id']]
         categories = category_obj.browse(cr, uid, category_ids, context=context)
-        categs = filter(lambda x: not x.parent_id, categories)
+        all_categories = set(categories)
+        for cat in categories:
+            parent = cat.parent_id
+            while parent:
+                all_categories.add(parent)
+                parent = parent.parent_id
+        categories = list(all_categories)
 
         values = {
             'products': products,
@@ -282,13 +289,14 @@ class Ecommerce(http.Controller):
             'pager': pager,
             'styles': styles,
             'category': category,
-            'categories': categs,
+            'categories': filter(lambda x: not x.parent_id, categories),
+            'all_categories': categories,
             'Ecommerce': self,   # TODO fp: Should be removed
             'style_in_product': lambda style, product: style.id in [s.id for s in product.website_style_ids],
         }
         return request.website.render("website_sale.products", values)
 
-    @http.route(['/shop/product/<model("product.template"):product>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/product/<model("product.template"):product>'], type='http', auth="public", website=True, multilang=True)
     def product(self, product, search='', category='', filters='', **kwargs):
         if category:
             category_obj = request.registry.get('product.public.category')
@@ -330,10 +338,10 @@ class Ecommerce(http.Controller):
             'name': name, 'public_categ_id': category
         }, context=request.context)
         product = Product.browse(request.cr, request.uid, product_id, context=request.context)
+        
+        return request.redirect("/shop/product/%s?enable_editor=1" % slug(product.product_tmpl_id))
 
-        return request.redirect("/shop/product/%s/?enable_editor=1" % product.product_tmpl_id.id)
-
-    @http.route(['/shop/mycart/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/mycart'], type='http', auth="public", website=True, multilang=True)
     def mycart(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         prod_obj = request.registry.get('product.product')
@@ -342,7 +350,7 @@ class Ecommerce(http.Controller):
         order = self.get_order()
         if order and order.state != 'draft':
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
-            return request.redirect('/shop/')
+            return request.redirect('/shop')
 
         self.get_pricelist()
 
@@ -370,21 +378,21 @@ class Ecommerce(http.Controller):
         }
         return request.website.render("website_sale.mycart", values)
 
-    @http.route(['/shop/add_cart/'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/add_cart'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
     def add_cart(self, product_id, remove=None, **kw):
         request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
             product_id=int(product_id),
             context=request.context)
-        return request.redirect("/shop/mycart/")
+        return request.redirect("/shop/mycart")
 
-    @http.route(['/shop/change_cart/<int:order_line_id>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/change_cart/<int:order_line_id>'], type='http', auth="public", website=True, multilang=True)
     def add_cart_order_line(self, order_line_id=None, remove=None, **kw):
         request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
             order_line_id=order_line_id, number=(remove and -1 or 1),
             context=request.context)
-        return request.redirect("/shop/mycart/")
+        return request.redirect("/shop/mycart")
 
-    @http.route(['/shop/add_cart_json/'], type='json', auth="public", website=True, multilang=True)
+    @http.route(['/shop/add_cart_json'], type='json', auth="public", website=True, multilang=True)
     def add_cart_json(self, product_id=None, order_line_id=None, remove=None):
         quantity = request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
             product_id=product_id, order_line_id=order_line_id, number=(remove and -1 or 1),
@@ -395,14 +403,14 @@ class Ecommerce(http.Controller):
                 order.amount_total,
                 request.website._render("website_sale.total", {'website_sale_order': order})]
 
-    @http.route(['/shop/set_cart_json/'], type='json', auth="public")
+    @http.route(['/shop/set_cart_json'], type='json', auth="public")
     def set_cart_json(self, path=None, product_id=None, order_line_id=None, set_number=0, json=None):
         quantity = request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
             product_id=product_id, order_line_id=order_line_id, set_number=set_number,
             context=request.context)
         return quantity
 
-    @http.route(['/shop/checkout/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/checkout'], type='http', auth="public", website=True, multilang=True)
     def checkout(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
@@ -410,7 +418,7 @@ class Ecommerce(http.Controller):
         order = self.get_order()
         if not order or order.state != 'draft' or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
-            return request.redirect('/shop/')
+            return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
         if tx and tx.state != 'draft':
@@ -457,7 +465,7 @@ class Ecommerce(http.Controller):
 
         return request.website.render("website_sale.checkout", values)
 
-    @http.route(['/shop/confirm_order/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/confirm_order'], type='http', auth="public", website=True, multilang=True)
     def confirm_order(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
         order_line_obj = request.registry.get('sale.order')
@@ -466,7 +474,7 @@ class Ecommerce(http.Controller):
         order = self.get_order()
         if not order or order.state != 'draft' or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
-            return request.redirect('/shop/')
+            return request.redirect('/shop')
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
         if tx and tx.state != 'draft':
@@ -561,9 +569,9 @@ class Ecommerce(http.Controller):
 
         order_line_obj.write(cr, SUPERUSER_ID, [order.id], order_info, context=context)
 
-        return request.redirect("/shop/payment/")
+        return request.redirect("/shop/payment")
 
-    @http.route(['/shop/payment/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/payment'], type='http', auth="public", website=True, multilang=True)
     def payment(self, **post):
         """ Payment step. This page proposes several payment means based on available
         payment.acquirer. State at this point :
@@ -581,7 +589,7 @@ class Ecommerce(http.Controller):
         order = self.get_order()
         if not order or order.state != 'draft' or not order.order_line:
             request.registry['website'].ecommerce_reset(cr, uid, context=context)
-            return request.redirect("/shop/")
+            return request.redirect("/shop")
         # alread a transaction: forward to confirmation
         tx = context.get('website_sale_transaction')
         if tx and tx.state != 'draft':
@@ -640,7 +648,7 @@ class Ecommerce(http.Controller):
         order = self.get_order()
 
         if not order or not order.order_line or acquirer_id is None:
-            return request.redirect("/shop/checkout/")
+            return request.redirect("/shop/checkout")
 
         # find an already existing transaction
         tx = context.get('website_sale_transaction')
@@ -712,7 +720,7 @@ class Ecommerce(http.Controller):
             'validation': validation
         }
 
-    @http.route('/shop/payment/validate/', type='http', auth="public", website=True, multilang=True)
+    @http.route('/shop/payment/validate', type='http', auth="public", website=True, multilang=True)
     def payment_validate(self, transaction_id=None, sale_order_id=None, **post):
         """ Method that should be called by the server when receiving an update
         for a transaction. State at this point :
@@ -735,7 +743,7 @@ class Ecommerce(http.Controller):
             assert order.website_session_id == request.session['website_session_id']
 
         if not order:
-            return request.redirect('/shop/')
+            return request.redirect('/shop')
         elif order.amount_total and not tx:
             return request.redirect('/shop/mycart')
 
@@ -784,7 +792,7 @@ class Ecommerce(http.Controller):
 
         return request.website.render("website_sale.confirmation", {'order': order})
 
-    @http.route(['/shop/change_sequence/'], type='json', auth="public")
+    @http.route(['/shop/change_sequence'], type='json', auth="public")
     def change_sequence(self, id, sequence):
         product_obj = request.registry.get('product.template')
         if sequence == "top":
@@ -796,7 +804,7 @@ class Ecommerce(http.Controller):
         elif sequence == "down":
             product_obj.set_sequence_down(request.cr, request.uid, [id], context=request.context)
 
-    @http.route(['/shop/change_styles/'], type='json', auth="public")
+    @http.route(['/shop/change_styles'], type='json', auth="public")
     def change_styles(self, id, style_id):
         product_obj = request.registry.get('product.template')
         product = product_obj.browse(request.cr, request.uid, id, context=request.context)
@@ -818,7 +826,7 @@ class Ecommerce(http.Controller):
 
         return not active
 
-    @http.route(['/shop/change_size/'], type='json', auth="public")
+    @http.route(['/shop/change_size'], type='json', auth="public")
     def change_size(self, id, x, y):
         product_obj = request.registry.get('product.template')
         product = product_obj.browse(request.cr, request.uid, id, context=request.context)
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index 1cdc206c4af..bfb3c142ca1 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -38,7 +38,7 @@ class product_template(osv.Model):
         res = dict.fromkeys(ids, '')
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         for product in self.browse(cr, uid, ids, context=context):
-            res[product.id] = "%s/shop/product/%s/" % (base_url, product.id)
+            res[product.id] = "%s/shop/product/%s" % (base_url, product.id)
         return res
 
     _columns = {
@@ -139,7 +139,7 @@ class product_product(osv.Model):
         res = {}
         base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         for product in self.browse(cr, uid, ids, context=context):
-            res[product.id] = "%s/shop/product/%s/" % (base_url, product.product_tmpl_id.id)
+            res[product.id] = "%s/shop/product/%s" % (base_url, product.product_tmpl_id.id)
         return res
 
     _columns = {
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js
index f85a8b22ad7..c9dd7e5e301 100644
--- a/addons/website_sale/static/src/js/website.tour.sale.js
+++ b/addons/website_sale/static/src/js/website.tour.sale.js
@@ -7,7 +7,6 @@
         id: 'shop_buy_product',
         name: "Try to buy products",
         path: '/shop',
-        testPath: '/shop',
         init: function () {
             var self = this;
             self.steps = [
@@ -22,11 +21,11 @@
                 {
                     title:     "click on add to cart",
                     waitFor:   'input[name="product_id"]:eq(1)[checked]',
-                    element:   'form[action="/shop/add_cart/"] .btn',
+                    element:   'form[action="/shop/add_cart"] .btn',
                 },
                 {
                     title:     "add suggested",
-                    element:   'form[action="/shop/add_cart/"] .btn-link:contains("Add to Cart")',
+                    element:   'form[action="/shop/add_cart"] .btn-link:contains("Add to Cart")',
                 },
                 {
                     title:     "add one more iPod",
@@ -47,19 +46,19 @@
                 {
                     title:     "go to checkout",
                     waitFor:   '#mycart_products input.js_quantity[value=1]',
-                    element:   'a[href="/shop/checkout/"]',
+                    element:   'a[href="/shop/checkout"]',
                 },
                 {
                     title:     "test with input error",
-                    element:   'form[action="/shop/confirm_order/"] .btn:contains("Confirm")',
+                    element:   'form[action="/shop/confirm_order"] .btn:contains("Confirm")',
                     onload: function (tour) {
                         $("input[name='phone']").val("");
                     },
                 },
                 {
                     title:     "test without input error",
-                    waitFor:   'form[action="/shop/confirm_order/"] .has-error',
-                    element:   'form[action="/shop/confirm_order/"] .btn:contains("Confirm")',
+                    waitFor:   'form[action="/shop/confirm_order"] .has-error',
+                    element:   'form[action="/shop/confirm_order"] .btn:contains("Confirm")',
                     onload: function (tour) {
                         if ($("input[name='name']").val() === "")
                             $("input[name='name']").val("website_sale-test-shoptest");
diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js
index bb21c300fca..fc1fb4e1165 100644
--- a/addons/website_sale/static/src/js/website_sale.editor.js
+++ b/addons/website_sale/static/src/js/website_sale.editor.js
@@ -44,7 +44,7 @@
             sequence = "up";
         else if ($a.hasClass('js_go_down'))
             sequence = "down";
-        openerp.jsonRpc('/shop/change_sequence/', 'call', {'id': $data.data('id'), 'sequence': sequence})
+        openerp.jsonRpc('/shop/change_sequence', 'call', {'id': $data.data('id'), 'sequence': sequence})
             .then(reload_enable_editor);
     });
 
@@ -55,7 +55,7 @@
         var $product = $a.parents(".oe_product:first");
 
         $li.parent().removeClass("active");
-        openerp.jsonRpc('/shop/change_styles/', 'call', {'id': $data.data('id'), 'style_id': $a.data("id")})
+        openerp.jsonRpc('/shop/change_styles', 'call', {'id': $data.data('id'), 'style_id': $a.data("id")})
             .then(function (result) {
                 $product.toggleClass($a.data("class"));
                 $li.toggleClass("active", result);
@@ -89,7 +89,7 @@
         var $data = $td.parents(".js_options:first");
         var x = $td.index()+1;
         var y = $td.parent().index()+1;
-        openerp.jsonRpc('/shop/change_size/', 'call', {'id': $data.data('id'), 'x': x, 'y': y})
+        openerp.jsonRpc('/shop/change_size', 'call', {'id': $data.data('id'), 'x': x, 'y': y})
             .then(reload_enable_editor);
     });
 
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 8298f6b22c0..21113326c7d 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -24,7 +24,7 @@ $(document).ready(function () {
         var $input = $(this);
         var value = parseInt($input.val(), 10);
         if (isNaN(value)) value = 0;
-        openerp.jsonRpc("/shop/set_cart_json/", 'call', {'order_line_id': $input.data('id'), 'set_number': value})
+        openerp.jsonRpc("/shop/set_cart_json", 'call', {'order_line_id': $input.data('id'), 'set_number': value})
             .then(function (data) {
                 if (!data) {
                     location.reload();
@@ -46,7 +46,7 @@ $(document).ready(function () {
 
         var change_cart = href.match(/change_cart\/([0-9]+)/);
         var order_line_id = change_cart && +change_cart[1] || false;
-        openerp.jsonRpc("/shop/add_cart_json/", 'call', {
+        openerp.jsonRpc("/shop/add_cart_json", 'call', {
                 'product_id': product_id,
                 'order_line_id': order_line_id,
                 'remove': $link.is('[href*="remove"]')})
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
index a256f0c3a93..0eb5daae97a 100644
--- a/addons/website_sale/tests/test_ui.py
+++ b/addons/website_sale/tests/test_ui.py
@@ -1,23 +1,23 @@
 import os
 
-import unittest2
-
 import openerp.tests
 
+inject = [
+    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
+    ("openerp.website.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.sale.js")),
+]
 
+@openerp.tests.common.at_install(False)
+@openerp.tests.common.post_install(True)
 class TestUi(openerp.tests.HttpCase):
     def test_01_admin_shop_tour(self):
-        return
         self.phantom_js("/", "openerp.website.Tour.run_test('shop')", "openerp.website.Tour.Shop", login="admin")
 
     def test_02_admin_checkout(self):
-        return
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="admin")
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="admin", inject=inject)
 
     def test_03_demo_checkout(self):
-        return
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo")
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", login="demo", inject=inject)
 
     def test_04_public_checkout(self):
-        return
-        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest")
+        self.phantom_js("/", "openerp.website.Tour.run_test('shop_buy_product')", "openerp.website.Tour.ShopTest", inject=inject)
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index b870a676cc9..71573e3dac5 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -20,7 +20,7 @@
 <template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
   <xpath expr="//header//ul[@id='top_menu']/li" position="before">
       <li t-att-class="(not website_sale_order or not website_sale_order.get_number_of_products()) and 'hidden' or ''">
-          <a href="/shop/mycart/">
+          <a href="/shop/mycart">
               <i class="fa fa-shopping-cart"></i>
               My cart <sup t-attf-class="my_cart_quantity label label-primary"
                             t-esc="website_sale_order and website_sale_order.get_number_of_products() or ''"/>
@@ -33,19 +33,21 @@
 
 <template id="categories_recursive" name="Category list">
   <li t-att-class="int(categ) == int(category or 0) and 'active' or ''">
-      <a t-attf-href="/shop/category/#{ slug(categ) }/" t-field="categ.name"></a>
+    <t t-if="categ in all_categories">
+      <a t-attf-href="/shop/category/#{ slug(categ) }" t-field="categ.name"></a>
       <ul t-if="categ.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
           <t t-foreach="categ.child_id" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
       </ul>
+    </t>
   </li>
 </template>
 
 <!-- Product list -->
 
 <template id="search" name="Search hidden fields">
-  <form t-attf-action="/shop/{{'category/%s/' % slug(category) if category else ''}}" method="get" t-att-class="search_class">
+  <form t-attf-action="/shop/{{'category/%s' % slug(category) if category else ''}}" method="get" t-att-class="search_class">
     <input t-if="search.get('filters')" type="hidden" name="filters" t-att-value="search.get('filters')"/>
     <div class="input-group">
       <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
@@ -62,12 +64,12 @@
     <div class="ribbon btn btn-danger">Sale</div>
   </div>
   <div class="oe_product_image">
-      <a itemprop="url" t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}">
+      <a itemprop="url" t-attf-href="/shop/product/{{ slug(product) }}?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}">
           <img itemprop="image" class="img img-responsive" t-attf-src="/website/image/product.template/#{product.id}/image#{'' if product_image_big else '?max_width=300&amp;max_height=300'}"/>
       </a>
   </div>
   <section>
-      <h5><strong><a itemprop="name" t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}" t-field="product.name"/></strong></h5>
+      <h5><strong><a itemprop="name" t-attf-href="/shop/product/{{ slug(product) }}?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}" t-field="product.name"/></strong></h5>
       <div itemprop="offers" itemscope="itemscope" itemtype="http://schema.org/Offer" class="product_price" t-if="product.product_variant_ids">
           <b>
               <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
@@ -231,7 +233,7 @@
 
 <template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
   <xpath expr="//div[@class='product_price']" position="inside">
-      <form action="/shop/add_cart/" method="post" style="display: inline-block;">
+      <form action="/shop/add_cart" method="post" style="display: inline-block;">
           <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
           <a class="btn btn-default btn-xs fa fa-shopping-cart a-submit"/>
       </form>
@@ -259,7 +261,7 @@
               <div class="container">
                   <h1 class="mt32">Product not found!</h1>
                   <p>Sorry, this product is not available anymore.</p>
-                  <p><a t-attf-href="/shop/">Return to the product list.</a></p>
+                  <p><a t-attf-href="/shop">Return to the product list.</a></p>
               </div>
           </div>
       </div>
@@ -281,7 +283,7 @@
             <div class="col-sm-4">
                 <ol class="breadcrumb">
                     <li><a t-attf-href="/shop?{{ keep_query('search', 'filters', 'page') if not category else keep_query('search', 'filters') }}">Products</a></li>
-                    <li t-if="category"><a t-attf-href="/shop/category/{{ slug(category) }}/?{{ keep_query('search', 'filters', 'page') }}" t-field="category.name"/></li>
+                    <li t-if="category"><a t-attf-href="/shop/category/{{ slug(category) }}?{{ keep_query('search', 'filters', 'page') }}" t-field="category.name"/></li>
                     <li class="active"><span t-field="product.name"/></li>
                 </ol>
             </div>
@@ -306,7 +308,7 @@
             </div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
                 <h1 itemprop="name" t-field="product.name">Product Name</h1>
                 <span itemprop="url" style="display:none;" t-esc="'/shop/product/%s' % slug(product)"/>
-                <form action="/shop/add_cart/" class="js_add_cart_json" method="POST">
+                <form action="/shop/add_cart" class="js_add_cart_json" method="POST">
                     <input type="hidden" t-if="len(product.product_variant_ids) == 1" name="product_id" t-att-value="product.product_variant_ids[0].id"/>
                     <t t-if="len(product.product_variant_ids) &gt; 1">
                         <label label-default="label-default" class="radio" t-foreach="product.product_variant_ids" t-as="variant_id">
@@ -370,7 +372,7 @@
                   <div class='mt16 text-center'>
                       <span t-field="product.image_small" t-field-options='{"widget": "image", "class": "img-rounded shadow" }'/>
                       <h5>
-                          <a t-attf-href="/shop/product/#{ slug(product) }/"
+                          <a t-attf-href="/shop/product/#{ slug(product) }"
                              style="display: block">
                               <span t-field='product.name'
                                     style="display: block"/>
@@ -429,7 +431,7 @@
                                                     class='oe_attachment_embedded'></img>
                                             </t>
                                             <t t-if="attachment.file_type_icon != 'webimage'">
-                                                <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.file_type + '.png'"
+                                                <img t-att-src="'/mail/static/src/img/mimetypes' + attachment.file_type + '.png'"
                                                     class='oe_attachment_webimage'></img>
                                             </t>
                                             <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
@@ -496,7 +498,7 @@
                               </td>
                               <td t-if="line.product_id.product_tmpl_id">
                                   <div>
-                                      <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                                      <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
                                           <strong t-field="line.name"/>
                                       </a>
                                   </div>
@@ -525,7 +527,7 @@
                                       <input type="text" class="js_quantity form-control"
                                           t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
                                       <span class="input-group-addon">
-                                          <a t-attf-href="../change_cart/#{ line.id }/" class="mb8 float_left js_add_cart_json">
+                                          <a t-attf-href="../change_cart/#{ line.id }" class="mb8 float_left js_add_cart_json">
                                               <i class="fa fa-plus"></i>
                                           </a>
                                       </span>
@@ -537,7 +539,7 @@
                   </table>
                   <t t-call="website_sale.total"/>
                   <div class="clearfix"/>
-                  <a t-if="website_sale_order and website_sale_order.website_order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
+                  <a t-if="website_sale_order and website_sale_order.website_order_line" href="/shop/checkout" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
                   <div class="oe_structure"/>
               </div>
               <div class="col-lg-3 col-lg-offset-1 col-sm-3 col-md-3 text-muted" id="right_column">
@@ -562,7 +564,7 @@
 
 
 <template id="continue_shopping" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Continue Shopping Button">
-  <xpath expr="//a[@href='/shop/checkout/']" position="before">
+  <xpath expr="//a[@href='/shop/checkout']" position="before">
     <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
   </xpath>
 </template>
@@ -573,7 +575,7 @@
 <template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
       <ul class="nav nav-pills nav-stacked mt16">
-          <li t-att-class=" '' if category else 'active' "><a href="/shop/">All Products</a></li>
+          <li t-att-class=" '' if category else 'active' "><a href="/shop">All Products</a></li>
           <t t-foreach="categories" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
@@ -589,7 +591,7 @@
 
 <template id="products_attributes" inherit_id="website_sale.products" inherit_option_id="website_sale.products" name="Product attribute's Filters" groups="product.group_product_attributes">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
-      <form t-attf-action="/shop/filters/?{{ keep_query('search', category=(category and int(category))) }}" class="attributes" method="post">
+      <form t-attf-action="/shop/filters?{{ keep_query('search', category=(category and int(category))) }}" class="attributes" method="post">
           <ul class="nav nav-pills nav-stacked mt16">
               <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
               <t t-foreach="attribute_ids" t-as="attribute_id">
@@ -649,14 +651,14 @@
               <tr t-foreach="suggested_products" t-as="product">
 
                   <td>
-                      <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                      <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }">
                           <span t-field="product.image_small"
                                 t-field-options='{"widget": "image", "class": "img-rounded"}'/>
                       </a>
                   </td>
                   <td>
                       <div>
-                          <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                          <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }">
                               <strong t-field="product.name"/>
                           </a>
                       </div>
@@ -676,7 +678,7 @@
                        }'/>
                   </td>
                   <td class="text-center">
-                      <form action="/shop/add_cart/" method="post">
+                      <form action="/shop/add_cart" method="post">
                           <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
                           <a class="btn btn-link a-submit"><strong>Add to Cart</strong></a>
                       </form>
@@ -693,7 +695,7 @@
       <p>
           Have a coupon code? Fill in this field and apply.
       </p>
-      <form t-if="website_sale_order and website_sale_order.website_order_line" action="/shop/pricelist/" method="post" class="mb32">
+      <form t-if="website_sale_order and website_sale_order.website_order_line" action="/shop/pricelist" method="post" class="mb32">
           <div class="input-group">
               <input name="promo" class='form-control' type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or ''"/>
               <div class="input-group-btn">
@@ -724,13 +726,13 @@
               <li class="text-muted">Confirmation<span class="chevron"></span></li>
           </ul>
           <h1>Your Address</h1>
-          <form action="/shop/confirm_order/" method="post">
+          <form action="/shop/confirm_order" method="post">
 
           <div class="row">
           <div class="col-md-8 oe_mycart">
               <h3 class="page-header mt16">Billing Information
                   <small groups="base.group_public"> or
-                      <a class='btn btn-primary' t-if="not partner" t-attf-href="/web?redirect=#{ request.httprequest.url }">Sign in</a>
+                      <a class='btn btn-primary' t-if="not partner" t-attf-href="/web/login?redirect=#{ request.httprequest.url }">Sign in</a>
                   </small>
               </h3>
               <div class="row">
@@ -898,7 +900,7 @@
                       <tr t-foreach="website_sale_order.website_order_line" t-as="line">
                           <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
                           <td t-if="line.product_id.product_tmpl_id">
-                              <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                              <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
                                   <span t-field="line.product_id.image_small"
                                         t-field-options='{"widget": "image", "class": "img-rounded"}'/>
                               </a>
@@ -973,7 +975,7 @@
           </div>
           <div class="js_payment mb64 row" t-if="not website_sale_order.amount_total" id="payment_method">
             <div class="col-lg-8 col-sm-8">
-              <form target="_self" action="/shop/payment/validate/" method="post" class="pull-right">
+              <form target="_self" action="/shop/payment/validate" method="post" class="pull-right">
                   <a style="width:100px;" class="btn btn-primary a-submit">
                     <span>Pay Now <span class="fa fa-long-arrow-right"></span></span>
                   </a>
diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 73da87b549d..b5402c3e285 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -7,7 +7,7 @@ from openerp import SUPERUSER_ID
 
 class Ecommerce(Ecommerce):
 
-    @http.route(['/shop/payment/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/payment'], type='http', auth="public", website=True, multilang=True)
     def payment(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         order = self.get_order()
@@ -16,7 +16,7 @@ class Ecommerce(Ecommerce):
         if order and carrier_id:
             # recompute delivery costs            
             request.registry['website']._check_carrier_quotation(cr,uid,order,carrier_id,context=context)
-            return request.redirect("/shop/payment/")
+            return request.redirect("/shop/payment")
 
         res = super(Ecommerce, self).payment(**post)
         return res