diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 03d127249fb..d04030c909e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -163,8 +163,10 @@
                 <sheet string="Supplier Invoice">
                     <div class="oe_title">
                         <h1>
-                            <label string="Draft Invoice" attrs="{'invisible': [('state', '&lt;&gt;', 'draft')]}"/>
-                            <label string="Invoice" attrs="{'invisible': [('state', '=', 'draft')]}"/>
+                            <label string="Draft Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','draft'), ('type','&lt;&gt;','in_invoice')]}"/>
+                            <label string="Draft Refund" attrs="{'invisible': ['|',('state','&lt;&gt;','draft'), ('type','&lt;&gt;','in_refund')]}"/>
+                            <label string="Invoice" attrs="{'invisible': ['|',('state', '=', 'draft'), ('type','&lt;&gt;','in_invoice')]}"/>
+                            <label string="Refund" attrs="{'invisible': ['|',('state', '=', 'draft'), ('type','&lt;&gt;','in_refund')]}"/>
                             <field name="number" class="oe_inline"  attrs="{'invisible': [('state', '=', 'draft')]}"/>
                         </h1>
                     </div>
@@ -309,9 +311,11 @@
                 </header>
                 <sheet string="Invoice">
                     <h1>
-                        <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                        <label string="Draft Invoice " attrs="{'invisible': ['|',('state','not in',('draft',)), ('type','&lt;&gt;','out_invoice')]}"/>
+                        <label string="Draft Refund " attrs="{'invisible': ['|',('state','not in',('draft',)), ('type','&lt;&gt;','out_refund')]}"/>
                         <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
-                        <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                        <label string="Invoice " attrs="{'invisible': ['|',('state','in',('draft','proforma','proforma2')), ('type','&lt;&gt;','out_invoice')]}"/>
+                        <label string="Refund " attrs="{'invisible': ['|',('state','in',('draft','proforma','proforma2')), ('type','&lt;&gt;','out_refund')]}"/>
                         <field name="number" readonly="1" class="oe_inline"/>
                     </h1>
                     <field name="type" invisible="1"/>
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 1e360f6c742..d44c7c460c7 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -109,8 +109,8 @@
                                             <field name="zip" class="oe_inline" placeholder="ZIP"/>
                                             <field name="city" class="oe_inline" placeholder="City"/>
                                         </div>
-                                        <field name="state_id" placeholder="State"/>
-                                        <field name="country_id" placeholder="Country"/>
+                                        <field name="state_id" placeholder="State" options='{"no_open": true}'/>
+                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
                                     </div>
                                 </group>
                                 <group name="bank" string="Information About the Bank">
diff --git a/addons/account/wizard/pos_box.xml b/addons/account/wizard/pos_box.xml
index 6136cca06ad..46f4eeb3699 100644
--- a/addons/account/wizard/pos_box.xml
+++ b/addons/account/wizard/pos_box.xml
@@ -6,17 +6,17 @@
             <field name="model">cash.box.in</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Put Money In">
+                <form string="Put Money In" version="7.0">
                     <separator string="Fill in this form if you put money in the cash register:" colspan="4" />
-                    <field name="name" />
-                    <field name="amount" />
-
-                    <separator colspan="4" />
-                    <group colspan="4" col="4">
-                        <group col="2" colspan="2" />
-                        <button icon="gtk-stop" special="cancel" string="Cancel" />
-                        <button name="run" string="Put Money In" colspan="1" type="object" icon="gtk-apply" />
+                    <group>
+                        <field name="name" class="oe_inline"/>
+                        <field name="amount"  class="oe_inline"/>
                     </group>
+                    <footer>
+                        <button name="run" string="Put Money In" type="object" class="oe_highlight"/>
+                         or 
+                        <button special="cancel" string="Cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -35,17 +35,18 @@
             <field name="model">cash.box.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Take Money Out">
-                    <separator string="Describe why you take money from the cash register:" colspan="4" />
-                    <field name="name" />
-                    <field name="amount" />
-
-                    <separator colspan="4" />
-                    <group colspan="4" col="4">
-                        <group col="2" colspan="2" />
-                        <button icon="gtk-stop" special="cancel" string="Cancel" />
-                        <button name="run" string="Take Money Out" colspan="1" type="object" icon="gtk-apply" />
+                <form string="Take Money Out" version="7.0">
+                    <separator string="Describe why you take money from the cash register:"/>
+                    <group>
+                        <field name="name" class="oe_inline"/>
+                        <field name="amount" class="oe_inline"/>
                     </group>
+
+                    <footer>
+                        <button name="run" string="Take Money Out" type="object" class="oe_highlight"/>
+                        or 
+                        <button class="oe_link" special="cancel" string="Cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index a7be61db2c9..16ea771d123 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -49,7 +49,6 @@ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation
         "account_voucher_sequence.xml",
         "account_voucher_workflow.xml",
         "account_voucher_report.xml",
-        "wizard/account_voucher_unreconcile_view.xml",
         "wizard/account_statement_from_invoice_view.xml",
         "account_voucher_view.xml",
         "voucher_payment_receipt_view.xml",
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index ce0c64337b9..1287c7b3c18 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -46,11 +46,7 @@ class account_voucher(osv.osv):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
         for voucher in self.browse(cr, uid, ids, context=context):
-            paid = False
-            for line in voucher.move_ids:
-                if (line.account_id.type, 'in', ('receivable', 'payable')) and line.reconcile_id:
-                    paid = True
-            res[voucher.id] = paid
+            res[voucher.id] = any([((line.account_id.type, 'in', ('receivable', 'payable')) and line.reconcile_id) for line in voucher.move_ids])
         return res
 
     def _get_type(self, cr, uid, context=None):
@@ -186,15 +182,16 @@ class account_voucher(osv.osv):
         res['arch'] = etree.tostring(doc)
         return res
 
-    def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount):
+    def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount, type):
         debit = credit = 0.0
+        sign = type == 'payment' and -1 or 1
         for l in line_dr_ids:
             debit += l['amount']
         for l in line_cr_ids:
             credit += l['amount']
-        return abs(amount - abs(credit - debit))
+        return amount - sign * (credit - debit)
 
-    def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, context=None):
+    def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, type, context=None):
         context = context or {}
         if not line_dr_ids and not line_cr_ids:
             return {'value':{}}
@@ -215,7 +212,7 @@ class account_voucher(osv.osv):
                 if voucher_line.get('currency_id', company_currency) != company_currency:
                     is_multi_currency = True
                     break
-        return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount), 'is_multi_currency': is_multi_currency}}
+        return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}}
 
     def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
         if not ids: return {}
@@ -223,12 +220,13 @@ class account_voucher(osv.osv):
         res = {}
         debit = credit = 0.0
         for voucher in self.browse(cr, uid, ids, context=context):
+            sign = voucher.type == 'payment' and -1 or 1
             for l in voucher.line_dr_ids:
                 debit += l.amount
             for l in voucher.line_cr_ids:
                 credit += l.amount
             currency = voucher.currency_id or voucher.company_id.currency_id
-            res[voucher.id] =  currency_obj.round(cr, uid, currency, abs(voucher.amount - abs(credit - debit)))
+            res[voucher.id] =  currency_obj.round(cr, uid, currency, voucher.amount - sign * (credit - debit))
         return res
 
     def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
@@ -716,7 +714,7 @@ class account_voucher(osv.osv):
                 default['value']['pre_line'] = 1
             elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
                 default['value']['pre_line'] = 1
-            default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price)
+            default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price, ttype)
         return default
 
     def onchange_payment_rate_currency(self, cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=None):
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index b212c07acb3..e5e01252dff 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -274,4 +274,19 @@
         </record>
 
     </data>
+    <data noupdate="1">
+
+        <!-- After installation of the module, open the related menu -->
+        <record id="action_client_invoice_menu" model="ir.actions.client">
+            <field name="name">Open Invoicing Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
+        </record>
+        <record id="todo_open_invoice_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_invoice_menu"/>
+            <field name="type">automatic</field>
+            <field name="sequence">100</field>
+        </record>
+
+    </data>
 </openerp>
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 006a622e25f..14b725cbeca 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -40,7 +40,7 @@ class invoice(osv.osv):
             'domain': '[]',
             'context': {
                 'default_partner_id': inv.partner_id.id,
-                'default_amount': inv.residual,
+                'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
                 'default_name':inv.name,
                 'close_after_process': True,
                 'invoice_type':inv.type,
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index d8ac932a055..a30c85ffb71 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -173,12 +173,12 @@
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
-  I check that writeoff amount computed is 10.0
+  I check that writeoff amount computed is -10.0
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 1 USD/USD'), ('partner_id', '=', ref('base.res_partner_seagate'))])
     voucher_id = self.browse(cr, uid, voucher[0])
-    assert (voucher_id.writeoff_amount == 10.0), "Writeoff amount is not 10.0"
+    assert (voucher_id.writeoff_amount == -10.0), "Writeoff amount is not -10.0"
 -
   I confirm the voucher
 -
@@ -266,12 +266,12 @@
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
 -
-  I check that writeoff amount computed is 5.0
+  I check that writeoff amount computed is -5.0
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'Second payment: Case 1'), ('partner_id', '=', ref('base.res_partner_seagate'))])
     voucher_id = self.browse(cr, uid, voucher[0])
-    assert (voucher_id.writeoff_amount == 5.0), "Writeoff amount is not 5.0"
+    assert (voucher_id.writeoff_amount == -5.0), "Writeoff amount is not -5.0"
 -
   I confirm the voucher
 -
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 72f0d22aead..53db4ffaf80 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -107,11 +107,11 @@
         self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
     assert (voucher.state=='draft'), "Voucher is not in draft state"
 -
-  I check that writeoff amount computed is 50.0
+  I check that writeoff amount computed is -50.0
 -
   !python {model: account.voucher}: |
     voucher = self.browse(cr, uid, ref('account_voucher_eur_usd_case'))
-    assert (voucher.writeoff_amount == 50.0), "Writeoff amount is not 50.0"
+    assert (voucher.writeoff_amount == -50.0), "Writeoff amount is not -50.0"
 -
   I confirm the voucher
 -
@@ -167,4 +167,4 @@
     move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
     move_line = move_line_obj.browse(cr, uid, move_lines[0])
     assert (move_line.amount_residual_currency == 0.0 and move_line.amount_residual == 0.0 and invoice_id.state == 'paid') , "Residual amount is not correct for Invoice"
-    
\ No newline at end of file
+    
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 99ea3a2bbea..ef983145901 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -74,7 +74,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
-                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
+                            <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -87,7 +87,7 @@
                                     <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
-                            <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
+                            <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -332,7 +332,7 @@
 
                     <notebook>
                         <page string="Payment Information" groups="base.group_user">
-                            <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
+                            <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
@@ -348,7 +348,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
-                            <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
+                            <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
                                         on_change="onchange_move_line_id(move_line_id)"
diff --git a/addons/account_voucher/wizard/__init__.py b/addons/account_voucher/wizard/__init__.py
index bfe32ba4b83..47b87b27162 100644
--- a/addons/account_voucher/wizard/__init__.py
+++ b/addons/account_voucher/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import account_voucher_unreconcile
 import account_statement_from_invoice
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 1b921e0ccf4..6002f74c6e0 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -75,16 +75,26 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                     statement.currency.id, amount, context=ctx)
 
             context.update({'move_line_ids': [line.id]})
-            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, amount=abs(amount), currency_id= statement.currency.id, ttype=(amount < 0 and 'payment' or 'receipt'), date=line_date, context=context)
-            voucher_res = { 'type':(amount < 0 and 'payment' or 'receipt'),
+            type = 'general'
+            ttype = amount < 0 and 'payment' or 'receipt'
+            sign = 1
+            if line.journal_id.type in ('sale', 'sale_refund'):
+                type = 'customer'
+                ttype = 'receipt'
+            elif line.journal_id.type in ('purchase', 'purhcase_refund'):
+                type = 'supplier'
+                ttype = 'payment'
+                sign = -1
+            result = voucher_obj.onchange_partner_id(cr, uid, [], partner_id=line.partner_id.id, journal_id=statement.journal_id.id, amount=sign*amount, currency_id= statement.currency.id, ttype=ttype, date=line_date, context=context)
+            voucher_res = { 'type': ttype,
                             'name': line.name,
                             'partner_id': line.partner_id.id,
                             'journal_id': statement.journal_id.id,
-                            'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id), # improve me: statement.journal_id.default_credit_account_id.id
-                            'company_id':statement.company_id.id,
-                            'currency_id':statement.currency.id,
-                            'date':line.date,
-                            'amount':abs(amount),
+                            'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
+                            'company_id': statement.company_id.id,
+                            'currency_id': statement.currency.id,
+                            'date': line.date,
+                            'amount': sign*amount,
                             'period_id':statement.period_id.id}
             voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
 
@@ -97,12 +107,6 @@ class account_statement_from_invoice_lines(osv.osv_memory):
             if voucher_line_dict:
                 voucher_line_dict.update({'voucher_id': voucher_id})
                 voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
-            if line.journal_id.type == 'sale':
-                type = 'customer'
-            elif line.journal_id.type == 'purchase':
-                type = 'supplier'
-            else:
-                type = 'general'
             statement_line_obj.create(cr, uid, {
                 'name': line.name or '?',
                 'amount': amount,
@@ -112,81 +116,10 @@ class account_statement_from_invoice_lines(osv.osv_memory):
                 'statement_id': statement_id,
                 'ref': line.ref,
                 'voucher_id': voucher_id,
-                'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or,
+                'date': time.strftime('%Y-%m-%d'),
             }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 account_statement_from_invoice_lines()
 
-class account_statement_from_invoice(osv.osv_memory):
-    """
-    Generate Entries by Statement from Invoices
-    """
-    _name = "account.statement.from.invoice"
-    _description = "Entries by Statement from Invoices"
-    _columns = {
-        'date': fields.date('Date payment',required=True),
-        'journal_ids': fields.many2many('account.journal', 'account_journal_relation', 'account_id', 'journal_id', 'Journal'),
-        'line_ids': fields.many2many('account.move.line', 'account_move_line_relation', 'move_id', 'line_id', 'Invoices'),
-    }
-    _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
-    }
-
-    def search_invoices(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        line_obj = self.pool.get('account.move.line')
-        statement_obj = self.pool.get('account.bank.statement')
-        journal_obj = self.pool.get('account.journal')
-        mod_obj = self.pool.get('ir.model.data')
-        statement_id = 'statement_id' in context and context['statement_id']
-
-        data =  self.read(cr, uid, ids, context=context)[0]
-        statement = statement_obj.browse(cr, uid, statement_id, context=context)
-        args_move_line = []
-        repeated_move_line_ids = []
-        # Creating a group that is unique for importing move lines(move lines, once imported into statement lines, should not appear again)
-        for st_line in statement.line_ids:
-            args_move_line = []
-            args_move_line.append(('name', '=', st_line.name))
-            args_move_line.append(('ref', '=', st_line.ref))
-            if st_line.partner_id:
-                args_move_line.append(('partner_id', '=', st_line.partner_id.id))
-            args_move_line.append(('account_id', '=', st_line.account_id.id))
-
-            move_line_id = line_obj.search(cr, uid, args_move_line, context=context)
-            if move_line_id:
-                repeated_move_line_ids += move_line_id
-
-        journal_ids = data['journal_ids']
-        if journal_ids == []:
-            journal_ids = journal_obj.search(cr, uid, [('type', 'in', ('sale', 'cash', 'purchase'))], context=context)
-
-        args = [
-            ('reconcile_id', '=', False),
-            ('journal_id', 'in', journal_ids),
-            ('account_id.reconcile', '=', True)]
-
-        if repeated_move_line_ids:
-            args.append(('id', 'not in', repeated_move_line_ids))
-
-        line_ids = line_obj.search(cr, uid, args,
-            context=context)
-
-        model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'view_account_statement_from_invoice_lines')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-            'domain': "[('id','in', ["+','.join([str(x) for x in line_ids])+"])]",
-            'name': _('Import Entries'),
-            'context': context,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'account.statement.from.invoice.lines',
-            'views': [(resource_id,'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-
-account_statement_from_invoice()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
index 33014f394a7..7af5155a6d3 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
+++ b/addons/account_voucher/wizard/account_statement_from_invoice_view.xml
@@ -1,34 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="view_account_statement_from_invoice" model="ir.ui.view">
-            <field name="name">account.statement.from.invoice.form</field>
-            <field name="model">account.statement.from.invoice</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Import Invoices in Statement" version="7.0">
-                    <group>
-                        <field name="date"/>
-                        <field name="journal_ids"  domain="[('type','in',['sale','purchase','cash'])]"/>
-                    </group>
-                    <footer>
-                        <button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-               </form>
-            </field>
-        </record>
-
-        <record id="action_view_account_statement_from_invoice" model="ir.actions.act_window">
-            <field name="name">Import Invoices in Statement</field>
-            <field name="res_model">account.statement.from.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_account_statement_from_invoice"/>
-            <field name="target">new</field>
-        </record>
-
         <record id="view_account_statement_from_invoice_lines" model="ir.ui.view">
             <field name="name">account.statement.from.invoice.lines.form</field>
             <field name="model">account.statement.from.invoice.lines</field>
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
deleted file mode 100644
index 42a9e1c5ec2..00000000000
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from osv import osv
-from osv import fields
-
-class account_voucher_unreconcile(osv.osv_memory):
-    _name = "account.voucher.unreconcile"
-    _description = "Account voucher unreconcile"
-
-    _columns = {
-        'remove':fields.boolean('Want to remove accounting entries too ?', required=False),
-    }
-
-    _defaults = {
-        'remove': True,
-    }
-
-    def trans_unrec(self, cr, uid, ids, context=None):
-#        res = self.browse(cr, uid, ids[0])
-        if context is None:
-            context = {}
-        voucher_pool = self.pool.get('account.voucher')
-        reconcile_pool = self.pool.get('account.move.reconcile')
-        if context.get('active_id'):
-            voucher = voucher_pool.browse(cr, uid, context.get('active_id'), context=context)
-            recs = []
-            for line in voucher.move_ids:
-                if line.reconcile_id:
-                    recs += [line.reconcile_id.id]
-                if line.reconcile_partial_id:
-                    recs += [line.reconcile_partial_id.id]
-            #for rec in recs:
-            reconcile_pool.unlink(cr, uid, recs)
-#            if res.remove:
-            voucher_pool.cancel_voucher(cr, uid, [context.get('active_id')], context)
-#                wf_service = netsvc.LocalService("workflow")
-#                wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr)
-
-        return {'type': 'ir.actions.act_window_close'}
-
-account_voucher_unreconcile()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml b/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
deleted file mode 100644
index 04131b643eb..00000000000
--- a/addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <record id="view_account_voucher_unreconcile" model="ir.ui.view">
-            <field name="name">Account voucher unreconcile</field>
-            <field name="model">account.voucher.unreconcile</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="Unreconciliation" version="7.0">
-                <separator string="Unreconciliation Transactions" />
-                <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
-                <footer>
-                    <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </footer>
-             </form>
-            </field>
-        </record>
-        <record model="ir.actions.act_window" id="action_view_account_voucher_unreconcile">
-            <field name="name">Unreconcile entries</field>
-            <field name="res_model">account.voucher.unreconcile</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_account_voucher_unreconcile"/>
-            <field name="target">new</field>
-        </record>
-
-     </data>
-</openerp>
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 65eca09a9a1..a61d5e21f3a 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -14,9 +14,9 @@
                 <form string="AuditTrail Rule" version="7.0">
                    <header>
                        <button string="_Subscribe" name="subscribe" icon="gtk-ok"
-                           type="object" states="draft" />
+                           type="object" states="draft"/>
                        <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
-                           type="object" states="subscribed" />
+                           type="object" states="subscribed"/>
                        <field name="state" widget="statusbar"/>
                    </header>
                  <sheet>
@@ -29,11 +29,11 @@
                         <field name="log_create"/>
                         <field name="log_action"/>
                         <field name="log_workflow"/>
-                        <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4" />
-                        <field name="user_id" colspan="4" nolabel="1" />
+                        <separator string="Users (if User is not added then it will applicable for all users)"  colspan="4"/>
+                        <field name="user_id" colspan="4" nolabel="1"/>
                         <field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
                     </group>
-                   </sheet>  
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -44,15 +44,15 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state == 'subscribed'" string="AuditTrail Rules">
-                    <field name="name" />
+                    <field name="name"/>
                     <field name="object_id"/>
-                    <field name="log_read" />
-                    <field name="log_write" />
-                    <field name="log_unlink" />
-                    <field name="log_create" />
+                    <field name="log_read"/>
+                    <field name="log_write"/>
+                    <field name="log_unlink"/>
+                    <field name="log_create"/>
                     <field name="log_action"/>
                     <field name="log_workflow"/>
-                    <field name="state" />
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -108,36 +108,36 @@
                         <form string="Log Lines" version="7.0">
                             <group col="4">
                             <field name="field_id" colspan="4"
-                                readonly="1" />
-                            <newline />
+                                readonly="1"/>
+                            <newline/>
                             <field name="field_description" colspan="4"
-                                readonly="1" />
-                            <newline />
+                                readonly="1"/>
+                            <newline/>
                             <separator string="Old Value : "
-                                colspan="2" />
+                                colspan="2"/>
                             <separator string="New Value : "
-                                colspan="2" />
-                            <newline />
+                                colspan="2"/>
+                            <newline/>
                             <field name="old_value" nolabel="1"
-                                colspan="2" readonly="1" />
+                                colspan="2" readonly="1"/>
                             <field name="new_value" nolabel="1"
-                                colspan="2" readonly="1" />
-                            <newline />
+                                colspan="2" readonly="1"/>
+                            <newline/>
                             <separator string="Old Value Text : "
-                                colspan="2" />
+                                colspan="2"/>
                             <separator string="New Value Text: "
-                                colspan="2" />
-                            <newline />
+                                colspan="2"/>
+                            <newline/>
                             <field name="old_value_text" nolabel="1"
-                                colspan="2" readonly="1" />
+                                colspan="2" readonly="1"/>
                             <field name="new_value_text" nolabel="1"
-                                colspan="2" readonly="1" />
+                                colspan="2" readonly="1"/>
                             </group>
                         </form>
                         <tree string="Log Lines">
-                            <field name="field_description" />
-                            <field name="old_value_text" />
-                            <field name="new_value_text" />
+                            <field name="field_description"/>
+                            <field name="old_value_text"/>
+                            <field name="new_value_text"/>
                         </tree>
                     </field>
                   </sheet>
@@ -151,11 +151,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="AuditTrail Logs">
-                    <field name="timestamp" />
-                    <field name="name" />
-                    <field name="object_id" />
-                    <field name="method" />
-                    <field name="user_id" />
+                    <field name="timestamp"/>
+                    <field name="name"/>
+                    <field name="object_id"/>
+                    <field name="method"/>
+                    <field name="user_id"/>
                 </tree>
             </field>
         </record>
@@ -185,7 +185,7 @@
             <field name="search_view_id" ref="view_audittrail_log_search"/>
         </record>
 
-        <menuitem id="menu_audit_logs" name="Audit Logs" parent="menu_audit" action="action_audittrail_log_tree" />
+        <menuitem id="menu_audit_logs" name="Audit Logs" parent="menu_audit" action="action_audittrail_log_tree"/>
 
     </data>
 </openerp>
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index 0ee7f98a020..dc81730daf2 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -21,7 +21,7 @@
 
 import logging
 import os
-import sys
+import tempfile
 import urllib
 
 import werkzeug.urls
@@ -31,53 +31,51 @@ from openerp.modules.registry import RegistryManager
 try:
     import openerp.addons.web.common.http as openerpweb
 except ImportError:
-    import web.common.http as openerpweb
+    import web.common.http as openerpweb    # noqa
 
 from openid import oidutil
-from openid.store import memstore
-#from openid.store import filestore
+from openid.store import filestore
 from openid.consumer import consumer
 from openid.cryptutil import randomString
 from openid.extensions import ax, sreg
 
 from .. import utils
 
-
-
 _logger = logging.getLogger(__name__)
 oidutil.log = _logger.debug
 
+_storedir = os.path.join(tempfile.gettempdir(), 'openerp-auth_openid-store')
 
 class GoogleAppsAwareConsumer(consumer.GenericConsumer):
     def complete(self, message, endpoint, return_to):
         if message.getOpenIDNamespace() == consumer.OPENID2_NS:
-            server_url = message.getArg(consumer.OPENID2_NS, 'op_endpoint', consumer.no_default)
+            server_url = message.getArg(consumer.OPENID2_NS, 'op_endpoint', '')
             if server_url.startswith('https://www.google.com/a/'):
-                # update fields
-                for attr in ['claimed_id', 'identity']:
-                    value = message.getArg(consumer.OPENID2_NS, attr)
-                    value = 'https://www.google.com/accounts/o8/user-xrds?uri=%s' % urllib.quote_plus(value)
-                    message.setArg(consumer.OPENID2_NS, attr, value)
-
-                # now, resign the message
                 assoc_handle = message.getArg(consumer.OPENID_NS, 'assoc_handle')
                 assoc = self.store.getAssociation(server_url, assoc_handle)
-                message.delArg(consumer.OPENID2_NS, 'sig')
-                message.delArg(consumer.OPENID2_NS, 'signed')
-                message = assoc.signMessage(message)
+                if assoc:
+                    # update fields
+                    for attr in ['claimed_id', 'identity']:
+                        value = message.getArg(consumer.OPENID2_NS, attr, '')
+                        value = 'https://www.google.com/accounts/o8/user-xrds?uri=%s' % urllib.quote_plus(value)
+                        message.setArg(consumer.OPENID2_NS, attr, value)
 
-        return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to) 
+                    # now, resign the message
+                    message.delArg(consumer.OPENID2_NS, 'sig')
+                    message.delArg(consumer.OPENID2_NS, 'signed')
+                    message = assoc.signMessage(message)
+
+        return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to)
 
 
 class OpenIDController(openerpweb.Controller):
     _cp_path = '/auth_openid/login'
 
-    _store = memstore.MemoryStore()  # TODO use a filestore
+    _store = filestore.FileOpenIDStore(_storedir)
 
     _REQUIRED_ATTRIBUTES = ['email']
     _OPTIONAL_ATTRIBUTES = 'nickname fullname postcode country language timezone'.split()
 
-
     def _add_extensions(self, request):
         """Add extensions to the request"""
 
@@ -118,8 +116,20 @@ class OpenIDController(openerpweb.Controller):
     def _get_realm(self, req):
         return req.httprequest.host_url
 
+    @openerpweb.httprequest
+    def verify_direct(self, req, db, url):
+        result = self._verify(req, db, url)
+        if 'error' in result:
+            return werkzeug.exceptions.BadRequest(result['error'])
+        if result['action'] == 'redirect':
+            return werkzeug.utils.redirect(result['value'])
+        return result['value']
+
     @openerpweb.jsonrequest
     def verify(self, req, db, url):
+        return self._verify(req, db, url)
+
+    def _verify(self, req, db, url):
         redirect_to = werkzeug.urls.Href(req.httprequest.host_url + 'auth_openid/login/process')(session_id=req.session_id)
         realm = self._get_realm(req)
 
@@ -145,7 +155,6 @@ class OpenIDController(openerpweb.Controller):
             form_html = request.htmlMarkup(realm, redirect_to)
             return {'action': 'post', 'value': form_html, 'session_id': req.session_id}
 
-    
     @openerpweb.httprequest
     def process(self, req, **kw):
         session = getattr(req.session, 'openid_session', None)
@@ -185,10 +194,8 @@ class OpenIDController(openerpweb.Controller):
                         domain += ['|', ('openid_email', '=', False)]
                     domain += [('openid_email', '=', openid_email)]
 
-                    domain += [
-                               ('openid_url', '=', openid_url),
-                               ('active', '=', True),
-                              ]
+                    domain += [('openid_url', '=', openid_url), ('active', '=', True)]
+
                     ids = Users.search(cr, 1, domain)
                     assert len(ids) < 2
                     if ids:
@@ -199,12 +206,11 @@ class OpenIDController(openerpweb.Controller):
                         # TODO fill empty fields with the ones from sreg/ax
                         cr.commit()
 
-                        u = req.session.login(dbname, login, key)
+                        req.session.authenticate(dbname, login, key, {})
 
             if not user_id:
                 session['message'] = 'This OpenID identifier is not associated to any active users'
 
-                
         elif info.status == consumer.SETUP_NEEDED:
             session['message'] = info.setup_url
         elif info.status == consumer.FAILURE and display_identifier:
@@ -217,9 +223,8 @@ class OpenIDController(openerpweb.Controller):
             # information in a log.
             session['message'] = 'Verification failed.'
 
-
         fragment = '#loginerror' if not user_id else ''
-        return werkzeug.utils.redirect('/'+fragment)
+        return werkzeug.utils.redirect('/' + fragment)
 
     @openerpweb.jsonrequest
     def status(self, req):
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d48795173ed..0e12d835710 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -12,7 +12,7 @@
                     <header>
                         <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
                         <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
-                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                         <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
                         <field name="state" widget="statusbar"
                             statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
@@ -20,36 +20,36 @@
                     <sheet>
 
                         <div class="oe_title">
-                            <label for="email" string="Invitation To" class="oe_edit_only" /> 
+                            <label for="email" string="Invitation To" class="oe_edit_only"/>
                             <h1>
-                                <field name="email" class="oe_inline" />
-                                (<field name="language" class="oe_inline" />)
+                                <field name="email" class="oe_inline"/>
+                                (<field name="language" class="oe_inline"/>)
                             </h1>
-                            
+
                             <h2>
-                                From <field name="event_date" class="oe_inline" />
+                                From <field name="event_date" class="oe_inline"/>
                                 to <field name="event_end_date" class="oe_inline"/>
                             </h2>
                         </div>
                         <group>
                             <group>
-                                <field name="sent_by_uid" string="Invitation From" />
+                                <field name="sent_by_uid" string="Invitation From"/>
                                 <field name="user_id" string="Invited User"/>
-                                <field name="partner_id" string="Contact" />
+                                <field name="partner_id" string="Contact"/>
                             </group>
                             <group>
-                                <field name="cutype" string="Invitation Type" />
-                                <field name="role" string="Role" />
-                                <field name="rsvp" />
+                                <field name="cutype" string="Invitation Type"/>
+                                <field name="role" string="Role"/>
+                                <field name="rsvp"/>
                                 <field name="ref" readonly="1"/>
                             </group>
                         </group>
                         <group>
                             <group string="Delegated From">
-                                <field name="parent_ids" readonly="1" nolabel="1" />
+                                <field name="parent_ids" readonly="1" nolabel="1"/>
                             </group>
                             <group string="Delegated To" >
-                                <field name="child_ids" readonly="1" nolabel="1" />
+                                <field name="child_ids" readonly="1" nolabel="1"/>
                             </group>
                         </group>
                     </sheet>
@@ -65,12 +65,12 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Invitation details">
-                    <field name="sent_by_uid" string="Invitation From" />
+                    <field name="sent_by_uid" string="Invitation From"/>
                     <field name="role" string="My Role"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="cutype" string="Invitation Type"/>
-                    <field name="state" />
+                    <field name="state"/>
                     <field name="rsvp" string="Required to Join"/>
                 </tree>
             </field>
@@ -86,20 +86,20 @@
                 <search string="Search Invitations">
                     <field name="email" string="Email"/>
                     <field name="event_date"/>
-                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review" />
-                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations" />
-                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations" />
-                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations" />
+                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review"/>
+                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations"/>
+                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations"/>
+                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations"/>
                     <field name="user_id" string="Responsible"/>
                     <field name="cutype" string="Invitation type"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}" />
-                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}" />
-                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}" />
-                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}" />
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}"/>
+                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}"/>
+                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
-                            domain="[]" context="{'group_by':'state'}" />
+                            domain="[]" context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
@@ -110,7 +110,7 @@
              <field name="res_model">calendar.attendee</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
+             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view"/>
              <field name="context">{'default_sent_by_uid': uid}</field>
          </record>
 
@@ -122,7 +122,7 @@
 
          <menuitem id="menu_attendee_invitations"
             parent="base.menu_calendar_configuration"
-            sequence="10" action="action_view_attendee_form" />
+            sequence="10" action="action_view_attendee_form"/>
 
         <!--        ALARM FORM VIEW-->
 
@@ -133,13 +133,13 @@
             <field name="arch" type="xml">
                 <form string="Reminder details" version="7.0">
                     <group col="4">
-                        <field name="name" />
-                        <field name="active" />
-                        <separator string="Reminder Details" colspan="4" />
-                        <field name="trigger_duration" />
-                        <field name="trigger_interval" />
-                        <field name="trigger_occurs" />
-                        <field name="trigger_related" />
+                        <field name="name"/>
+                        <field name="active"/>
+                        <separator string="Reminder Details" colspan="4"/>
+                        <field name="trigger_duration"/>
+                        <field name="trigger_interval"/>
+                        <field name="trigger_occurs"/>
+                        <field name="trigger_related"/>
                     </group>
                 </form>
             </field>
@@ -169,7 +169,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to setup a new alarm type. 
+                Click to setup a new alarm type.
               </p><p>
                 You can define a customized type of calendar alarm that may be
                 assigned to calendar events or meetings.
@@ -195,25 +195,25 @@
                 <header>
                     <button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
                     <button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
-                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object" />
+                    <button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object"/>
                     <field name="state" widget="statusbar"
                         statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
                 <sheet>
                     <group col="6">
                         <field name="name" string="Summary"
-                            colspan="4" required="1" />
-                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" />
+                            colspan="4" required="1"/>
+                        <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)"/>
                         <newline/>
                         <field name="date" string="Start Date" required="1"
-                            on_change="onchange_dates(date,duration,False,allday)" />
+                            on_change="onchange_dates(date,duration,False,allday)"/>
                         <field name="duration" widget="float_time"
                             on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
                         <field name="date_deadline" string="End Date" required="1"
-                            on_change="onchange_dates(date,False,date_deadline)" />
-                        <field name="location" />
+                            on_change="onchange_dates(date,False,date_deadline)"/>
+                        <field name="location"/>
                         <field name="alarm_id" string="Reminder"
-                            widget="selection" />
+                            widget="selection"/>
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
                            <field name="recurrency"/>
                         </group>
@@ -222,11 +222,11 @@
                     <page string="Event">
                         <group col="6" colspan="4">
                              <separator colspan="6" string="Visibility"/>
-                             <field name="user_id" string="Responsible User" />
+                             <field name="user_id" string="Responsible User"/>
                              <field name="show_as" string="Show Time as"/>
                              <field name="class" string="Privacy"/>
-                             <field name="recurrent_id" invisible="1" />
-                             <field name="recurrent_uid" invisible="1" />
+                             <field name="recurrent_id" invisible="1"/>
+                             <field name="recurrent_uid" invisible="1"/>
                         </group>
                         <separator string="Description"/>
                         <field name="description"/>
@@ -241,31 +241,31 @@
                             <tree string="Invitation details" editable="top">
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>
-                                <field name="email" />
-                                <field name="role" width="200" />
-                                <field name="state" />
+                                <field name="email"/>
+                                <field name="role" width="200"/>
+                                <field name="state"/>
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
                                     string="Uncertain" type="object"
-                                    icon="terp-crm" />
+                                    icon="terp-crm"/>
                                 <button name="do_accept" string="Accept"
                                     states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
+                                    type="object" icon="gtk-apply"/>
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
+                                    type="object" icon="gtk-cancel"/>
                                 <button
                                     name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                                     string="Delegate" type="action"
                                     icon="gtk-sort-descending"
                                     states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
                                     <page string="Details">
                                         <group col="4">
-                                            <field name="email" />
+                                            <field name="email"/>
                                             <field name="rsvp"/>
                                             <field name="cutype"/>
                                             <field name="role"/>
@@ -276,24 +276,24 @@
                                                 states="needs-action,declined,accepted"
                                                 string="Uncertain"
                                                 type="object"
-                                                icon="terp-crm" />
+                                                icon="terp-crm"/>
                                             <button name="do_accept"
                                                 string="Accept"
                                                 states="needs-action,tentative,declined"
                                                 type="object"
-                                                icon="gtk-apply" />
+                                                icon="gtk-apply"/>
                                             <button name="do_decline"
                                                 string="Decline"
                                                 states="needs-action,tentative,accepted"
                                                 type="object"
-                                                icon="gtk-cancel" />
+                                                icon="gtk-cancel"/>
                                             <button
                                                 name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                                                 string="Delegate"
                                                 type="action"
                                                 icon="gtk-sort-descending"
                                                 states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                                         </group>
                                     </page>
                                     </notebook>
@@ -304,49 +304,49 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}" />
-                                <field name="interval" />
+                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                                <field name="interval"/>
                                 <separator string="End of Recurrence" colspan="4"/>
-                                <field name="end_type" />
-                                <label string=" " colspan="2" />
-                                <newline />
+                                <field name="end_type"/>
+                                <label string=" " colspan="2"/>
+                                <newline/>
                                 <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }"/>
-                                <label string=" " colspan="2" />
-                                <newline />
+                                <label string=" " colspan="2"/>
+                                <newline/>
                                 <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')] }"/>
-                                <newline />
+                                <newline/>
 
 
                             </group>
                             <group col="8" colspan="4" name="Select weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
                                 <separator string="Choose day where repeat the meeting" colspan="8"/>
-                                <field name="mo" colspan="1" />
-                                <field name="tu" colspan="1" />
-                                <field name="we" colspan="1" />
-                                <field name="th" colspan="1" />
+                                <field name="mo" colspan="1"/>
+                                <field name="tu" colspan="1"/>
+                                <field name="we" colspan="1"/>
+                                <field name="th" colspan="1"/>
+                                <newline/>
+                                <field name="fr" colspan="1"/>
+                                <field name="sa" colspan="1" />
+                                <field name="su" colspan="1" />
                                 <newline/>
-                                <field name="fr" colspan="1" />
-                                <field name="sa" colspan="1"  />
-                                <field name="su" colspan="1"  />
-                                <newline />
                             </group>
                             <group col="10" colspan="4"
                                 attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
                                 <separator string="Choose day in the month where repeat the meeting" colspan="12"/>
                                 <group col="2" colspan="1">
-                                    <field name="select1" />
+                                    <field name="select1"/>
                                 </group>
                                 <group col="2" colspan="1">
                                     <field name="day"
                                         attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" />
+                                            'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}"/>
                                 </group>
                                 <group col="3" colspan="1"
                                     attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}">
                                     <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
                                     <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}" />
+                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')]}"/>
                                 </group>
                             </group>
                         </group>
@@ -366,11 +366,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Events">
-                    <field name="name" string="Subject" />
-                    <field name="date" string="Event Date" />
-                    <field name="location" />
-                    <field name="show_as" />
-                    <field name="class" string="Privacy" />
+                    <field name="name" string="Subject"/>
+                    <field name="date" string="Event Date"/>
+                    <field name="location"/>
+                    <field name="show_as"/>
+                    <field name="class" string="Privacy"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state" invisible="1"/>
                 </tree>
@@ -404,16 +404,16 @@
                     <field name="name" filter_domain="['|',('name','ilike',self),('location','ilike',self)]" string="Event"/>
                     <field name="show_as"/>
                     <field name="class" string="Privacy"/>
-                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events" />
+                    <filter icon="terp-go-today" string="My Events" domain="[('user_id','=',uid)]" help="My Events"/>
                     <separator/>
-                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events" />
+                    <filter icon="terp-check" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Events"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}" />
-                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" />
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'show_as'}"/>
+                        <filter string="Privacy" icon="terp-locked" domain="[]" context="{'group_by':'class'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
@@ -435,7 +435,7 @@
 
         <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
-                sequence="15" action="action_view_event" />
+                sequence="15" action="action_view_event"/>
 
      </data>
  </openerp>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index a70bca5ec09..a97d2967ffa 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -91,7 +91,7 @@
                     <page string="Meeting Detail">
                         <group>
                             <group>
-                                <field name="user_id" />
+                                <field name="user_id"/>
                                 <field name="categ_ids" widget="many2many_tags"/>
                                 <field name="location"/>
                                 <field name="organizer" groups="base.group_no_one"/>
diff --git a/addons/caldav/i18n/mn.po b/addons/caldav/i18n/mn.po
new file mode 100644
index 00000000000..c54fff471b3
--- /dev/null
+++ b/addons/caldav/i18n/mn.po
@@ -0,0 +1,821 @@
+# 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-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-10 08:54+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: 2012-08-11 05:46+0000\n"
+"X-Generator: Launchpad (build 15780)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: help:caldav.browse,url:0
+msgid "Url of the caldav server, use for synchronization"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:99
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"There is no buit-in way to synchronize calendar with caldav.\n"
+"So you need to install a third part software : Calendar (CalDav)\n"
+"for now it's the only one\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Open Calendar Sync\n"
+"   I'll get an interface with 2 tabs\n"
+"   Stay on the first one\n"
+"\n"
+"2. CaDAV Calendar URL : put the URL given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"3. Put your openerp username and password\n"
+"\n"
+"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
+"\n"
+"5. Then you can synchronize manually or custom the settings to synchronize "
+"every x minutes.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide Path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:basic.calendar.fields:0
+msgid "Can not map a field more than once"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,help:caldav.action_caldav_form
+msgid ""
+"\"Calendars\" allow you to Customize calendar event and todo attribute with "
+"any of OpenERP model.Caledars provide iCal Import/Export "
+"functionality.Webdav server that provides remote access to calendar.Help You "
+"to synchronize Meeting with Calendars client.You can access Calendars using "
+"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#: code:addons/caldav/calendar.py:879
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Todo"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_user_preference
+msgid "User preference Form"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,service:0
+msgid "Services"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Evolution"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:123
+#, python-format
+msgid ""
+"\n"
+"    1. Go to Calendar View\n"
+"\n"
+"    2. File -> New -> Calendar\n"
+"\n"
+"    3. Fill the form\n"
+"        - type : CalDav\n"
+"        - name : Whaterver you want (ie : Meeting)\n"
+"        - url : "
+"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
+"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
+"given on the top of this window\n"
+"        - uncheck \"User SSL\"\n"
+"        - Username : Your username (ie : Demo)\n"
+"        - Refresh : everytime you want that evolution synchronize the data "
+"with the server\n"
+"\n"
+"    4. Click ok and give your openerp password\n"
+"\n"
+"    5. A new calendar named with the name you gave should appear on the left "
+"side.\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:879
+#, python-format
+msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Caldav's host name configuration"
+msgstr ""
+
+#. module: caldav
+#: field:caldav.browse,url:0
+msgid "Caldav Server"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Datetime In UTC"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "iPhone"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Энгийн талбар"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:789
+#, python-format
+msgid "Can not create line \"%s\" more than once"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Webcal Calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+#: view:user.preference:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+#: field:user.preference,collection:0
+msgid "Calendar Collection"
+msgstr "Каледарын Цуглуулга"
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "_Open"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Next"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_caldav_browse
+msgid "Caldav Browse"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Android based device"
+msgstr "Андройд дээр суурилсан төхөөрөмж"
+
+#. module: caldav
+#: view:user.preference:0
+msgid "Configure your openerp hostname. For example : "
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+#: field:user.preference,calendar:0
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid ""
+"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+msgstr ""
+"Уучлаарай python-vobject эндээс http://vobject.skyhouseconsulting.com/ "
+"суулгана уу"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:63
+#, python-format
+msgid "Invalid format of the ics, file can not be imported"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,service:0
+msgid "CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr "Мессеж"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:815
+#: sql_constraint:basic.calendar.alias:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:32
+#, python-format
+msgid ""
+"\n"
+"  * Webdav server that provides remote access to calendar\n"
+"  * Synchronisation of calendar using WebDAV\n"
+"  * Customize calendar event and todo attribute with any of OpenERP model\n"
+"  * Provides iCal Import/Export functionality\n"
+"\n"
+"    To access Calendars using CalDAV clients, point them to:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    To access OpenERP Calendar using WebCal to remote site use the URL "
+"like:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      Where,\n"
+"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
+"created\n"
+"     "
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "User Preference"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS File"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,device:0
+msgid "Software/Devices"
+msgstr "Програм /Төхөөрөмжүүд"
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:141
+#, python-format
+msgid ""
+"\n"
+"Prerequire\n"
+"----------\n"
+"If you are using thunderbird, first you need to install the lightning "
+"module\n"
+"http://www.mozilla.org/projects/calendar/lightning/\n"
+"\n"
+"configuration\n"
+"-------------\n"
+"\n"
+"1. Go to Calendar View\n"
+"\n"
+"2. File -> New Calendar\n"
+"\n"
+"3. Chosse \"On the Network\"\n"
+"\n"
+"4. for format choose CalDav\n"
+"   and as location the url given above (ie : "
+"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
+"\n"
+"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
+"\"alarm\"\n"
+"\n"
+"6. Then put your openerp login and password (to give the password only check "
+"the box \"Use password Manager to remember this password\"\n"
+"\n"
+"7. Then Finish, your meetings should appear now in your calendar view\n"
+msgstr ""
+
+#. module: caldav
+#: view:caldav.browse:0
+msgid "Browse Caldav"
+msgstr ""
+
+#. module: caldav
+#: field:user.preference,host_name:0
+msgid "Host Name"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Other"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "My Calendar(s)"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: view:user.preference:0
+msgid "database.my.openerp.com  or companyserver.com"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,description:0
+#: view:caldav.browse:0
+#: field:caldav.browse,description:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:1293
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "vobject Import Error!"
+msgstr "vobject Импорт алдаа !"
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr "ICS файл хадгалах"
+
+#. module: caldav
+#: code:addons/caldav/wizard/caldav_browse.py:50
+#, python-format
+msgid ""
+"\n"
+"    For SSL specific configuration see the documentation below\n"
+"\n"
+"Now, to setup the calendars, you need to:\n"
+"\n"
+"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
+"page.\n"
+"2. Go to \"Add account...\"\n"
+"3. Click on \"Other\"\n"
+"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
+"\n"
+"5. Enter the host's name\n"
+"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
+"openerp.com is the host)\n"
+"\n"
+"6. Fill Username and password with your openerp login and password\n"
+"\n"
+"7. As a description, you can either leave the server's name or\n"
+"   something like \"OpenERP calendars\".\n"
+"\n"
+"9. If you are not using a SSL server, you'll get an error, do not worry and "
+"push \"Continue\"\n"
+"\n"
+"10. Then click to \"Advanced Settings\" to specify the right\n"
+"    ports and paths.\n"
+"\n"
+"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
+"\n"
+"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
+"    the url given by the wizard (ie : "
+"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
+"\n"
+"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
+"    and verify it can use the account.\n"
+"\n"
+"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
+"    Your OpenERP calendars will be visible inside the selection of the\n"
+"    \"Calendars\" button.\n"
+"    Note that when creating a new calendar entry, you will have to specify\n"
+"    which calendar it should be saved at.\n"
+"\n"
+"IF you need SSL (and your certificate is not a verified one, as usual),\n"
+"then you first will need to let the iPhone trust that. Follow these\n"
+"steps:\n"
+"\n"
+"    s1. Open Safari and enter the https location of the OpenERP server:\n"
+"      https://my.server.ip:8071/\n"
+"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
+"      is the default 8071)\n"
+"    s2. Safari will try to connect and issue a warning about the "
+"certificate\n"
+"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
+"      now trusts it.\n"
+"    "
+msgstr ""
+
+#. module: caldav
+#: selection:user.preference,device:0
+msgid "Sunbird/Thunderbird"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "MY"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr "Импортын Мессеж"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 5aa9b1fa965..88982e26791 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -41,7 +41,7 @@
 
         <!--
             CRM CASE STAGE
-            -->
+        -->
 
         <!-- Stage Search view -->
         <record id="crm_lead_stage_search" model="ir.ui.view">
@@ -77,7 +77,7 @@
 
         <!--
             LEADS/OPPORTUNITIES CATEGORIES
-            -->
+        -->
 
         <!-- Categories Form View -->
         <record id="crm_lead_categ_action" model="ir.actions.act_window">
@@ -89,7 +89,7 @@
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to define a new sales tag. 
+                Click to define a new sales tag.
               </p><p>
                 Create specific tags that fit your company's activities
                 to better classify and analyse your leads and opportunities.
@@ -105,7 +105,7 @@
 
         <!--
             LEADS
-            -->
+        -->
         <act_window
                 id="act_crm_opportunity_crm_phonecall_new"
                 name="Phone calls"
@@ -134,7 +134,7 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" type="object"  
+                    <button name="case_escalate" string="Escalate" type="object"
                             states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
                             states="cancel"/>
@@ -156,7 +156,7 @@
                     <group>
                         <group>
                             <field name="partner_name" string="Company Name"/>
-                            <field name="partner_id" string="Customer" 
+                            <field name="partner_id" string="Customer"
                                 on_change="on_change_partner(partner_id)" />
                             <label for="street" string="Address"/>
                             <div>
@@ -174,7 +174,7 @@
                             <label for="contact_name" />
                             <div>
                                 <field name="contact_name" class="oe_inline"/>,
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline"/>
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": true}'/>
                             </div>
                             <field name="email_from" widget="email"/>
                             <field name="function" />
@@ -189,7 +189,7 @@
                             -->
                         </group>
                         <group>
-                            <field name="user_id" />
+                            <field name="user_id"/>
                             <field name="section_id"/>
                             <field name="type" invisible="1"/>
                         </group>
@@ -285,282 +285,265 @@
             </field>
         </record>
 
-    <!-- CRM Lead Kanban View  -->
-    <record model="ir.ui.view" id="crm_case_kanban_view_leads">
-        <field name="name">CRM - Leads Kanban</field>
-        <field name="model">crm.lead</field>
-        <field name="type">kanban</field>
-        <field name="arch" type="xml">
-            <kanban default_group_by="stage_id">
-                <field name="state" groups="base.group_no_one"/>
-                <field name="color"/>
-                <field name="priority"/>
-                <field name="planned_revenue" sum="Expected Revenues"/>
-                <field name="user_email"/>
-                <field name="user_id"/>
-                <field name="partner_address_email"/>
-                <field name="message_summary"/>
-                <field name="needaction_pending"/>
-                <templates>
-                    <t t-name="lead_details">
-                        <ul class="oe_kanban_tooltip">
-                            <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
-                            <li><b>Probability:</b> <field name="probability"/>%%</li>
-                            <li><b>Creation date:</b> <field name="create_date"/></li>
-                            <li t-if="record.date_deadline.raw_value"><b>Date Deadline:</b> <field name="date_deadline"/></li>
-                        </ul>
-                    </t>
-                    <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
-                                <span class="oe_e">í</span>
-                                <ul class="oe_dropdown_menu">
-                                    <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
-                                    <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
-                                    <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
-                                    <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
-                                    <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
-                                </ul>
+        <!-- CRM Lead Kanban View  -->
+        <record model="ir.ui.view" id="crm_case_kanban_view_leads">
+            <field name="name">CRM - Leads Kanban</field>
+            <field name="model">crm.lead</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban default_group_by="stage_id">
+                    <field name="state" groups="base.group_no_one"/>
+                    <field name="color"/>
+                    <field name="priority"/>
+                    <field name="planned_revenue" sum="Expected Revenues"/>
+                    <field name="user_email"/>
+                    <field name="user_id"/>
+                    <field name="partner_address_email"/>
+                    <field name="message_summary"/>
+                    <field name="needaction_pending"/>
+                    <templates>
+                        <t t-name="lead_details">
+                            <ul class="oe_kanban_tooltip">
+                                <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
+                                <li><b>Probability:</b> <field name="probability"/>%%</li>
+                                <li><b>Creation date:</b> <field name="create_date"/></li>
+                                <li t-if="record.date_deadline.raw_value"><b>Date Deadline:</b> <field name="date_deadline"/></li>
+                            </ul>
+                        </t>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                    <span class="oe_e">í</span>
+                                    <ul class="oe_dropdown_menu">
+                                        <li><a type="edit" >Edit...</a></li>
+                                        <li><a type="delete">Delete</a></li>
+                                        <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
+                                        <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
+                                        <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
+                                        <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                                    </ul>
+                                </div>
+                                <div class="oe_kanban_content">
+                                    <div>
+                                        <b><field name="name"/></b>
+                                        <t t-if="record.planned_revenue.raw_value">
+                                            - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
+                                            <field name="company_currency"/></b>
+                                        </t>
+                                    </div>
+                                    <div>
+                                        <field name="partner_id"/>
+                                    </div>
+                                    <div style="padding-left: 0.5em">
+                                        <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                        <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                        <t t-if="record.date_action.raw_value"> : </t>
+                                        <field name="title_action"/>
+                                    </div>
+                                    <div class="oe_kanban_bottom_right">
+                                        <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
+                                        <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
+                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                    </div>
+                                    <div class="oe_kanban_footer_left">
+                                        <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
+                                        <t t-raw="record.message_summary.raw_value"/>
+                                    </div>
+                                </div>
+                                <div class="oe_clear"></div>
                             </div>
-                            <div class="oe_kanban_content">
-                                <div>
-                                    <b><field name="name"/></b>
-                                    <t t-if="record.planned_revenue.raw_value">
-                                        - <b><t t-esc="Math.round(record.planned_revenue.value)"/>
-                                        <field name="company_currency"/></b>
-                                    </t>
-                                </div>
-                                <div>
-                                    <field name="partner_id"/>
-                                </div>
-                                <div style="padding-left: 0.5em">
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
-                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
-                                    <t t-if="record.date_action.raw_value"> : </t>
-                                    <field name="title_action"/>
-                                </div>
-                                <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
-                                    <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
-                                    <!--
-                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kaban_status_red</t>
-                                    <span t-attf-class="oe_kanban_status #{red}"> </span>
-                                    -->
-                                    <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-                                </div>
-                                <div class="oe_kanban_footer_left">
-                                    <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
-                                    <t t-raw="record.message_summary.raw_value"/>
-                                </div>
-                            </div>
-                            <div class="oe_clear"></div>
-                        </div>
-                        <!--
-                            <div class="oe_kanban_right">
-                                <a name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="kanban-stop" />
-                                <a name="case_pending" string="Pending" states="draft,open" type="object" icon="kanban-pause" />
-                                <a name="case_open" string="Open" states="pending" type="object" icon="gtk-media-play" />
-                                <a name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="kanban-apply" />
-                            </div>
-                        -->
-                    </t>
-                </templates>
-            </kanban>
-        </field>
-    </record>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
 
-    <!-- CRM Lead Search View -->
-    <record id="view_crm_case_leads_filter" model="ir.ui.view">
-        <field name="name">CRM - Leads Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Leads">
-                <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
-                <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                <field name="subjects"/>
-                <field name="create_date"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
-                <separator/>
-                <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
-                <separator/>
-                <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
-                <separator/>
-                <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                        help="Leads that are assigned to one of the sale teams I manage, or to me"/>
-                <field name="user_id"/>
-                <field name="section_id" context="{'invisible_section': False}"/>
-                <field name="country_id" context="{'invisible_country': False}"/>
-                <group expand="0" string="Group By...">
-                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                    <separator orientation="vertical"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                </group>
-                <group string="Display">
-                    <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
-                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
-                </group>
-           </search>
-        </field>
-    </record>
+        <!-- CRM Lead Search View -->
+        <record id="view_crm_case_leads_filter" model="ir.ui.view">
+            <field name="name">CRM - Leads Search</field>
+            <field name="model">crm.lead</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Leads">
+                    <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
+                    <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
+                    <field name="subjects"/>
+                    <field name="create_date"/>
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
+                    <separator/>
+                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
+                    <separator/>
+                    <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
+                            help="Leads that are assigned to one of the sale teams I manage, or to me"/>
+                    <field name="user_id"/>
+                    <field name="section_id" context="{'invisible_section': False}"/>
+                    <field name="country_id" context="{'invisible_country': False}"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <separator orientation="vertical"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    </group>
+                    <group string="Display">
+                        <filter string="Show Countries" icon="terp-personal+" context="{'invisible_country': False}" help="Show Countries"/>
+                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                    </group>
+               </search>
+            </field>
+        </record>
 
 
-    <!--
-        OPPORTUNITY
+        <!--
+            OPPORTUNITY
         -->
 
-    <!-- Opportunities Form View -->
-    <record model="ir.ui.view" id="crm_case_form_view_oppor">
-        <field name="name">Opportunities</field>
-        <field name="model">crm.lead</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Opportunities" version="7.0">
-                <header>
-                    <button name="case_mark_won" string="Mark Won" type="object"
-                            states="draft,open,pending" class="oe_highlight"/>
-                    <button name="case_mark_lost" string="Mark Lost" type="object"
-                            states="draft,open" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="open" />
-                    <field name="stage_id" widget="statusbar" clickable="True"/>
-                </header>
-                <sheet>
-                    <div class="oe_right oe_button_box">
-                        <button string="Schedule/Log Call"
-                            name="%(opportunity2phonecall_act)d"
-                            type="action"/>
-                        <button string="Meeting"
-                            name="action_makeMeeting"
-                            type="object"
-                            context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
-                            />
-                    </div>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <label for="planned_revenue" class="oe_edit_only"/>
-                        <h2>
-                            <field name="planned_revenue" class="oe_inline"/>
-                            <field name="company_currency" class="oe_inline"/> at 
-                            <field name="probability" class="oe_inline" widget="integer"/>%% success rate
-                        </h2>
-                    </div>
-                    <group>
-                        <group>
-                            <field name="partner_id"
-                                on_change="onchange_partner_id(partner_id, email_from)"
-                                string="Customer"
-                                context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
-                            <field name="email_from" string="Email"/>
-                            <field name="phone"/>
-                        </group>
-
-                        <group>
-                            <label for="title_action"/>
-                            <div>
-                                <field name="date_action" nolabel="1"/> <label string="-" attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}"/>
-                                <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/>
-                            </div>
-                            <field name="date_deadline"/>
-                            <field name="priority"/>
-                        </group>
-
-                        <group>
-                            <field name="user_id"/>
-                            <field name="section_id" colspan="1" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="categ_ids"
-                                string="Categories" widget="many2many_tags"
-                                domain="[('object_id.model', '=', 'crm.lead')]"/>
-
-                        </group>
-                    </group>
-
-                                    <!--<button string="Mail"
-                                        name="%(mail.action_email_compose_message_wizard)d"
-                                        context="{'mail':'new', 'model': 'crm.lead'}"
-                                        icon="terp-mail-message-new" type="action" />-->
-
-                    <notebook colspan="4">
-                    <page string="Internal Notes">
-                        <field name="description"/>
-                    </page>
-                    <page string="Lead">
+        <!-- Opportunities Form View -->
+        <record model="ir.ui.view" id="crm_case_form_view_oppor">
+            <field name="name">Opportunities</field>
+            <field name="model">crm.lead</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="arch" type="xml">
+                <form string="Opportunities" version="7.0">
+                    <header>
+                        <button name="case_mark_won" string="Mark Won" type="object"
+                                states="draft,open,pending" class="oe_highlight"/>
+                        <button name="case_mark_lost" string="Mark Lost" type="object"
+                                states="draft,open" class="oe_highlight"/>
+                        <button name="case_escalate" string="Escalate" type="object"
+                                states="open" />
+                        <field name="stage_id" widget="statusbar" clickable="True"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_right oe_button_box">
+                            <button string="Schedule/Log Call"
+                                name="%(opportunity2phonecall_act)d"
+                                type="action"/>
+                            <button string="Meeting"
+                                name="action_makeMeeting"
+                                type="object"
+                                context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
+                                />
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name"/></h1>
+                            <label for="planned_revenue" class="oe_edit_only"/>
+                            <h2>
+                                <field name="planned_revenue" class="oe_inline"/>
+                                <field name="company_currency" class="oe_inline"/> at
+                                <field name="probability" class="oe_inline" widget="integer"/>%% success rate
+                            </h2>
+                        </div>
                         <group>
                             <group>
-                                <field name="partner_name"/>
-                                <label for="street" string="Address"/>
+                                <field name="partner_id"
+                                    on_change="onchange_partner_id(partner_id, email_from)"
+                                    string="Customer"
+                                    context="{'default_name': partner_name, 'default_email': email_from, 'default_phone': phone}"/>
+                                <field name="email_from" string="Email"/>
+                                <field name="phone"/>
+                            </group>
+
+                            <group>
+                                <label for="title_action"/>
                                 <div>
-                                    <field name="street" placeholder="Street..."/>
-                                    <field name="street2"/>
-                                    <div class="address_format">
-                                        <field name="city" placeholder="City" style="width: 40%%"/>
-                                        <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
-                                        <field name="zip" placeholder="ZIP" style="width: 34%%"/>
+                                    <field name="date_action" nolabel="1"/> <label string="-" attrs="{'invisible': ['|', ('date_action', '=', False), ('title_action', '=', False)]}"/>
+                                    <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/>
+                                </div>
+                                <field name="date_deadline"/>
+                                <field name="priority"/>
+                            </group>
+
+                            <group>
+                                <field name="user_id"/>
+                                <field name="section_id" colspan="1" widget="selection"/>
+                            </group>
+                            <group>
+                                <field name="categ_ids"
+                                    string="Categories" widget="many2many_tags"
+                                    domain="[('object_id.model', '=', 'crm.lead')]"/>
+
+                            </group>
+                        </group>
+
+                        <notebook colspan="4">
+                        <page string="Internal Notes">
+                            <field name="description"/>
+                        </page>
+                        <page string="Lead">
+                            <group>
+                                <group>
+                                    <field name="partner_name"/>
+                                    <label for="street" string="Address"/>
+                                    <div>
+                                        <field name="street" placeholder="Street..."/>
+                                        <field name="street2"/>
+                                        <div class="address_format">
+                                            <field name="city" placeholder="City" style="width: 40%%"/>
+                                            <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                            <field name="zip" placeholder="ZIP" style="width: 34%%"/>
+                                        </div>
+                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
                                     </div>
-                                    <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
-                                </div>
-                            </group>
+                                </group>
 
+                                <group>
+                                    <label for="contact_name" />
+                                    <div>
+                                        <field name="contact_name" class="oe_inline"/>
+                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
+                                    </div>
+                                    <field name="function" />
+                                    <field name="mobile"/>
+                                    <field name="fax"/>
+                                </group>
+
+                                <group string="Categorization">
+                                    <field name="type_id" widget="selection"/>
+                                    <field name="channel_id" widget="selection"/>
+                                </group>
+                                <group string="Mailings">
+                                    <field name="opt_out" />
+                                </group>
+                                <group string="Misc">
+                                    <field name="active"/>
+                                    <field name="day_open" groups="base.group_no_one"/>
+                                    <field name="day_close" groups="base.group_no_one"/>
+                                    <field name="referred"/>
+                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="type" invisible="1"/>
+                                </group>
+                                <group string="References">
+                                    <field name="ref"/>
+                                    <field name="ref2"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Fund Raising" groups="crm.group_fund_raising">
                             <group>
-                                <label for="contact_name" />
-                                <div>
-                                    <field name="contact_name" class="oe_inline"/>
-                                    <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
-                                </div>
-                                <field name="function" />
-                                <field name="mobile"/>
-                                <field name="fax"/>
+                                <field name="payment_mode" widget="selection"/>
+                                <field name="planned_cost"/>
                             </group>
-
-                            <group string="Categorization">
-                                <field name="type_id" widget="selection"/>
-                                <field name="channel_id" widget="selection"/>
-                            </group>
-                            <group string="Mailings">
-                                <field name="opt_out" />
-                            </group>
-                            <group string="Misc">
-                                <field name="active"/>
-                                <field name="day_open" groups="base.group_no_one"/>
-                                <field name="day_close" groups="base.group_no_one"/>
-                                <field name="referred"/>
-                                <field name="state" groups="base.group_no_one"/>
-                                <field name="type" invisible="1"/>
-                            </group>
-                            <group string="References">
-                                <field name="ref"/>
-                                <field name="ref2"/>
-                            </group>
-                        </group>
-                    </page>
-                    <page string="Fund Raising" groups="crm.group_fund_raising">
-                        <group>
-                            <field name="payment_mode" widget="selection"/>
-                            <field name="planned_cost"/>
-                        </group>
-                    </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
-                </div>
-            </form>
-        </field>
-    </record>
+                        </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
 
         <!-- Opportunities Tree View -->
         <record model="ir.ui.view" id="crm_case_tree_view_oppor">
@@ -592,48 +575,48 @@
         </record>
 
 
-    <!-- Opportunities Search View -->
-    <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
-        <field name="name">CRM - Opportunities Search</field>
-        <field name="model">crm.lead</field>
-        <field name="type">search</field>
-        <field name="arch" type="xml">
-            <search string="Search Opportunities">
-                <field name="name" string="Opportunity / Customer"
-                    filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
-                <separator/>
-                <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
-                <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
-                <separator/>
-                <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
-                <separator/>
-                <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
-                        domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                        help="Opportunities that are assigned to either me or one of the sale teams I manage" />
-                <field name="user_id"/>
-                <field name="country_id"/>
-                <field name="partner_id"/>
-                <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
-                <group expand="0" string="Group By..." colspan="16">
-                    <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                    <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                    <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                    <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                    <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
-                </group>
-                <group string="Display">
-                    <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
-                </group>
-            </search>
-        </field>
-    </record>
+        <!-- Opportunities Search View -->
+        <record id="view_crm_case_opportunities_filter" model="ir.ui.view">
+            <field name="name">CRM - Opportunities Search</field>
+            <field name="model">crm.lead</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Opportunities">
+                    <field name="name" string="Opportunity / Customer"
+                        filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
+                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <separator/>
+                    <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
+                    <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
+                    <separator/>
+                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
+                    <separator/>
+                    <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
+                            domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
+                            help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                    <field name="user_id"/>
+                    <field name="country_id"/>
+                    <field name="partner_id"/>
+                    <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <group expand="0" string="Group By..." colspan="16">
+                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Team" help="Sales Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                        <filter string="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
+                    </group>
+                    <group string="Display">
+                        <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f2c47ddee42..a0bd8326562 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -14,9 +14,9 @@
     <record id="action_crm_phonecall_unread" model="ir.values">
         <field name="name">action_crm_phonecall_unread</field>
         <field name="action_id" ref="actions_server_crm_phonecall_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_unread'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_unread'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall" />
+        <field name="model_id" ref="model_crm_phonecall"/>
         <field name="model">crm.phonecall</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -32,9 +32,9 @@
     <record id="action_crm_phonecall_read" model="ir.values">
         <field name="name">action_crm_phonecall_read</field>
         <field name="action_id" ref="actions_server_crm_phonecall_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_read'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_phonecall_read'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_crm_phonecall" />
+        <field name="model_id" ref="model_crm_phonecall"/>
         <field name="model">crm.phonecall</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -82,10 +82,10 @@
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
                     icon="gtk-index"
-                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
                 <button string="Meeting"
                     states="open,pending" icon="gtk-redo"
-                     name="action_make_meeting" type="object" />
+                     name="action_make_meeting" type="object"/>
                 <field name="state"/>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
@@ -115,14 +115,14 @@
                 <button string="Convert to Opportunity"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}" />
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}"/>
                 <button string="Convert to Opportunity" class="oe_highlight"
                         name="%(phonecall2opportunity_act)d"
                         type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}" />
+                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}"/>
                 <button string="Schedule Other Call"
                         name="%(phonecall_to_phonecall_act)d"
-                        type="action"  />
+                        type="action"/>
                 <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending"/>
@@ -131,28 +131,28 @@
             <sheet string="Phone Call">
                   <div class="oe_title">
                       <div class="oe_edit_only">
-                          <label for="name" string="Title"/> 
+                          <label for="name" string="Title"/>
                       </div>
                       <h1><field name="name" required="1"/></h1>
                       <div class="oe_edit_only">
-                        <label for="partner_phone" string="Phone" />
+                        <label for="partner_phone" string="Phone"/>
                       </div>
                       <h2><field name="partner_phone"/></h2>
                   </div>
                  <group col="4">
-                    <field name="date" />
-                    <field name="user_id" />
-                    <field name="duration" widget="float_time" />
-                    <field name="section_id" colspan="1" widget="selection" />
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="duration" widget="float_time"/>
+                    <field name="section_id" colspan="1" widget="selection"/>
                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                     <field name="categ_id" widget="selection"
                         domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="partner_mobile" />
+                    <field name="partner_mobile"/>
                     <field name="priority"/>
                     <field name="opportunity_id"/>
                 </group>
 
-                <field name="description" placeholder="Description..." />
+                <field name="description" placeholder="Description..."/>
             </sheet>
             <div class="oe_chatter">
                 <field name="message_ids" widget="mail_thread"/>
@@ -186,15 +186,15 @@
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
-                    type="action"  />
+                    type="action"/>
                 <button string="Meeting"
                      icon="gtk-redo"
-                     name="action_make_meeting" type="object" />
+                     name="action_make_meeting" type="object"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
                     icon="gtk-index"
-                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+                    type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
             </tree>
         </field>
     </record>
@@ -230,15 +230,15 @@
                <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                       help="Phone Calls that are assigned to me or to my team(s)" />
+                       help="Phone Calls that are assigned to me or to my team(s)"/>
                <field name="partner_id"/>
                <field name="user_id"/>
                <field name="section_id" string="Sales Team"/>
                <group expand="0" string="Group By...">
-                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}" />
-                   <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
-                   <filter string="Creation" icon="terp-go-month" help="Creation Date" domain="[]" context="{'group_by':'create_date'}" />
-                   <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Date of Call" />
+                   <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                   <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                   <filter string="Creation" icon="terp-go-month" help="Creation Date" domain="[]" context="{'group_by':'create_date'}"/>
+                   <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" help="Date of Call"/>
                </group>
            </search>
         </field>
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 7472b60089f..bc7892e81e4 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-23 16:46+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"PO-Revision-Date: 2012-08-10 16:25+0000\n"
+"Last-Translator: Leonardo Pistone - Agile BG - Domsense "
+"<leonardo.pistone@domsense.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: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-08-11 05:45+0000\n"
+"X-Generator: Launchpad (build 15780)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -213,7 +214,7 @@ msgstr "Telefonata"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr "Opz-out"
+msgstr "Opt-Out"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
@@ -308,8 +309,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
-"Se il campo opt.out è selezionato allora il conttatto ha rifiutato di "
-"ricevere email o si è cancellato da una campagna."
+"L'Opt-Out indica che il contatto ha rifiutato di ricevere email o si è "
+"disiscritto da una campagna."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -984,7 +985,7 @@ msgstr "Riferimento"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr "Opz-in"
+msgstr "Opt-In"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:814 code:addons/crm/crm_phonecall.py:296
@@ -2184,7 +2185,7 @@ msgstr ""
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr "Se opz-in è spuntato, il contatto ha accettato di ricevere email."
+msgstr "L'Opt-In indica che il contatto ha accettato di ricevere email."
 
 #. module: crm
 #: view:crm.meeting:0
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 2095dda37d6..c6d33b4bec2 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -38,9 +38,6 @@ class crm_configuration(osv.osv_memory):
         'module_import_google': fields.boolean("Google (Contacts and Calendar)",
             help="""Import google contact in partner address and add google calendar events details in Meeting.
                 This installs the module import_google."""),
-        'module_wiki_sale_faq': fields.boolean("share information with sales FAQ",
-            help="""This provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki Sale FAQ.
-                This installs the module wiki_sale_faq."""),
         'module_google_map': fields.boolean("add google maps on customer",
             help="""Locate customers on Google Map.
                 This installs the module google_map."""),
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 76191379258..0d09096918f 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -39,12 +39,6 @@
                         <label for="module_google_map"/>
                     </div>
                 </div>
-                <div name="Sale Features" position="inside">
-                    <div>
-                        <field name="module_wiki_sale_faq"/>
-                        <label for="module_wiki_sale_faq"/>
-                    </div>
-                </div>
             </field>
         </record>
 
diff --git a/addons/crm/wizard/crm_lead_to_opportunity_view.xml b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
index 5ad9ef1c9c9..3e7b1dc0bab 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -1,5 +1,7 @@
+<?xml version="1.0"?>
 <openerp>
     <data>
+
         <record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
             <field name="name">crm.lead2opportunity.partner.form</field>
             <field name="model">crm.lead2opportunity.partner</field>
@@ -16,20 +18,20 @@
                     <separator string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}"/>
                     <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
                         <tree>
-                            <field name="name" />
-                            <field name="partner_id" />
-                            <field name="user_id" />
-                            <field name="section_id" />
+                            <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="user_id"/>
+                            <field name="section_id"/>
                         </tree>
                     </field>
                     <footer>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
-        </record> 
+        </record>
 
         <record id="view_crm_lead2opportunity_partner_mass" model="ir.ui.view">
             <field name="name">crm.lead2opportunity.partner.mass.form</field>
@@ -40,18 +42,18 @@
                     <field name="action"/>
                     <field name="name" colspan="4"/>
                     <group string="Assigned Opportunities to">
-                        <field name="section_id" />
+                        <field name="section_id"/>
                     </group>
                     <separator string="Select Salesman"/>
                     <field name="user_ids">
                         <tree>
-                            <field name="name" />
+                            <field name="name"/>
                         </tree>
                     </field>
                     <footer>
                         <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
@@ -65,13 +67,13 @@
             <field name="view_id" ref="view_crm_lead2opportunity_partner"/>
             <field name="target">new</field>
         </record>
-           
-          <act_window id="action_crm_send_mass_convert"
+
+        <act_window id="action_crm_send_mass_convert"
             multi="True"
             key2="client_action_multi" name="Convert opportunities"
             res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
-            view_id="view_crm_lead2opportunity_partner_mass"/> 
+            view_id="view_crm_lead2opportunity_partner_mass"/>
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 74973193f24..e10272a1635 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -13,16 +13,16 @@
                     <separator string="Select Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
-                            <field name="name" />
-                            <field name="partner_id" />
-                            <field name="user_id" />
-                            <field name="section_id" />
+                            <field name="name"/>
+                            <field name="partner_id"/>
+                            <field name="user_id"/>
+                            <field name="section_id"/>
                         </tree>
                     </field>
                     <footer>
                         <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
@@ -43,7 +43,7 @@
             multi="True"
             key2="client_action_multi" name="Merge Opportunities"
             res_model="crm.merge.opportunity" src_model="crm.lead"
-            view_mode="form" target="new" view_type="form" />
+            view_mode="form" target="new" view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
index 25f7dd0ba81..dd8006c7990 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
@@ -15,7 +15,7 @@
                         <field name="name"/>
                         <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
                         <field name="partner_id" readonly="True"/>
-                        <field name="user_id" />
+                        <field name="user_id"/>
                         <field name="section_id"/>
                     </group>
                     <footer>
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index e70a053305f..f15f104f1c1 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -2,27 +2,26 @@
 <openerp>
     <data>
 
-
         <record model="ir.ui.view" id="crm_lead_forward_to_partner_form">
             <field name="name">crm_lead_forward_to_partner</field>
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
-                    <separator string="Forward to Partner" colspan="4" />
+                    <separator string="Forward to Partner" colspan="4"/>
                     <group col="4" colspan="6">
                         <field name="history" colspan="2" on_change="on_change_history(history, context)"/>
-                        <field name="send_to" colspan="2" />
+                        <field name="send_to" colspan="2"/>
                         <group col="2" colspan="2" attrs="{ 'invisible' : [('send_to','!=','user')]}">
                             <field name="user_id"
                                 attrs="{ 'required' : [('send_to','=','user')]}"
-                                on_change="on_change_email(user_id)" />
+                                on_change="on_change_email(user_id)"/>
                         </group>
                         <group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
-                            <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2" />
+                            <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2"/>
                         </group>
                     </group>
-                    <separator string="" colspan="4" />
+                    <separator string="" colspan="4"/>
                     <group col="6" colspan="4">
                         <field name="email_from" colspan="4" required="1"/>
                         <field name="email_to" colspan="4" required="1"/>
@@ -44,7 +43,7 @@
                     <footer>
                         <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel" />
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
@@ -60,7 +59,7 @@
         </record>
 
 
-        
+
         <act_window id="action_crm_send_mass_forward"
             multi="True"
             key2="client_action_multi" name="Mass forward to partner"
@@ -68,7 +67,7 @@
             view_mode="form" target="new" view_type="form"
             context="{'mail.compose.message.mode' : 'mass_mail'}"
             view_id="crm_lead_forward_to_partner_form"
-        />
+       />
 
 
 
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 8dab7756b91..92d07751e24 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <openerp>
 <data>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/>
diff --git a/addons/wiki/__init__.py b/addons/document_page/__init__.py
similarity index 98%
rename from addons/wiki/__init__.py
rename to addons/document_page/__init__.py
index f52d0c2eb50..7ce5f4b6474 100644
--- a/addons/wiki/__init__.py
+++ b/addons/document_page/__init__.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-import wiki
+import document_page
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/__openerp__.py b/addons/document_page/__openerp__.py
similarity index 59%
rename from addons/wiki/__openerp__.py
rename to addons/document_page/__openerp__.py
index 4c413b6050b..bff40744805 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/document_page/__openerp__.py
@@ -20,38 +20,41 @@
 ##############################################################################
 
 {
-    'name': 'Wiki',
+    'name': 'Document Page',
     'version': '1.0.1',
     'category': 'Knowledge Management',
     'description': """
-The base module to manage documents(wiki).
-==========================================
-
-Keep track of Wiki groups, pages, and history.
+Pages
+=====
+Web pages
     """,
-    'author': ['OpenERP SA', 'Axelor'],
-    'website': 'http://openerp.com',
+    'author': ['OpenERP SA'],
+    'website': 'http://www.openerp.com/',
     'depends': ['knowledge'],
-    'web_depends': ['widget_wiki'],
     'init_xml': [],
     'update_xml': [
-        'wizard/wiki_wiki_page_open_view.xml',
-        'wizard/wiki_create_menu_view.xml',
-        'wizard/wiki_make_index_view.xml',
-        'wizard/wiki_show_diff_view.xml',
-        'wiki_view.xml',
-        'data/wiki_quickstart.xml',
-        'data/wiki_main.xml',
-        'security/wiki_security.xml',
-        'security/ir.model.access.csv'
+        'wizard/document_page_create_menu_view.xml',
+        'wizard/document_page_show_diff_view.xml',
+        'document_page_view.xml',
+        'security/document_page_security.xml',
+        'security/ir.model.access.csv',
+    ],
+    'demo_xml': [
+        'document_page_demo.xml'
+    ],
+    'test': [
+        'test/document_page_test00.yml'
     ],
-    'demo_xml': ['wiki_demo.xml'],
-    'test': ['test/wiki_test00.yml'],
     'installable': True,
     'auto_install': False,
     'certificate': '0086363630317',
-    'web': True,
-    'images': ['images/create_index.jpeg','images/page_history.jpeg','images/wiki_groups.jpeg','images/wiki_pages.jpeg'],
-    'js': ['static/src/lib/wiky/wiky.js', 'static/src/js/wiki.js'],
+    'images': [],
+    'js': [
+        'static/src/lib/wiky/wiky.js', 
+        'static/src/js/document_page.js'
+    ],
+    'css' : [
+        "static/src/css/document_page.css"
+    ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/data/wiki_main.xml b/addons/document_page/data/wiki_main.xml
similarity index 100%
rename from addons/wiki/data/wiki_main.xml
rename to addons/document_page/data/wiki_main.xml
diff --git a/addons/wiki/data/wiki_quickstart.xml b/addons/document_page/data/wiki_quickstart.xml
similarity index 100%
rename from addons/wiki/data/wiki_quickstart.xml
rename to addons/document_page/data/wiki_quickstart.xml
diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
new file mode 100644
index 00000000000..7304e2e9075
--- /dev/null
+++ b/addons/document_page/document_page.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+import difflib
+import tools
+
+class document_page(osv.osv):
+    _name = "document.page"
+    _description = "Document Page"
+    _order = 'name'
+
+    def _get_page_index(self, cr, uid, page):
+        index = []
+        for subpage in page.child_ids:
+            index += ["<li>"+ self._get_page_index(cr, uid, subpage) +"</li>"]
+        r = '<a href="#id=%s">%s</a>'%(page.id,page.name)
+        if index:
+            r += "<ul>" + "".join(index) + "</ul>"
+        return r
+
+    def _get_display_content(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for page in self.browse(cr, uid, ids, context=context):
+            if page.type == "category":
+               content = self._get_page_index(cr, uid, page)
+            else:
+               content = page.content
+            res[page.id] =  content
+        return res
+
+    _columns = {
+        'name': fields.char('Title', required=True),
+        'type':fields.selection([('content','Content'), ('category','Category')], 'Type', help="Page type"), 
+
+        'parent_id': fields.many2one('document.page', 'Category', domain=[('type','=','category')]),
+        'child_ids': fields.one2many('document.page', 'parent_id', 'Children'),
+
+        'content': fields.text("Content"),
+        'display_content': fields.function(_get_display_content, string='Displayed Content', type='text'),
+
+        'history_ids': fields.one2many('document.page.history', 'page_id', 'History'),
+        'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
+
+        'create_date': fields.datetime("Created on", select=True, readonly=True),
+        'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
+        'write_date': fields.datetime("Modification Date", select=True, readonly=True),
+        'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
+    }
+    _defaults = {
+        'type':'content',
+    }
+
+    def onchange_parent_id(self, cr, uid, ids, parent_id, content, context=None):
+        res = {}
+        if parent_id and not content:
+            parent = self.browse(cr, uid, parent_id, context=context)
+            if parent.type == "category":
+                res['value'] = {
+                    'content': parent.content,
+                }
+        return res
+
+    def create_history(self, cr, uid, ids, vals, context=None):
+        for i in ids:
+            history = self.pool.get('document.page.history')
+            if vals.get('content'):
+                res = {
+                    'content': vals.get('content', ''),
+                    'page_id': i,
+                }
+                history.create(cr, uid, res)
+
+    def create(self, cr, uid, vals, context=None):
+        page_id = super(document_page, self).create(cr, uid, vals, context)
+        self.create_history(cr, uid, [page_id], vals, context)
+        return page_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        result = super(document_page, self).write(cr, uid, ids, vals, context)
+        self.create_history(cr, uid, ids, vals, context)
+        return result
+
+class document_page_history(osv.osv):
+    _name = "document.page.history"
+    _description = "Document Page History"
+    _order = 'id DESC'
+    _rec_name = "create_date"
+
+    _columns = {
+          'page_id': fields.many2one('document.page', 'Page'),
+          'summary': fields.char('Summary', size=256, select=True),
+          'content': fields.text("Content"),
+          'create_date': fields.datetime("Date"),
+          'create_uid': fields.many2one('res.users', "Modified By"),
+    }
+
+    def getDiff(self, cr, uid, v1, v2, context=None):
+        history_pool = self.pool.get('document.page.history')
+        text1 = history_pool.read(cr, uid, [v1], ['content'])[0]['content']
+        text2 = history_pool.read(cr, uid, [v2], ['content'])[0]['content']
+        line1 = line2 = ''
+        if text1:
+            line1 = tools.ustr(text1.splitlines(1))
+        if text2:
+            line2=tools.ustr(text2.splitlines(1))
+        if (not line1 and not line2) or (line1 == line2):
+            raise osv.except_osv(_('Warning!'), _('There are no changes in revisions.'))
+        diff = difflib.HtmlDiff()
+        return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_page/document_page_data.xml b/addons/document_page/document_page_data.xml
new file mode 100644
index 00000000000..1cef65694d8
--- /dev/null
+++ b/addons/document_page/document_page_data.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="wiki_wiki_main" model="document.page">
+            <field name="name">The OpenERP wiki</field>
+            <field name="tags">help, quick start, wiki, formatting</field>
+            <field name="minor_edit">0</field>
+            <field name="index">1</field>
+            <field name="summary">Initial Page</field>
+            <field  name="content">==The OpenERP wiki==
+            	
+[[File:http://www.openerp.com/sites/all/themes/openerp/logo.png OpenERP]]            	
+
+The OpenERP wiki allows you to manage your enterprise's contents using wiki
+restructured texts. This module provides a collaborative way to manage internal
+FAQs, quality manuals, technical references, etc.
+
+==Keypoints==
+* Same formating style than MediaWiki,
+* Any number of wiki group for different purposes,
+* Detailed history on all pages,
+* Integrated with the document management system.
+
+==Why you should use the OpenERP integrated wiki than a separate wiki system ?==
+* Allows links to any document of the system,
+* Uses the access controls of OpenERP for uniq access rights management,
+* Use it to describe projects, tasks, products,
+* Integrated with customer portal to provide restricted external accesses,
+* Linked to users processes for quality manuals.
+
+==To get more information==
+* [[Basic Wiki Editing]]
+* [[Wiki Documentation]]
+* [http://openerp.com The OpenERP website]
+
+
+</field>
+            <field name="parent_id" ref="wiki_groups_wikiformatting0"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/document_page/document_page_demo.xml b/addons/document_page/document_page_demo.xml
new file mode 100644
index 00000000000..96984fe2e0b
--- /dev/null
+++ b/addons/document_page/document_page_demo.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_document_user'))]" name="groups_id"/>
+        </record>
+        <record id="demo_category1" model="document.page">
+            <field name="name">OpenERP Features</field>
+            <field name="sequence">10</field>
+            <field name="type">category</field>
+            <field  name="content">
+Summary of the feature
+
+Long explanation
+
+Conclusion
+
+Additional ressources
+
+</field>
+        </record>
+
+        <record id="demo_page1" model="document.page">
+            <field name="name">OpenERP 6.1. Functional Demo</field>
+            <field name="parent_id" ref="demo_category1"/>
+            <field name="content">
+
+The news is out, OpenERP's latest version 6.1. is here.  It's more
+user-friendly, even more business oriented and efficient to manage your company
+
+How to discover the latest version 6.1.?
+
+Demo : [http://demo.openerp.com]
+Online: [http://openerp.com/online]
+Download: [http://openerp.com/downloads]
+
+We have also put together a functional demo that presents 6.1. Watch this video
+to learn directly from us what OpenERP 6.1. can do for you. Share it in your
+company, with your clients and implement it now for your business.
+
+==Watch on Youtube!==
+
+[[Video:http://www.youtube.com/embed/7jES2jxKMso ]]
+
+</field>
+        </record>
+
+        <record id="demo_page2" model="document.page">
+            <field name="name">Personalise Dashboards</field>
+            <field name="parent_id" ref="demo_category1"/>
+            <field name="content">
+You like OpenERP, but feel like you want to personalise it more? Now, OpenERP
+goes a step further and lets you customize your dashboard.  Thanks to a new
+feature that allows you to customize your dashboard by adding new boards of any
+search view.
+
+==How is it done?==
+
+Step 1: access one search view 
+
+Step 2: apply the filter you want to see at each connection to the application
+(eg. on sales, manufacturing, etc)
+
+Step 3: add it into the dashboard in the same space where you can save the filter
+
+Step 4: choose the application you want it visible on and the name of the array
+
+Look at this simple example below from Purchase, where I want to put on the
+application's dashboard "Purchases to Approve". After I access the search view
+and apply the filter for "Purchases to Approve", I can add it immediately to my
+Purchase dashboard.
+
+[[File:http://www.openerp.com/sites/default/files/fileattach/dashboard2_1(1).png ]]
+
+In less than a minute, the search view is visible on the dashboard
+
+[[File:http://www.openerp.com/sites/default/files/fileattach/dashboard2_2.png ]]
+
+Of course, you are free to delete what you don't need or like, but just in case
+you change your mind there is a reset button to return to the default view.
+
+</field>
+        </record>
+
+        <record id="demo_page3" model="document.page">
+            <field name="name">Touchscreen Point of Sale</field>
+            <field name="parent_id" ref="demo_category1"/>
+            <field name="content">
+The brand new OpenERP touchscreen point of sale available with 6.1 allows you
+to manage your shop sales very easily.  It's fully web based so that you don't
+have to install or deploy any software and all the sales shops can be easily
+consolidated.  It works in connected and disconnected modes so that you can
+continue to sell if you lose your internet connection.
+
+[[File:http://www.openerp.com/sites/default/files/fileattach/POS(2).png ]]
+
+==Here's a summary of its main features and benefits:==
+
+100% WEB based
+
+* available for any touchscreen device (ipod, ipad, any tablet)mobile (with portable devices)
+* no installation required
+* no synchronization needed, completely integrated
+* continue working even when your connection is down if you close your browser, data won't be lost
+* fully web based with a clean interface smart interface
+
+You have different options to select your products. You can do it through the
+barcode reader, just browse through the categories you have put in place (ie.
+drinks, snacks, meals, etc.), or text search in case neither of the other
+options work for you.  If you need to use the POS for your restaurant, for
+example, your employees can record at the same time multiple tickets without
+having to wait to do one transaction at a time. Along, to facilitate payment,
+the application allows multiple payment methods.
+
+The POS application is so simple and accessible to use that your shop or
+restaurant will never need any other tool to manage orders. Due to its smart
+and user-friendly interface you don't need any training to learn how to use it.
+Think of it as an out-of-the-box solution to boost your business' productivity.
+</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
new file mode 100644
index 00000000000..c54be43d226
--- /dev/null
+++ b/addons/document_page/document_page_view.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+       <menuitem name="Knowledge" id="knowledge.menu_document"/>
+       <menuitem name="Pages" id="menu_wiki" parent="knowledge.menu_document" sequence="20" />
+
+        <!-- wiki tree view -->
+        <record id="view_wiki_tree_children" model="ir.ui.view">
+            <field name="name">document.page.tree</field>
+            <field name="model">document.page</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <tree string="Document Page">
+                    <field name="name"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
+                </tree>
+            </field>
+        </record>
+        <!-- wiki list view  -->
+        <record id="view_wiki_tree" model="ir.ui.view">
+            <field name="name">document.page.list</field>
+            <field name="model">document.page</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Document Page">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
+                </tree>
+            </field>
+        </record>
+        <!-- wiki Form view  -->
+        <record id="view_wiki_form" model="ir.ui.view">
+            <field name="name">document.page.form</field>
+            <field name="model">document.page</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Document Page" version="7.0">
+                    <field name="type" invisible="1"/>
+                    <h1><field name="name" placeholder="Name"/></h1>
+                    <group class="oe_edit_only">
+                        <group>
+                            <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Category"/>
+                        </group>
+                        <group>
+                            <field name="write_uid" groups="base.group_no_one"/>
+                            <field name="write_date" groups="base.group_no_one"/>
+                            <field name="menu_id" groups="base.group_no_one"/>
+                        </group>
+                    </group>
+                    <div class="oe_edit_only" attrs="{'invisible':[('type','=','content')]}">
+                        <label for="content" string="Template"/>
+                        that will be used as a content template for all new page of this category.
+                    </div>
+                    <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
+                    <div class="oe_document_page">
+                        <field name="display_content" widget="text_wiki" class="oe_view_only"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+        <!-- page Search view  -->
+        <record id="view_wiki_filter" model="ir.ui.view">
+            <field name="name">document.page.search</field>
+            <field name="model">document.page</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Document Page">
+                    <field name="name" string="Content" filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"/>
+                    <field name="write_uid"/>
+                    <field name="parent_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Document Type" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        <!-- page action -->
+        <record id="action_category" model="ir.actions.act_window">
+            <field name="name">Category</field>
+            <field name="res_model">document.page</field>
+            <field name="domain">[('type','=','category')]</field>
+            <field name="context">{'default_type': 'category'}</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="search_view_id" ref="view_wiki_filter"/>
+        </record>
+        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="10"/>
+        <record id="action_page" model="ir.actions.act_window">
+            <field name="name">Pages</field>
+            <field name="res_model">document.page</field>
+            <field name="domain">[('type','=','content')]</field>
+            <field name="context">{'default_type': 'content'}</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="search_view_id" ref="view_wiki_filter"/>
+            <field name="help">Create web pages</field>
+        </record>
+        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="20"/>
+
+        <!-- History Tree view -->
+        <record model="ir.ui.view" id="view_wiki_history_tree">
+            <field name="name">document.page.history.tree</field>
+            <field name="model">document.page.history</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Document History">
+                    <field name="create_date"/>
+                    <field name="create_uid"/>
+                    <field name="page_id"/>
+                </tree>
+            </field>
+        </record>
+        <!-- History Form view  -->
+        <record model="ir.ui.view" id="wiki_history_form">
+            <field name="name">document.page.history.form</field>
+            <field name="model">document.page.history</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Document Page History" version="7.0">
+                    <label for="page_id" class="oe_edit_only"/>
+                    <h1><field name="page_id" select="1" /></h1>
+                    <label for="create_date" class="oe_edit_only"/>
+                    <field name="create_date" readonly="1"/>
+                    <label for="content" class="oe_edit_only"/>
+                    <field name="content" colspan="4"/>
+                </form>
+            </field>
+        </record>
+        <!-- History Action  -->
+        <record model="ir.actions.act_window" id="action_history">
+            <field name="name">Page history</field>
+            <field name="res_model">document.page.history</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem id="menu_page_history" parent="menu_wiki" name="Pages history" action="action_history" sequence="30" groups="base.group_no_one"/>
+        <act_window
+            id="action_related_page_history"
+            context="{'search_default_page_id': [active_id], 'default_page_id': active_id}"
+            domain="[('page_id','=',active_id)]"
+            name="Page History"
+            res_model="document.page.history"
+            src_model="document.page"/>
+        <act_window 
+            id="action_related_page_create_menu"
+            name="Create Menu"
+            res_model="document.page.create.menu"
+            target="new"
+            view_type="form"
+            view_mode="form"
+            src_model="document.page"/>
+
+    </data>
+</openerp>
diff --git a/addons/document_page/i18n/ar.po b/addons/document_page/i18n/ar.po
new file mode 100644
index 00000000000..5b6156eec6c
--- /dev/null
+++ b/addons/document_page/i18n/ar.po
@@ -0,0 +1,398 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* document_page
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-03-19 10:19+0000\n"
+"Last-Translator: kifcaliph <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: 2012-03-20 04:56+0000\n"
+"X-Generator: Launchpad (build 14969)\n"
+
+#. module: document_page
+#: field:document.page.type,template:0
+msgid "Document Page Template"
+msgstr "نموذج ويكي"
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki
+#: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
+msgid "Document Pages"
+msgstr "صفحات ويكي"
+
+#. module: document_page
+#: field:document.page.type,method:0
+msgid "Display Method"
+msgstr "طريقة العرض"
+
+#. module: document_page
+#: view:document.page:0 field:document.page,create_uid:0
+msgid "Author"
+msgstr "المؤلف"
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_wiki_page_open
+#: view:document.page.page.open:0
+msgid "Open Page"
+msgstr "صفحة عامة"
+
+#. module: document_page
+#: field:document.page.type,menu_id:0
+msgid "Menu"
+msgstr "قائمة"
+
+#. module: document_page
+#: help:document.page
+msgid "Indicates that this pages have a table of contents or not"
+msgstr "يوضح ما اذا كانت هذه الصفحات تحتوى على جدول محتويات او لا تحتوى"
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_document_page_history view:document.page.history:0
+msgid "Document Page History"
+msgstr "تاريخ ويكي"
+
+#. module: document_page
+#: field:document.page,minor_edit:0
+msgid "Minor edit"
+msgstr "تحرير ثانوى"
+
+#. module: document_page
+#: view:document.page:0 field:document.page,content:0
+msgid "Content"
+msgstr "محتوى"
+
+#. module: document_page
+#: field:document.page,child_ids:0
+msgid "Child Pages"
+msgstr "صفحات فرعية"
+
+#. module: document_page
+#: field:document.page,parent_id:0
+msgid "Parent Page"
+msgstr "صفحة رئيسية"
+
+#. module: wiki
+#: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
+msgid "Last Contributor"
+msgstr "المشارك الاخير"
+
+#. module: document_page
+#: field:document.page.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "القائمة الرئيسية"
+
+#. module: document_page
+#: field:document.page,name:0
+msgid "Title"
+msgstr "العنوان"
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wiki_create_menu
+msgid "Wizard Create Menu"
+msgstr "إنشائ قائمة بالمعالج"
+
+#. module: document_page
+#: field:document.page,history_id:0
+msgid "History Lines"
+msgstr "سطور التاريخ"
+
+#. module: document_page
+#: view:document.page:0
+msgid "Page Content"
+msgstr "محتوى الصفحة"
+
+#. module: document_page
+#: code:addons/document_page/document_page.py:237
+#, python-format
+msgid "There are no changes in revisions"
+msgstr "لا يوجد تغيير فى المراجعات"
+
+#. module: document_page
+#: field:document.page.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,notes:0
+msgid "Description"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,review:0
+msgid "Needs Review"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,review:0
+msgid ""
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:0 view:document.page.make.index:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.act_wiki_wiki_history
+msgid "Page History"
+msgstr ""
+
+#. module: document_page
+#: selection:document.page.type,method:0
+msgid "Tree"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0
+msgid "Page Template"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,tags:0
+msgid "Keywords"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,help:document_page.action_wiki
+msgid ""
+"With Wiki Pages you can share ideas and questions with your coworkers. You "
+"can create a new document that can be linked to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/wizard/document_page_show_diff.py:54
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: document_page
+#: help:document.page.type,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,create_date:0
+msgid "Date"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.make.index:0
+msgid "Want to create a Index on Selected Pages ? "
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
+#: view:wizard.document.page.history.show_diff:0
+msgid "Difference"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,page_ids:0
+msgid "Pages"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0
+msgid "Group Description"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.page.open:0
+msgid "Want to open a wiki page? "
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,content:0
+msgid "Content"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Meta Information"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0 view:wizard.document.page.history.show_diff:0
+msgid "Notes"
+msgstr ""
+
+#. module: document_page
+#: selection:document.page.type,method:0
+msgid "List"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,edit_summary:0 field:document.page.history,edit_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_history
+msgid "All Page Histories"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wiki_wiki
+msgid "document.page"
+msgstr ""
+
+#. module: document_page
+#: help:document.page.type,method:0
+msgid "Define the default behaviour of the menu created on this group"
+msgstr ""
+
+#. module: document_page
+#: view:wizard.document.page.history.show_diff:0
+msgid "Close"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
+msgid "wizard.document.page.history.show_diff"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,wiki_id:0
+msgid "Wiki Id"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,home:0 selection:document.page.type,method:0
+msgid "Home Page"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,parent_id:0
+msgid "Allows you to link with the other page with in the current topic"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Modification Information"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.menu,name:document_page.menu_wiki_configuration view:document.page:0
+msgid "Wiki"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,write_date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0
+msgid "Configuration"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index_values
+#: model:ir.model,name:document_page.model_wiki_make_index view:document.page.make.index:0
+msgid "Create Index"
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/wizard/document_page_show_diff.py:54
+#, python-format
+msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Group By..."
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
+#: view:document_page.create.menu:0 view:document.page.type:0 view:document.page.make.index:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,minor_edit:0
+msgid "This is a major edit ?"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki_groups
+#: model:ir.actions.act_window,name:document_page.action_wiki_groups_browse
+#: model:ir.model,name:document_page.model_wiki_groups
+#: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
+msgid "Wiki Groups"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Topic"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,write_uid:0
+msgid "Modify By"
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/web/widgets/wikimarkup/__init__.py:1981
+#: field:document.page,type:0
+#, python-format
+msgid "Table of Contents"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0 view:document.page.page.open:0
+msgid "Open Wiki Page"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wiki_wiki_page_open
+msgid "wiz open page"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:0 view:document.page.make.index:0 view:document.page.page.open:0
+msgid "Cancel"
+msgstr ""
+
+#. module: document_page
+#: field:wizard.document.page.history.show_diff,file_path:0
+msgid "Diff"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Need Review"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki_review
+msgid "Pages Waiting Review"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.act_wiki_group_open
+msgid "Search Page"
+msgstr ""
diff --git a/addons/wiki/i18n/bg.po b/addons/document_page/i18n/bg.po
similarity index 99%
rename from addons/wiki/i18n/bg.po
rename to addons/document_page/i18n/bg.po
index fec9663ccb4..1d8d5631d35 100644
--- a/addons/wiki/i18n/bg.po
+++ b/addons/document_page/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/bs.po b/addons/document_page/i18n/bs.po
similarity index 98%
rename from addons/wiki/i18n/bs.po
rename to addons/document_page/i18n/bs.po
index ffd295c93d3..be182ce2c5d 100644
--- a/addons/wiki/i18n/bs.po
+++ b/addons/document_page/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/ca.po b/addons/document_page/i18n/ca.po
similarity index 99%
rename from addons/wiki/i18n/ca.po
rename to addons/document_page/i18n/ca.po
index 0da9885f097..d3ee40e7462 100644
--- a/addons/wiki/i18n/ca.po
+++ b/addons/document_page/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/cs.po b/addons/document_page/i18n/cs.po
similarity index 99%
rename from addons/wiki/i18n/cs.po
rename to addons/document_page/i18n/cs.po
index 9f0ea6045dc..fb63420ede4 100644
--- a/addons/wiki/i18n/cs.po
+++ b/addons/document_page/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-04-07 04:55+0000\n"
+"X-Generator: Launchpad (build 15060)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/da.po b/addons/document_page/i18n/da.po
similarity index 99%
rename from addons/wiki/i18n/da.po
rename to addons/document_page/i18n/da.po
index 21bad1c94cc..28a21d7594f 100644
--- a/addons/wiki/i18n/da.po
+++ b/addons/document_page/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/de.po b/addons/document_page/i18n/de.po
similarity index 99%
rename from addons/wiki/i18n/de.po
rename to addons/document_page/i18n/de.po
index 06626eefd7c..3ec3218c33a 100644
--- a/addons/wiki/i18n/de.po
+++ b/addons/document_page/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -392,7 +392,7 @@ msgstr "Wiki Gruppen"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr "Thema"
+msgstr "THema"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
diff --git a/addons/document_page/i18n/document_page.pot b/addons/document_page/i18n/document_page.pot
new file mode 100644
index 00000000000..4c152a44ff0
--- /dev/null
+++ b/addons/document_page/i18n/document_page.pot
@@ -0,0 +1,423 @@
+# #-#-#-#-#  document_page.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* document_page
+#
+# #-#-#-#-#  document_page.pot.web (PROJECT VERSION)  #-#-#-#-#
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"#-#-#-#-#  document_page.pot (OpenERP Server 6.1rc1)  #-#-#-#-#\n"
+"Project-Id-Version: OpenERP Server 6.1rc1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-02-08 00:37+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"
+"#-#-#-#-#  document_page.pot.web (PROJECT VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. module: document_page
+#: field:document.page.type,template:0
+msgid "Document page Template"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki
+#: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
+msgid "Document Pages"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,method:0
+msgid "Display Method"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0 field:document.page,create_uid:0
+msgid "Author"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_wiki_page_open
+#: view:document.page.page.open:0
+msgid "Open Page"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,menu_id:0
+msgid "Menu"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,type:0
+msgid "Indicates that this pages have a table of contents or not"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
+msgid "Document page History"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,minor_edit:0
+msgid "Minor edit"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0 field:document.page,content:0
+msgid "Content"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,child_ids:0
+msgid "Child Pages"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,parent_id:0
+msgid "Parent Page"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0 field:document.page,write_uid:0
+msgid "Last Contributor"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,name:0
+msgid "Title"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wiki_create_menu
+msgid "Wizard Create Menu"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,history_id:0
+msgid "History Lines"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Page Content"
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/document_page.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/document_page.py:237
+#, python-format
+msgid "There are no changes in revisions"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,notes:0
+msgid "Description"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,review:0
+msgid "Needs Review"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,review:0
+msgid ""
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:0 view:document.page.make.index:0
+msgid "Menu Information"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.act_wiki_wiki_history
+msgid "Page History"
+msgstr ""
+
+#. module: document_page
+#: selection:document.page.type,method:0
+msgid "Tree"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0
+msgid "Page Template"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,tags:0
+msgid "Keywords"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,help:document_page.action_wiki
+msgid ""
+"With Wiki Pages you can share ideas and questions with your coworkers. You "
+"can create a new document that can be linked to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/wizard/document_page_show_diff.py:54
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: document_page
+#: help:document.page.type,home:0
+msgid "Required to select home page if display method is Home Page"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,create_date:0
+msgid "Date"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.make.index:0
+msgid "Want to create a Index on Selected Pages ? "
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
+#: view:wizard.document.page.history.show_diff:0
+msgid "Difference"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,page_ids:0
+msgid "Pages"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0
+msgid "Group Description"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.page.open:0
+msgid "Want to open a wiki page? "
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,content:0
+msgid "Text area"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Meta Information"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,create_date:0
+msgid "Created on"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0 view:wizard.document.page.history.show_diff:0
+msgid "Notes"
+msgstr ""
+
+#. module: document_page
+#: selection:document.page.type,method:0
+msgid "List"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,summary:0 field:document.page.history,edit_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.groups,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_history
+msgid "All Page Histories"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wiki_wiki
+msgid "document.page"
+msgstr ""
+
+#. module: document_page
+#: help:document.page.type,method:0
+msgid "Define the default behaviour of the menu created on this group"
+msgstr ""
+
+#. module: document_page
+#: view:wizard.document.page.history.show_diff:0
+msgid "Close"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
+msgid "wizard.document.page.history.show_diff"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,wiki_id:0
+msgid "Wiki Id"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.type,home:0 selection:document.page.type,method:0
+msgid "Home Page"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,parent_id:0
+msgid "Allows you to link with the other page with in the current topic"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Modification Information"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.menu,name:document_page.menu_wiki_configuration view:document.page:0
+msgid "Wiki"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,write_date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0
+msgid "Configuration"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index_values
+#: model:ir.model,name:document_page.model_wiki_make_index view:document.page.make.index:0
+msgid "Create Index"
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/wizard/document_page_show_diff.py:54
+#, python-format
+msgid "You need to select minimum 1 or maximum 2 history revision!"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Group By..."
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
+#: view:document.page.create.menu:0 view:document.page.type:0 view:document.page.make.index:0
+msgid "Create Menu"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,minor_edit:0
+msgid "This is a major edit ?"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki_groups
+#: model:ir.actions.act_window,name:document_page.action_wiki_groups_browse
+#: model:ir.model,name:document_page.model_wiki_groups
+#: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
+msgid "Document Types"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Topic"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,write_uid:0
+msgid "Modify By"
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/web/widgets/wikimarkup/__init__.py:1981
+#: field:document.page,type:0
+#, python-format
+msgid "Type"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.type:0 view:document.page.page.open:0
+msgid "Open Document Page"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_wiki_wiki_page_open
+msgid "wiz open page"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:0 view:document.page.make.index:0 view:document.page.page.open:0
+msgid "Cancel"
+msgstr ""
+
+#. module: document_page
+#: field:wizard.document.page.history.show_diff,file_path:0
+msgid "Diff"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:0
+msgid "Need Review"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_wiki_review
+msgid "Pages Waiting Review"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.act_wiki_group_open
+msgid "Search Page"
+msgstr ""
diff --git a/addons/wiki/i18n/el.po b/addons/document_page/i18n/el.po
similarity index 99%
rename from addons/wiki/i18n/el.po
rename to addons/document_page/i18n/el.po
index 8a29e63f02a..dcff21f2a13 100644
--- a/addons/wiki/i18n/el.po
+++ b/addons/document_page/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/wiki/i18n/es.po b/addons/document_page/i18n/es.po
similarity index 99%
rename from addons/wiki/i18n/es.po
rename to addons/document_page/i18n/es.po
index f9a94e176ea..dd5d5464322 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/document_page/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/es_AR.po b/addons/document_page/i18n/es_AR.po
similarity index 99%
rename from addons/wiki/i18n/es_AR.po
rename to addons/document_page/i18n/es_AR.po
index e63eaf24be9..180e3281a22 100644
--- a/addons/wiki/i18n/es_AR.po
+++ b/addons/document_page/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/es_CR.po b/addons/document_page/i18n/es_CR.po
similarity index 98%
rename from addons/wiki/i18n/es_CR.po
rename to addons/document_page/i18n/es_CR.po
index 1c9e4f39b84..79f50eaa0c8 100644
--- a/addons/wiki/i18n/es_CR.po
+++ b/addons/document_page/i18n/es_CR.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-20 01:10+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\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: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/es_MX.po b/addons/document_page/i18n/es_MX.po
similarity index 100%
rename from addons/wiki/i18n/es_MX.po
rename to addons/document_page/i18n/es_MX.po
diff --git a/addons/wiki/i18n/es_VE.po b/addons/document_page/i18n/es_VE.po
similarity index 100%
rename from addons/wiki/i18n/es_VE.po
rename to addons/document_page/i18n/es_VE.po
diff --git a/addons/wiki/i18n/et.po b/addons/document_page/i18n/et.po
similarity index 99%
rename from addons/wiki/i18n/et.po
rename to addons/document_page/i18n/et.po
index 5980bda57da..b5c3d1352e7 100644
--- a/addons/wiki/i18n/et.po
+++ b/addons/document_page/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/fi.po b/addons/document_page/i18n/fi.po
similarity index 99%
rename from addons/wiki/i18n/fi.po
rename to addons/document_page/i18n/fi.po
index 091a473910e..65f97f8071e 100644
--- a/addons/wiki/i18n/fi.po
+++ b/addons/document_page/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/fr.po b/addons/document_page/i18n/fr.po
similarity index 98%
rename from addons/wiki/i18n/fr.po
rename to addons/document_page/i18n/fr.po
index 91a0b6b197e..cb6b0a421c2 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/document_page/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -97,7 +97,7 @@ msgstr "Menu Parent"
 #: code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "There is no section in this Page"
-msgstr "Il n'y a pas de section dans cette page"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
diff --git a/addons/wiki/i18n/gl.po b/addons/document_page/i18n/gl.po
similarity index 99%
rename from addons/wiki/i18n/gl.po
rename to addons/document_page/i18n/gl.po
index edce0e05bd5..866c67ab29f 100644
--- a/addons/wiki/i18n/gl.po
+++ b/addons/document_page/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/hr.po b/addons/document_page/i18n/hr.po
similarity index 99%
rename from addons/wiki/i18n/hr.po
rename to addons/document_page/i18n/hr.po
index 3a45a8a28f8..33d286becea 100644
--- a/addons/wiki/i18n/hr.po
+++ b/addons/document_page/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/hu.po b/addons/document_page/i18n/hu.po
similarity index 99%
rename from addons/wiki/i18n/hu.po
rename to addons/document_page/i18n/hu.po
index ba78052c354..2d62aeeda6d 100644
--- a/addons/wiki/i18n/hu.po
+++ b/addons/document_page/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/id.po b/addons/document_page/i18n/id.po
similarity index 98%
rename from addons/wiki/i18n/id.po
rename to addons/document_page/i18n/id.po
index fcaba7b8947..0c8f2f431f0 100644
--- a/addons/wiki/i18n/id.po
+++ b/addons/document_page/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/it.po b/addons/document_page/i18n/it.po
similarity index 97%
rename from addons/wiki/i18n/it.po
rename to addons/document_page/i18n/it.po
index 27df99ee7c5..9b28b7cdcee 100644
--- a/addons/wiki/i18n/it.po
+++ b/addons/document_page/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -97,7 +97,7 @@ msgstr "Menu Superiore"
 #: code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "There is no section in this Page"
-msgstr "Non è presente alcuna sezione in questa pagina"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
@@ -328,7 +328,7 @@ msgstr "Home page"
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr "Consente di collegare con un altra pagina con il topic attuale"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -382,7 +382,7 @@ msgstr "Crea Menu"
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr "E' questa una modifica importante?"
+msgstr ""
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
diff --git a/addons/wiki/i18n/ja.po b/addons/document_page/i18n/ja.po
similarity index 99%
rename from addons/wiki/i18n/ja.po
rename to addons/document_page/i18n/ja.po
index 85840a1f8b0..97728365f6d 100644
--- a/addons/wiki/i18n/ja.po
+++ b/addons/document_page/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-06-17 04:35+0000\n"
+"X-Generator: Launchpad (build 15419)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/ko.po b/addons/document_page/i18n/ko.po
similarity index 99%
rename from addons/wiki/i18n/ko.po
rename to addons/document_page/i18n/ko.po
index c2469255343..a7637e5de1a 100644
--- a/addons/wiki/i18n/ko.po
+++ b/addons/document_page/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/lt.po b/addons/document_page/i18n/lt.po
similarity index 99%
rename from addons/wiki/i18n/lt.po
rename to addons/document_page/i18n/lt.po
index b6cffe86299..4e15d7c0299 100644
--- a/addons/wiki/i18n/lt.po
+++ b/addons/document_page/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 "Language: lt\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/lv.po b/addons/document_page/i18n/lv.po
similarity index 99%
rename from addons/wiki/i18n/lv.po
rename to addons/document_page/i18n/lv.po
index d72c6080ff8..a2e326088e2 100644
--- a/addons/wiki/i18n/lv.po
+++ b/addons/document_page/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/mn.po b/addons/document_page/i18n/mn.po
similarity index 99%
rename from addons/wiki/i18n/mn.po
rename to addons/document_page/i18n/mn.po
index 4156cc06dbf..c361d4340da 100644
--- a/addons/wiki/i18n/mn.po
+++ b/addons/document_page/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/nb.po b/addons/document_page/i18n/nb.po
similarity index 98%
rename from addons/wiki/i18n/nb.po
rename to addons/document_page/i18n/nb.po
index a8887bbf10f..b9628735a7d 100644
--- a/addons/wiki/i18n/nb.po
+++ b/addons/document_page/i18n/nb.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2011-03-31 12:08+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"Last-Translator: Rolv Råen (adEgo) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/nl.po b/addons/document_page/i18n/nl.po
similarity index 99%
rename from addons/wiki/i18n/nl.po
rename to addons/document_page/i18n/nl.po
index 2eb3d23430c..1a0fa185196 100644
--- a/addons/wiki/i18n/nl.po
+++ b/addons/document_page/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/nl_BE.po b/addons/document_page/i18n/nl_BE.po
similarity index 99%
rename from addons/wiki/i18n/nl_BE.po
rename to addons/document_page/i18n/nl_BE.po
index 0affcea33df..b7939a66044 100644
--- a/addons/wiki/i18n/nl_BE.po
+++ b/addons/document_page/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/pl.po b/addons/document_page/i18n/pl.po
similarity index 92%
rename from addons/wiki/i18n/pl.po
rename to addons/document_page/i18n/pl.po
index 8b0b3c38fe9..14086af46b8 100644
--- a/addons/wiki/i18n/pl.po
+++ b/addons/document_page/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -30,7 +30,7 @@ msgstr "Strony Wiki"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr "Metoda wyświetlania"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
@@ -56,7 +56,7 @@ msgstr "Sekcja"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr "Oznacza, czy ta strona na spis treści, czy nie"
+msgstr ""
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
@@ -76,17 +76,17 @@ msgstr "Zawartość"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr "Strony podrzędne"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr "Strona nadrzędna"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr "Ostatni kontrybutor"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -97,7 +97,7 @@ msgstr "Menu nadrzędne"
 #: code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "There is no section in this Page"
-msgstr "Nie ma sekcji na tej stronie"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
@@ -122,24 +122,24 @@ msgstr "Pozycje historii"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr "Zawartość strony"
+msgstr ""
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr "Ostrzeżenie !"
+msgstr ""
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr "Brak zmian w wersjach"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr "Stosuj kod sekcji strony jak 1.2.1"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
@@ -154,29 +154,29 @@ msgstr "Opis"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr "Wymaga przejrzenia"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,review:0
 msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
-msgstr "Oznacza, że strona powinna być przejrzana przez innych kontrybutorów"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.create.menu:0 view:wiki.make.index:0
 msgid "Menu Information"
-msgstr "Informacja o menu"
+msgstr ""
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr "Historia strony"
+msgstr ""
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr "Drzewo"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -186,7 +186,7 @@ msgstr "Szablon strony"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr "Słowa kluczowe"
+msgstr ""
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -201,7 +201,7 @@ msgstr ""
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "Warning"
-msgstr "Ostrzeżenie"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.groups,home:0
@@ -223,7 +223,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr "Różnica"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -233,7 +233,7 @@ msgstr "Strony"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr "Opis Grupy"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki.page.open:0
@@ -253,7 +253,7 @@ msgstr "Obszar tekstu"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr "Metainformacje"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
@@ -268,7 +268,7 @@ msgstr "Uwagi"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr "Lista"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
@@ -298,7 +298,7 @@ msgstr ""
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr "Zamknięte"
+msgstr ""
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -313,7 +313,7 @@ msgstr "Wiki Id"
 #. module: wiki
 #: field:wiki.groups,home:0 selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr "Strona główna"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
@@ -361,7 +361,7 @@ msgstr ""
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr "Grupuj wg..."
+msgstr ""
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -385,7 +385,7 @@ msgstr "Grupy wiki"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr "Temat"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
diff --git a/addons/wiki/i18n/pt.po b/addons/document_page/i18n/pt.po
similarity index 92%
rename from addons/wiki/i18n/pt.po
rename to addons/document_page/i18n/pt.po
index 1dc926694e8..f3bf2c8cc5c 100644
--- a/addons/wiki/i18n/pt.po
+++ b/addons/document_page/i18n/pt.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
 msgid "Wiki Template"
-msgstr "Template Wiki"
+msgstr "Modelo Wiki"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki
@@ -56,7 +56,7 @@ msgstr "Secção"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr "Indica que estas páginas têm uma tabela de conteúdos ou não"
+msgstr ""
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
@@ -76,28 +76,28 @@ msgstr "Conteúdo"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr "Páginas Descendentes"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr "Página Ascendente"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr "Último contribuinte"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr "Menu Ascendente"
+msgstr "Menu do Ascendente"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "There is no section in this Page"
-msgstr "Não há secção nesta página"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
@@ -112,7 +112,7 @@ msgstr "Título"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr "Assitente de criação do menu"
+msgstr "Assitente de criação de menu"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
@@ -122,19 +122,19 @@ msgstr "Linhas do Histórico"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr "Conteúdo da Página"
+msgstr "Conteúdo de página"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr "Aviso !"
+msgstr "Alerta!"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr "Não há mudanças nas revisões"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -173,7 +173,7 @@ msgstr "Informação do Menu"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr "Histórico da Página"
+msgstr ""
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -183,12 +183,12 @@ msgstr "Árvore"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Page Template"
-msgstr "Template da Página"
+msgstr "Modelo da Página"
 
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr "Palavras-Chave"
+msgstr "Palavras-chave"
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -218,7 +218,7 @@ msgstr "Data"
 #. module: wiki
 #: view:wiki.make.index:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr "Pretende criar um Índice nas Páginas Selecionadas? "
+msgstr "Pretende criar um Índice nas Páginas Seleccionadas? "
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
@@ -235,12 +235,12 @@ msgstr "Páginas"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr "Descrição do Grupo"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr "Quer abrir uma página wiki? "
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -270,7 +270,7 @@ msgstr "Notas"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr "Lista"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
@@ -280,7 +280,7 @@ msgstr "Resumo"
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr "Data de Criação"
+msgstr "Data Criada"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
@@ -315,7 +315,7 @@ msgstr "ID do Wiki"
 #. module: wiki
 #: field:wiki.groups,home:0 selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr "Página Inicial"
+msgstr "Página inicial"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
@@ -325,7 +325,7 @@ msgstr ""
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr "Informações modificação"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,group_id:0
@@ -358,7 +358,7 @@ msgstr "Criar Índex"
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr "Precisa selecionar no mínimo 1 ou no máximo 2 históricos revistos!"
+msgstr "Precisa seleccionar no mínimo 1 ou no máximo 2 históricos revistos!"
 
 #. module: wiki
 #: view:wiki.wiki:0
diff --git a/addons/wiki/i18n/pt_BR.po b/addons/document_page/i18n/pt_BR.po
similarity index 99%
rename from addons/wiki/i18n/pt_BR.po
rename to addons/document_page/i18n/pt_BR.po
index 6c7ccd727cd..61514b12ffb 100644
--- a/addons/wiki/i18n/pt_BR.po
+++ b/addons/document_page/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/ro.po b/addons/document_page/i18n/ro.po
similarity index 81%
rename from addons/wiki/i18n/ro.po
rename to addons/document_page/i18n/ro.po
index ebc5d984fba..8e6d9ba8be9 100644
--- a/addons/wiki/i18n/ro.po
+++ b/addons/document_page/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -51,12 +51,12 @@ msgstr "Meniu"
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr "Sectiune"
+msgstr "Secţiune"
 
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr "Indica daca aceste pagini au un cuprins sau nu"
+msgstr "Indică dacă aceste pagini au un cuprins sau nu"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
@@ -66,22 +66,22 @@ msgstr "Istoric wiki"
 #. module: wiki
 #: field:wiki.wiki,minor_edit:0
 msgid "Minor edit"
-msgstr "Editare minora"
+msgstr "Modificare minoră"
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,text_area:0
 msgid "Content"
-msgstr "Continut"
+msgstr "Conţinut"
 
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr "Pagini subordonate"
+msgstr "Pagini subordonate (copii)"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr "Pagini principale"
+msgstr "Pagini principale (părinte)"
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
@@ -91,18 +91,18 @@ msgstr "Ultimul colaborator"
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr "Meniu Principal"
+msgstr "Meniu principal (părinte)"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "There is no section in this Page"
-msgstr "Nu exista nicio sectiune in aceasta Pagina"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
 msgid "Wiki Group"
-msgstr "Grup Wiki"
+msgstr "Grup wiki"
 
 #. module: wiki
 #: field:wiki.wiki,name:0
@@ -112,34 +112,34 @@ msgstr "Titlu"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr "Wizard Creeaza Meniul"
+msgstr "Wizard Creează meniul"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr "Istoric Linii"
+msgstr "Istoricul liniilor"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr "Continutul Paginii"
+msgstr "Conținutul paginii"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr "Avertizare !"
+msgstr "Avertisment !"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr "Nu exista modificari la revizii"
+msgstr "Nu există modificări la revizii"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
 msgid "Use page section code like 1.2.1"
-msgstr "Folositi codul sectiunii paginii, cum ar fi 1.2.1"
+msgstr "Folosiți codul secțiunii paginii, cum ar fi 1.2.1"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_name:0
@@ -154,7 +154,7 @@ msgstr "Descriere"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr "Necesita Verificare"
+msgstr "Necesită verificare"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -162,18 +162,18 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
-"Indica faptul ca aceasta pagina ar trebui verificata, atragand atentia altor "
+"Indică faptul că această pagină ar trebui verificată, atrăgand atentia altor "
 "colaboratori"
 
 #. module: wiki
 #: view:wiki.create.menu:0 view:wiki.make.index:0
 msgid "Menu Information"
-msgstr "Informatii meniu"
+msgstr "Informaţii meniu"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr "Istoric Pagina"
+msgstr "Istoric pagină"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
@@ -183,7 +183,7 @@ msgstr "Arbore"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Page Template"
-msgstr "Sablon pagina"
+msgstr "Sablon pagină"
 
 #. module: wiki
 #: field:wiki.wiki,tags:0
@@ -198,41 +198,41 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
-"Cu Paginile Wiki puteti impartasi idei si intrebari cu colegii "
-"dumneavoastra. Puteti crea un document nou care poate fi conectat la una sau "
-"mai multe aplicatii (MRC, Vanzari, etc.). Puteti folosi cuvinte cheie pentru "
-"a accesa cu usurina paginile dumneavoastra wiki. Exista o editare de baza "
+"Cu Paginile WIki puteti impărtăsi idei si intrebări cu colegii "
+"dumneavoastră. Puteti crea un document noucare poate fi conectat la una sau "
+"mai multe aplicatii (MRC, Vanzări, etc.). Puteti folosi cuvinte cheie pentru "
+"a accesa cu usurintă paginile dumneavoastră wiki. Există o editare de bază "
 "pentru formatul text."
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "Warning"
-msgstr "Atentionare"
+msgstr "Avertisment"
 
 #. module: wiki
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
 msgstr ""
-"Este obligatoriu sa selectati pagina de pornire daca metoda de afisare este "
+"Este obligatoriu să selectati pagina de pornire dacă metoda de afisare este "
 "Pagina de pornire"
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
 msgid "Date"
-msgstr "Data"
+msgstr "Dată"
 
 #. module: wiki
 #: view:wiki.make.index:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr "Doriti sa creati un index pentru Paginile Selectate ? "
+msgstr "Doriți să creați un index pentru paginile selectate ? "
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr "Diferenta"
+msgstr "Diferenţă"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -247,27 +247,27 @@ msgstr "Descriere Grup"
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr "Doriti sa deschideti o pagina wiki? "
+msgstr "Doriti să deschideti o pagină wiki? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
 msgid "Make Section ?"
-msgstr "Creeaza Sectiunea ?"
+msgstr "Creează secțiunea ?"
 
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr "Zona text"
+msgstr "Zonă text"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr "Meta Informatii"
+msgstr "Meta Informații"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
 msgid "Created on"
-msgstr "Creat la"
+msgstr "Creat in"
 
 #. module: wiki
 #: view:wiki.groups:0 view:wizard.wiki.history.show_diff:0
@@ -277,7 +277,7 @@ msgstr "Note"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr "Lista"
+msgstr "Listă"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
@@ -287,12 +287,12 @@ msgstr "Rezumat"
 #. module: wiki
 #: field:wiki.groups,create_date:0
 msgid "Created Date"
-msgstr "Data crearii"
+msgstr "Data creării"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_history
 msgid "All Page Histories"
-msgstr "Istoric Toate paginile"
+msgstr "Toate paginile istoricului"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki
@@ -303,17 +303,17 @@ msgstr "wiki.wiki"
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
 msgstr ""
-"Defineste comportamentul predefinit al meniului creat pentru acest grup"
+"Defineste comportamentul predefinit al meniului creat pentreu acest grup"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr "Inchide"
+msgstr "Închide"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
 msgid "wizard.wiki.history.show_diff"
-msgstr "asistent.wiki.istoric.arata_diferente"
+msgstr "wizard.wiki.history.show_diff"
 
 #. module: wiki
 #: field:wiki.wiki.history,wiki_id:0
@@ -323,17 +323,17 @@ msgstr "ID wiki"
 #. module: wiki
 #: field:wiki.groups,home:0 selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr "Pagina de pornire"
+msgstr "Pagină de pornire"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr "Va permite sa va conectati la o alta pagina cu subiectul curent"
+msgstr "Vă permite să vă conectati la o altă pagină in subiectul curent"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr "Informatii Modificare"
+msgstr "Informatii modificare"
 
 #. module: wiki
 #: help:wiki.wiki,group_id:0
@@ -348,7 +348,7 @@ msgstr "Wiki"
 #. module: wiki
 #: field:wiki.wiki,write_date:0
 msgid "Modification Date"
-msgstr "Data Modificarii"
+msgstr "Data modificării"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -360,29 +360,29 @@ msgstr "Configurare"
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
 #: model:ir.model,name:wiki.model_wiki_make_index view:wiki.make.index:0
 msgid "Create Index"
-msgstr "Creeaza Index"
+msgstr "Creare index"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr "Trebuie sa selectati minim 1 si maxim 2 revizuiri ale istoricului!"
+msgstr "Trebuie să selectati minim 1 și maxim 2 revizuiri ale istoricului"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr "Grupeaza dupa..."
+msgstr "Grupează după..."
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
 #: view:wiki.create.menu:0 view:wiki.groups:0 view:wiki.make.index:0
 msgid "Create Menu"
-msgstr "Creeaza Meniu"
+msgstr "Creează meniu"
 
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr "Este aceasta o modificare majora ?"
+msgstr "Este aceasta o modificare majoră ?"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_groups
@@ -417,12 +417,12 @@ msgstr "Deschide Pagina Wiki"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr "wizard deschidere pagina"
+msgstr "wizard deschidere pagină"
 
 #. module: wiki
 #: view:wiki.create.menu:0 view:wiki.make.index:0 view:wiki.wiki.page.open:0
 msgid "Cancel"
-msgstr "Anuleaza"
+msgstr "Anulează"
 
 #. module: wiki
 #: field:wizard.wiki.history.show_diff,file_path:0
@@ -432,17 +432,17 @@ msgstr "Diferit"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Need Review"
-msgstr "Necesita Verificare"
+msgstr "Necesită verificare"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr "Pagini care asteapta verificare"
+msgstr "Pagini care asteaptă verificare"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr "Cauta pagina"
+msgstr "Caută pagina"
 
 #~ msgid "Document Management - Wiki"
 #~ msgstr "Managementul documentelor - wiki"
diff --git a/addons/wiki/i18n/ru.po b/addons/document_page/i18n/ru.po
similarity index 99%
rename from addons/wiki/i18n/ru.po
rename to addons/document_page/i18n/ru.po
index e9d723c5bb4..3041c9c19d3 100644
--- a/addons/wiki/i18n/ru.po
+++ b/addons/document_page/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sk.po b/addons/document_page/i18n/sk.po
similarity index 99%
rename from addons/wiki/i18n/sk.po
rename to addons/document_page/i18n/sk.po
index fb5e320e334..0f20002530d 100644
--- a/addons/wiki/i18n/sk.po
+++ b/addons/document_page/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sl.po b/addons/document_page/i18n/sl.po
similarity index 99%
rename from addons/wiki/i18n/sl.po
rename to addons/document_page/i18n/sl.po
index 058b9970c7b..df3be345081 100644
--- a/addons/wiki/i18n/sl.po
+++ b/addons/document_page/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sq.po b/addons/document_page/i18n/sq.po
similarity index 99%
rename from addons/wiki/i18n/sq.po
rename to addons/document_page/i18n/sq.po
index ace82fe351b..c318c5aa712 100644
--- a/addons/wiki/i18n/sq.po
+++ b/addons/document_page/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sr.po b/addons/document_page/i18n/sr.po
similarity index 99%
rename from addons/wiki/i18n/sr.po
rename to addons/document_page/i18n/sr.po
index 05ff059c01d..461bca5ee72 100644
--- a/addons/wiki/i18n/sr.po
+++ b/addons/document_page/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sr@latin.po b/addons/document_page/i18n/sr@latin.po
similarity index 99%
rename from addons/wiki/i18n/sr@latin.po
rename to addons/document_page/i18n/sr@latin.po
index d1ff1b9e32f..5b1fef44598 100644
--- a/addons/wiki/i18n/sr@latin.po
+++ b/addons/document_page/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/sv.po b/addons/document_page/i18n/sv.po
similarity index 88%
rename from addons/wiki/i18n/sv.po
rename to addons/document_page/i18n/sv.po
index ac42289c2d9..fa378db1bd3 100644
--- a/addons/wiki/i18n/sv.po
+++ b/addons/document_page/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -30,7 +30,7 @@ msgstr "Wikisidor"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr "Visningsmetod"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
@@ -56,7 +56,7 @@ msgstr "Område"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr "Indikerar att denna sida har innehållsförteckning eller inte"
+msgstr ""
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
@@ -76,17 +76,17 @@ msgstr "Innehåll"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr "Undersidor"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr "Överliggande sida"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr "Senaste författare"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -97,7 +97,7 @@ msgstr "Huvudmeny"
 #: code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "There is no section in this Page"
-msgstr "Stycke saknas på denna sida"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
@@ -112,7 +112,7 @@ msgstr "Rubrik"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr "Skapa guide-meny"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
@@ -122,7 +122,7 @@ msgstr "Historikrader"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr "Sidinnehåll"
+msgstr ""
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
@@ -134,7 +134,7 @@ msgstr "Varning !"
 #: code:addons/wiki/wiki.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr "Det är inga ändringar att granska"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -154,7 +154,7 @@ msgstr "Beskrivning"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr "Behöver granskas"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -162,8 +162,6 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
-"Indikerar att denna sida bör granskas, höjer uppmärksamheten hos andra "
-"bidragsgivare"
 
 #. module: wiki
 #: view:wiki.create.menu:0 view:wiki.make.index:0
@@ -173,12 +171,12 @@ msgstr "Menyinformation"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr "Sidhistorik"
+msgstr ""
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr "Träd"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -188,7 +186,7 @@ msgstr "Sidmall"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr "Nyckelord"
+msgstr ""
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -198,10 +196,6 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
-"Med denna WIki-sida kan du dela ideer och frågor med dina medarbetare. Du "
-"kan skapa nya dokument som knyts till en eller flera applikationer (CRM, "
-"Kundorder etc), Du kan använda nyckelord för att hitta dina Wiki-sidor. "
-"Grundläggande wiki-editering för textformatet."
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
@@ -212,7 +206,7 @@ msgstr "Warning"
 #. module: wiki
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr "Krävs för att välja startsida om visningsmetoden är Hemsida"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
@@ -229,7 +223,7 @@ msgstr "Vill du skapa ett index för aktuella sidor? "
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr "Skillnad"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -239,12 +233,12 @@ msgstr "Sidor"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr "Gruppbeskrivning"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr "Önskar du öppna en wiki-sida? "
+msgstr ""
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -259,7 +253,7 @@ msgstr "Textområde"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr "Metainformation"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
@@ -274,7 +268,7 @@ msgstr "Anteckningar"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr "Lista"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
@@ -299,12 +293,12 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr "Definiera standardbeteende för menyn till denna grupp"
+msgstr ""
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr "Stäng"
+msgstr ""
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -319,22 +313,22 @@ msgstr "Wiki Id"
 #. module: wiki
 #: field:wiki.groups,home:0 selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr "Webbplats"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr "Gör att du kan länka med den andra sidan med i den aktuella ämnet"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr "Ändringsinformation"
+msgstr ""
 
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr "Ämne, även kallad Wiki-grupp"
+msgstr ""
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration view:wiki.wiki:0
@@ -367,7 +361,7 @@ msgstr "You need to select minimum 1 or maximum 2 history revision!"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr "Gruppera på..."
+msgstr ""
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -391,7 +385,7 @@ msgstr "Wikigrupper"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr "Ämne"
+msgstr ""
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -408,12 +402,12 @@ msgstr "Innehållsförteckning"
 #. module: wiki
 #: view:wiki.groups:0 view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr "Öppna Wiki-sida"
+msgstr ""
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr "wiz öppen sida"
+msgstr ""
 
 #. module: wiki
 #: view:wiki.create.menu:0 view:wiki.make.index:0 view:wiki.wiki.page.open:0
@@ -433,12 +427,12 @@ msgstr "Behöver revideras"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr "Sidor att granska"
+msgstr ""
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr "Söksida"
+msgstr ""
 
 #~ msgid "Child Groups"
 #~ msgstr "Undergrupper"
diff --git a/addons/wiki/i18n/tlh.po b/addons/document_page/i18n/tlh.po
similarity index 98%
rename from addons/wiki/i18n/tlh.po
rename to addons/document_page/i18n/tlh.po
index a00e322e0ef..21c5a3b232b 100644
--- a/addons/wiki/i18n/tlh.po
+++ b/addons/document_page/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/tr.po b/addons/document_page/i18n/tr.po
similarity index 99%
rename from addons/wiki/i18n/tr.po
rename to addons/document_page/i18n/tr.po
index 8fc69bedc3f..39753a574bb 100644
--- a/addons/wiki/i18n/tr.po
+++ b/addons/document_page/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/uk.po b/addons/document_page/i18n/uk.po
similarity index 99%
rename from addons/wiki/i18n/uk.po
rename to addons/document_page/i18n/uk.po
index dc3dadac42c..da814545adc 100644
--- a/addons/wiki/i18n/uk.po
+++ b/addons/document_page/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/vi.po b/addons/document_page/i18n/vi.po
similarity index 99%
rename from addons/wiki/i18n/vi.po
rename to addons/document_page/i18n/vi.po
index f0a0bd5c90e..c1362141938 100644
--- a/addons/wiki/i18n/vi.po
+++ b/addons/document_page/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/zh_CN.po b/addons/document_page/i18n/zh_CN.po
similarity index 99%
rename from addons/wiki/i18n/zh_CN.po
rename to addons/document_page/i18n/zh_CN.po
index aba53b98606..3b8642229f2 100644
--- a/addons/wiki/i18n/zh_CN.po
+++ b/addons/document_page/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/wiki/i18n/zh_TW.po b/addons/document_page/i18n/zh_TW.po
similarity index 98%
rename from addons/wiki/i18n/zh_TW.po
rename to addons/document_page/i18n/zh_TW.po
index ec783eef138..781fc87340c 100644
--- a/addons/wiki/i18n/zh_TW.po
+++ b/addons/document_page/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:46+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
diff --git a/addons/document_page/security/document_page_security.xml b/addons/document_page/security/document_page_security.xml
new file mode 100644
index 00000000000..6d85d054469
--- /dev/null
+++ b/addons/document_page/security/document_page_security.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+    <record id="base.group_document_user" model="res.groups">
+        <field name="users" eval="[(4, ref('base.user_root'))]"/>
+    </record>
+</data>
+</openerp>
diff --git a/addons/document_page/security/ir.model.access.csv b/addons/document_page/security/ir.model.access.csv
new file mode 100644
index 00000000000..13f0479ff53
--- /dev/null
+++ b/addons/document_page/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+document_page_all,document.page,model_document_page,,1,0,0,0
+document_page,document.page,model_document_page,base.group_user,1,1,1,1
+document_page_history,document.page.history,model_document_page_history,base.group_user,1,0,1,0
diff --git a/addons/wiki/security/wiki_security.xml b/addons/document_page/security/wiki_security.xml
similarity index 100%
rename from addons/wiki/security/wiki_security.xml
rename to addons/document_page/security/wiki_security.xml
diff --git a/addons/document_page/static/src/css/document_page.css b/addons/document_page/static/src/css/document_page.css
new file mode 100644
index 00000000000..723ff8d9b11
--- /dev/null
+++ b/addons/document_page/static/src/css/document_page.css
@@ -0,0 +1,15 @@
+.oe_form_readonly .oe_notebook {
+    display: none;
+}
+
+.oe_document_page ul, .oe_document_page li {
+    padding: 2px 8px;
+    margin: 2px 8px;
+    list-style-type: circle;
+}
+
+.oe_form_editable .oe_document_page {
+    display: none;
+}
+
+
diff --git a/addons/document_page/static/src/js/document_page.js b/addons/document_page/static/src/js/document_page.js
new file mode 100644
index 00000000000..555a39d7796
--- /dev/null
+++ b/addons/document_page/static/src/js/document_page.js
@@ -0,0 +1,18 @@
+openerp.document_page = function (openerp) {
+    openerp.web.form.widgets.add('text_wiki', 'openerp.web.form.FieldTextWiki');
+
+    openerp.web.form.FieldTextWiki = openerp.web.form.FieldText.extend({
+        render_value: function() {
+            var show_value = openerp.web.format_value(this.get('value'), this, '');
+            if (!this.get("effective_readonly")) {
+                this.$textarea.val(show_value);
+                if (show_value && this.view.options.resize_textareas) {
+                    this.do_resize(this.view.options.resize_textareas);
+                }
+            } else {
+                var wiki_value = wiky.process(show_value || '');
+                this.$element.html(wiki_value);
+            }
+        },
+    });
+};
diff --git a/addons/wiki/static/src/lib/wiky/Readme.md b/addons/document_page/static/src/lib/wiky/Readme.md
similarity index 100%
rename from addons/wiki/static/src/lib/wiky/Readme.md
rename to addons/document_page/static/src/lib/wiky/Readme.md
diff --git a/addons/wiki/static/src/lib/wiky/autogit.sh b/addons/document_page/static/src/lib/wiky/autogit.sh
similarity index 100%
rename from addons/wiki/static/src/lib/wiky/autogit.sh
rename to addons/document_page/static/src/lib/wiky/autogit.sh
diff --git a/addons/wiki/static/src/lib/wiky/index.html b/addons/document_page/static/src/lib/wiky/index.html
similarity index 100%
rename from addons/wiki/static/src/lib/wiky/index.html
rename to addons/document_page/static/src/lib/wiky/index.html
diff --git a/addons/wiki/static/src/lib/wiky/input_complete b/addons/document_page/static/src/lib/wiky/input_complete
similarity index 100%
rename from addons/wiki/static/src/lib/wiky/input_complete
rename to addons/document_page/static/src/lib/wiky/input_complete
diff --git a/addons/wiki/static/src/lib/wiky/jquery-1.4.2.min.js b/addons/document_page/static/src/lib/wiky/jquery-1.4.2.min.js
similarity index 100%
rename from addons/wiki/static/src/lib/wiky/jquery-1.4.2.min.js
rename to addons/document_page/static/src/lib/wiky/jquery-1.4.2.min.js
diff --git a/addons/wiki/static/src/lib/wiky/wiky.css b/addons/document_page/static/src/lib/wiky/wiky.css
similarity index 100%
rename from addons/wiki/static/src/lib/wiky/wiky.css
rename to addons/document_page/static/src/lib/wiky/wiky.css
diff --git a/addons/wiki/static/src/lib/wiky/wiky.js b/addons/document_page/static/src/lib/wiky/wiky.js
similarity index 100%
rename from addons/wiki/static/src/lib/wiky/wiky.js
rename to addons/document_page/static/src/lib/wiky/wiky.js
diff --git a/addons/document_page/test/document_page_test00.yml b/addons/document_page/test/document_page_test00.yml
new file mode 100644
index 00000000000..3c8dba80294
--- /dev/null
+++ b/addons/document_page/test/document_page_test00.yml
@@ -0,0 +1,54 @@
+-
+    In order to test the document_page in OpenERP, I create a new page to category demo_category1
+-
+    !record {model: document.page, id: test_page0}:
+      name: Test Page0
+      parent_id: demo_category1
+      content: 'Test content
+
+      The Open ERP wiki allows you to manage your enterprise contents using wiki
+
+      restructured texts. This module provides a collaborative way to manage internal
+
+      FAQs, quality manuals, technical references, etc.'
+
+-
+    I check the category index contains my page.
+-
+    !python {model: document.page}: |
+      res = self.read(cr, uid, [ref('demo_category1')], ['display_content'])
+      assert res[0]['display_content'].find('Test Page') > 1
+-
+    !record {model: document.page, id: test_page0}:
+      content: 'Test updated content
+
+      The Open ERP wiki allows you to manage your enterprise contents using wiki
+
+      restructured texts. This module provides a collaborative way to manage internal
+
+      FAQs, quality manuals, technical references, etc.
+
+      Wiki text can easily be edited
+      '
+-
+    I check the page history for the current page by clicking on "Page History".After that find difference between history.
+-
+    !python {model: wizard.document.page.history.show_diff}: |
+      hist_obj = model.pool.get('document.page.history')
+      ids = hist_obj.search(cr, uid, [('page_id', '=', ref("test_page0"))])
+      model.get_diff(cr, uid, {'active_ids': ids[:] })
+-
+    I click the "create menu" link and i fill the form.
+-
+    !record {model: document.page.create.menu, id: test_create_menu0}:
+      menu_name: Wiki Test menu
+      menu_parent_id: base.menu_base_partner
+-
+    I create a Menu by clicking on "create menu"
+-
+    !python {model: document.page.create.menu}: |
+      ids = [ref("test_create_menu0")]
+      context['active_id'] = ref('test_page0')
+      self.document_page_menu_create(cr, uid, ids, context)
+
+
diff --git a/addons/wiki/web/__init__.py b/addons/document_page/web/__init__.py
similarity index 100%
rename from addons/wiki/web/__init__.py
rename to addons/document_page/web/__init__.py
diff --git a/addons/wiki/web/controllers/__init__.py b/addons/document_page/web/controllers/__init__.py
similarity index 100%
rename from addons/wiki/web/controllers/__init__.py
rename to addons/document_page/web/controllers/__init__.py
diff --git a/addons/wiki/web/controllers/wiki.py b/addons/document_page/web/controllers/wiki.py
similarity index 100%
rename from addons/wiki/web/controllers/wiki.py
rename to addons/document_page/web/controllers/wiki.py
diff --git a/addons/wiki/web/locales/bg.po b/addons/document_page/web/locales/bg.po
similarity index 100%
rename from addons/wiki/web/locales/bg.po
rename to addons/document_page/web/locales/bg.po
diff --git a/addons/wiki/web/locales/ca.po b/addons/document_page/web/locales/ca.po
similarity index 100%
rename from addons/wiki/web/locales/ca.po
rename to addons/document_page/web/locales/ca.po
diff --git a/addons/wiki/web/locales/da.po b/addons/document_page/web/locales/da.po
similarity index 100%
rename from addons/wiki/web/locales/da.po
rename to addons/document_page/web/locales/da.po
diff --git a/addons/wiki/web/locales/de.po b/addons/document_page/web/locales/de.po
similarity index 100%
rename from addons/wiki/web/locales/de.po
rename to addons/document_page/web/locales/de.po
diff --git a/addons/wiki/web/locales/de_DE/LC_MESSAGES/javascript.po b/addons/document_page/web/locales/de_DE/LC_MESSAGES/javascript.po
similarity index 100%
rename from addons/wiki/web/locales/de_DE/LC_MESSAGES/javascript.po
rename to addons/document_page/web/locales/de_DE/LC_MESSAGES/javascript.po
diff --git a/addons/wiki/web/locales/de_DE/LC_MESSAGES/messages.po b/addons/document_page/web/locales/de_DE/LC_MESSAGES/messages.po
similarity index 100%
rename from addons/wiki/web/locales/de_DE/LC_MESSAGES/messages.po
rename to addons/document_page/web/locales/de_DE/LC_MESSAGES/messages.po
diff --git a/addons/wiki/web/locales/es_CR.po b/addons/document_page/web/locales/es_CR.po
similarity index 100%
rename from addons/wiki/web/locales/es_CR.po
rename to addons/document_page/web/locales/es_CR.po
diff --git a/addons/wiki/web/locales/es_ES/LC_MESSAGES/javascript.po b/addons/document_page/web/locales/es_ES/LC_MESSAGES/javascript.po
similarity index 100%
rename from addons/wiki/web/locales/es_ES/LC_MESSAGES/javascript.po
rename to addons/document_page/web/locales/es_ES/LC_MESSAGES/javascript.po
diff --git a/addons/wiki/web/locales/es_ES/LC_MESSAGES/messages.po b/addons/document_page/web/locales/es_ES/LC_MESSAGES/messages.po
similarity index 100%
rename from addons/wiki/web/locales/es_ES/LC_MESSAGES/messages.po
rename to addons/document_page/web/locales/es_ES/LC_MESSAGES/messages.po
diff --git a/addons/wiki/web/locales/es_PY.po b/addons/document_page/web/locales/es_PY.po
similarity index 100%
rename from addons/wiki/web/locales/es_PY.po
rename to addons/document_page/web/locales/es_PY.po
diff --git a/addons/wiki/web/locales/fr.po b/addons/document_page/web/locales/fr.po
similarity index 100%
rename from addons/wiki/web/locales/fr.po
rename to addons/document_page/web/locales/fr.po
diff --git a/addons/wiki/web/locales/fr_FR/LC_MESSAGES/javascript.po b/addons/document_page/web/locales/fr_FR/LC_MESSAGES/javascript.po
similarity index 100%
rename from addons/wiki/web/locales/fr_FR/LC_MESSAGES/javascript.po
rename to addons/document_page/web/locales/fr_FR/LC_MESSAGES/javascript.po
diff --git a/addons/wiki/web/locales/fr_FR/LC_MESSAGES/messages.po b/addons/document_page/web/locales/fr_FR/LC_MESSAGES/messages.po
similarity index 100%
rename from addons/wiki/web/locales/fr_FR/LC_MESSAGES/messages.po
rename to addons/document_page/web/locales/fr_FR/LC_MESSAGES/messages.po
diff --git a/addons/wiki/web/locales/gl.po b/addons/document_page/web/locales/gl.po
similarity index 100%
rename from addons/wiki/web/locales/gl.po
rename to addons/document_page/web/locales/gl.po
diff --git a/addons/wiki/web/locales/javascript.pot b/addons/document_page/web/locales/javascript.pot
similarity index 100%
rename from addons/wiki/web/locales/javascript.pot
rename to addons/document_page/web/locales/javascript.pot
diff --git a/addons/wiki/web/locales/messages.pot b/addons/document_page/web/locales/messages.pot
similarity index 100%
rename from addons/wiki/web/locales/messages.pot
rename to addons/document_page/web/locales/messages.pot
diff --git a/addons/wiki/web/locales/ru.po b/addons/document_page/web/locales/ru.po
similarity index 100%
rename from addons/wiki/web/locales/ru.po
rename to addons/document_page/web/locales/ru.po
diff --git a/addons/wiki/web/locales/sk.po b/addons/document_page/web/locales/sk.po
similarity index 100%
rename from addons/wiki/web/locales/sk.po
rename to addons/document_page/web/locales/sk.po
diff --git a/addons/wiki/web/locales/tr.po b/addons/document_page/web/locales/tr.po
similarity index 100%
rename from addons/wiki/web/locales/tr.po
rename to addons/document_page/web/locales/tr.po
diff --git a/addons/wiki/web/static/css/wiki.css b/addons/document_page/web/static/css/wiki.css
similarity index 100%
rename from addons/wiki/web/static/css/wiki.css
rename to addons/document_page/web/static/css/wiki.css
diff --git a/addons/wiki/web/widgets/__init__.py b/addons/document_page/web/widgets/__init__.py
similarity index 100%
rename from addons/wiki/web/widgets/__init__.py
rename to addons/document_page/web/widgets/__init__.py
diff --git a/addons/wiki/web/widgets/rss/__init__.py b/addons/document_page/web/widgets/rss/__init__.py
similarity index 100%
rename from addons/wiki/web/widgets/rss/__init__.py
rename to addons/document_page/web/widgets/rss/__init__.py
diff --git a/addons/wiki/web/widgets/rss/feedparser.py b/addons/document_page/web/widgets/rss/feedparser.py
similarity index 100%
rename from addons/wiki/web/widgets/rss/feedparser.py
rename to addons/document_page/web/widgets/rss/feedparser.py
diff --git a/addons/wiki/web/widgets/templates/wiki.mako b/addons/document_page/web/widgets/templates/wiki.mako
similarity index 100%
rename from addons/wiki/web/widgets/templates/wiki.mako
rename to addons/document_page/web/widgets/templates/wiki.mako
diff --git a/addons/wiki/web/widgets/wiki.py b/addons/document_page/web/widgets/wiki.py
similarity index 100%
rename from addons/wiki/web/widgets/wiki.py
rename to addons/document_page/web/widgets/wiki.py
diff --git a/addons/wiki/web/widgets/wikimarkup/__init__.py b/addons/document_page/web/widgets/wikimarkup/__init__.py
similarity index 100%
rename from addons/wiki/web/widgets/wikimarkup/__init__.py
rename to addons/document_page/web/widgets/wikimarkup/__init__.py
diff --git a/addons/wiki/wizard/__init__.py b/addons/document_page/wizard/__init__.py
similarity index 91%
rename from addons/wiki/wizard/__init__.py
rename to addons/document_page/wizard/__init__.py
index 90b18b261ea..e24534647f4 100644
--- a/addons/wiki/wizard/__init__.py
+++ b/addons/document_page/wizard/__init__.py
@@ -19,9 +19,7 @@
 #
 ##############################################################################
 
-import wiki_wiki_page_open
-import wiki_create_menu
-import wiki_make_index
-import wiki_show_diff
+import document_page_create_menu
+import document_page_show_diff
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/document_page/wizard/document_page_create_menu.py
similarity index 59%
rename from addons/wiki/wizard/wiki_create_menu.py
rename to addons/document_page/wizard/document_page_create_menu.py
index 654a9ff3898..68697233f84 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/document_page/wizard/document_page_create_menu.py
@@ -21,33 +21,35 @@
 
 from osv import fields, osv
 
-class wiki_create_menu(osv.osv_memory):
+class document_page_create_menu(osv.osv_memory):
     """ Create Menu """
-    _name = "wiki.create.menu"
+    _name = "document.page.create.menu"
     _description = "Wizard Create Menu"
 
     _columns = {
-        'menu_name': fields.char('Menu Name', size=256, select=True, required=True),
+        'menu_name': fields.char('Menu Name', size=256, required=True),
         'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
     }
 
-    def wiki_menu_create(self, cr, uid, ids, context=None):
-
-        """ Create Menu On the base of Group id and Action id
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of create menu’s IDs
-
-        """
+    def default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
-        obj_wiki_group = self.pool.get('wiki.groups')
+        res = super(document_page_create_menu,self).default_get(cr, uid, fields, context=context)
+        page_id = context.get('active_id')
+        obj_page = self.pool.get('document.page')
+        page = obj_page.browse(cr, uid, page_id, context=context)
+        res['menu_name'] = page.name
+        return res
+
+    def document_page_menu_create(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        obj_page = self.pool.get('document.page')
         obj_view = self.pool.get('ir.ui.view')
         obj_menu = self.pool.get('ir.ui.menu')
         obj_action = self.pool.get('ir.actions.act_window')
-        group_id = context.get('active_id', False)
-        if not group_id:
-            return {}
+        page_id = context.get('active_id', False)
+        page = obj_page.browse(cr, uid, page_id, context=context)
 
         datas = self.browse(cr, uid, ids, context=context)
         data = False
@@ -55,40 +57,31 @@ class wiki_create_menu(osv.osv_memory):
             data = datas[0]
         if not data:
             return {}
-        value = {            
-            'name': 'Wiki Page',
+        value = {
+            'name': 'Document Page',
             'view_type': 'form',
             'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
+            'res_model': 'document.page',
             'view_id': False,
             'type': 'ir.actions.act_window',
+            'target': 'inlineview',
             'nodestroy': True,
         }
-        group = obj_wiki_group.browse(cr, uid, group_id, context=context)
-        value['domain'] = "[('group_id','=',%d)]" % (group.id)
-        if group.method == 'page':
-            value['res_id'] = group.home.id
-        elif group.method == 'list':
-            value['view_type'] = 'form'
-            value['view_mode'] = 'tree,form'
-        elif group.method == 'tree':
-            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
-            value['view_id'] = view_id
-            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
-            value['view_type'] = 'tree'
+        value['domain'] = "[('parent_id','=',%d)]" % (page.id)
+        value['res_id'] = page.id
 
         action_id = obj_action.create(cr, uid, value)
-            
         menu_id = obj_menu.create(cr, uid, {
                         'name': data.menu_name,
                         'parent_id':data.menu_parent_id.id,
                         'icon': 'STOCK_DIALOG_QUESTION',
                         'action': 'ir.actions.act_window,'+ str(action_id),
                         }, context)
-        obj_wiki_group.write(cr, uid, [group_id], {'menu_id':menu_id})        
-        return {'type':  'ir.actions.act_window_close'}
+        obj_page.write(cr, uid, [page_id], {'menu_id':menu_id})
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload',
+        }
 
 
-wiki_create_menu()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/document_page/wizard/document_page_create_menu_view.xml
similarity index 76%
rename from addons/wiki/wizard/wiki_create_menu_view.xml
rename to addons/document_page/wizard/document_page_create_menu_view.xml
index 213ca9dd2e2..6d689dfe41d 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/document_page/wizard/document_page_create_menu_view.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-<!-- Create Menu From view -->
-
+        <!-- Create Menu From view -->
         <record id="view_wiki_create_menu" model="ir.ui.view">
             <field name="name">Create Menu</field>
-            <field name="model">wiki.create.menu</field>
+            <field name="model">document.page.create.menu</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Create Menu" version="7.0">
@@ -15,20 +13,18 @@
                         <field name="menu_parent_id" />
                     </group>
                     <footer>
-                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
+                        <button name="document_page_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
                 </form>
             </field>
         </record>
-
-<!-- Create Menu Action -->
-
+        <!-- Create Menu Action -->
         <record id="action_wiki_create_menu" model="ir.actions.act_window">
             <field name="name">Create Menu</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wiki.create.menu</field>
+            <field name="res_model">document.page.create.menu</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
diff --git a/addons/wiki/wizard/wiki_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py
similarity index 72%
rename from addons/wiki/wizard/wiki_show_diff.py
rename to addons/document_page/wizard/document_page_show_diff.py
index acc7b67d026..ab5572768f4 100644
--- a/addons/wiki/wizard/wiki_show_diff.py
+++ b/addons/document_page/wizard/document_page_show_diff.py
@@ -26,44 +26,36 @@ import base64
 class showdiff(osv.osv_memory):
     """ Disp[ay Difference for History """
 
-    _name = 'wizard.wiki.history.show_diff'
+    _name = 'wizard.document.page.history.show_diff'
 
     def get_diff(self, cr, uid, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        """
         if context is None:
             context = {}
-        history = self.pool.get('wiki.wiki.history')
+        history = self.pool.get('document.page.history')
         ids = context.get('active_ids', [])
 
         diff = ""
         if len(ids) == 2:
             if ids[0] > ids[1]:
-                diff = base64.encodestring(history.getDiff(cr, uid, ids[1], ids[0]))
+                diff = history.getDiff(cr, uid, ids[1], ids[0])
             else:
-                diff = base64.encodestring(history.getDiff(cr, uid, ids[0], ids[1]))
+                diff = history.getDiff(cr, uid, ids[0], ids[1])
 
         elif len(ids) == 1:
             old = history.browse(cr, uid, ids[0])
-            nids = history.search(cr, uid, [('wiki_id', '=', old.wiki_id.id)])
+            nids = history.search(cr, uid, [('document_id', '=', old.document_id.id)])
             nids.sort()
-            diff = base64.encodestring(history.getDiff(cr, uid, ids[0], nids[-1]))
+            diff = history.getDiff(cr, uid, ids[0], nids[-1])
         else:
             raise osv.except_osv(_('Warning!'), _('You need to select minimum one or maximum two history revisions!'))
-
-
         return diff
 
     _columns = {
-        'file_path':fields.binary('Diff', readonly=True),
+        'diff': fields.text('Diff', readonly=True),
     }
 
     _defaults = {
-        'file_path': get_diff
+        'diff': get_diff
     }
 
-showdiff()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
similarity index 57%
rename from addons/wiki/wizard/wiki_show_diff_view.xml
rename to addons/document_page/wizard/document_page_show_diff_view.xml
index 4729586c858..c6066669dca 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -2,40 +2,39 @@
 <openerp>
     <data>
 
-<!-- Create Index Form view  -->
-
+        <!-- Create Index Form view  -->
         <record id="view_wiki_show_diff" model="ir.ui.view">
             <field name="name">Show Difference</field>
-            <field name="model">wizard.wiki.history.show_diff</field>
+            <field name="model">wizard.document.page.history.show_diff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <separator string="Notes"/>
-                    <field name="file_path" width="300"/>
+                    <field name="diff"/>
                     <footer>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
                 </form>
             </field>
         </record>
-
-<!-- Create Index Action  -->
-
+        <!-- Create Index Action  -->
         <record id="action_view_wiki_show_diff" model="ir.actions.act_window">
             <field name="name">Difference</field>
             <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wizard.wiki.history.show_diff</field>
+            <field name="res_model">wizard.document.page.history.show_diff</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
-<!-- Create Index Action Window  -->
-
-         <act_window id="action_view_wiki_show_diff_values"
-            key2="client_action_multi" name="Difference"
-            res_model="wizard.wiki.history.show_diff" src_model="wiki.wiki.history"
-            view_mode="form" target="new" view_type="form" />
+        <!-- Create Index Action Window  -->
+        <act_window 
+            id="action_view_wiki_show_diff_values"
+            key2="client_action_multi"
+            name="Difference"
+            res_model="wizard.document.page.history.show_diff"
+            src_model="document.page.history"
+            view_mode="form"
+            target="new"
+            view_type="form"/>
 
     </data>
 </openerp>
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/document_page/wizard/wiki_make_index.py
similarity index 100%
rename from addons/wiki/wizard/wiki_make_index.py
rename to addons/document_page/wizard/wiki_make_index.py
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/document_page/wizard/wiki_make_index_view.xml
similarity index 100%
rename from addons/wiki/wizard/wiki_make_index_view.xml
rename to addons/document_page/wizard/wiki_make_index_view.xml
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/document_page/wizard/wiki_wiki_page_open.py
similarity index 100%
rename from addons/wiki/wizard/wiki_wiki_page_open.py
rename to addons/document_page/wizard/wiki_wiki_page_open.py
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/document_page/wizard/wiki_wiki_page_open_view.xml
similarity index 100%
rename from addons/wiki/wizard/wiki_wiki_page_open_view.xml
rename to addons/document_page/wizard/wiki_wiki_page_open_view.xml
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 25b0873f876..5d34d428726 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -65,7 +65,7 @@
                             <page string="Personal Information" groups="base.group_hr_user">
                                 <group col="4">
                                     <group>
-                                        <field name="country_id"/>
+                                        <field name="country_id" options='{"no_open": true}'/>
                                         <field name="bank_account_id"/>
                                         <field name="address_home_id"/>
                                     </group>
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 39ead94d89b..7d9f161701b 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -25,10 +25,8 @@ class knowledge_config_settings(osv.osv_memory):
     _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_wiki_faq': fields.boolean('manage internal FAQ as a wiki',
-            help="""This installs the module wiki_faq."""),
-        'module_wiki_quality_manual': fields.boolean('use quality manual as a wiki',
-            help="""This installs the module wiki_quality_manual."""),
+        'module_document_page': fields.boolean('create static web pages',
+            help="""This installs the module document_page."""),
         '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.
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 33c9c15ae63..b1b76dd1d0b 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -29,18 +29,9 @@
                                 <field name="module_document_webdav" class="oe_inline"/>
                                 <label for="module_document_webdav"/>
                             </div>
-                        </div>
-                    </group>
-                    <group>
-                        <label for="id" string="Wiki"/>
-                        <div>
                             <div>
-                                <field name="module_wiki_quality_manual" class="oe_inline"/>
-                                <label for="module_wiki_quality_manual"/>
-                            </div>
-                            <div>
-                                <field name="module_wiki_faq" class="oe_inline"/>
-                                <label for="module_wiki_faq"/>
+                                <field name="module_document_page" class="oe_inline"/>
+                                <label for="module_document_page"/>
                             </div>
                         </div>
                     </group>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index aa152ad94d3..690d371e9db 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -156,6 +156,15 @@ class pos_session(osv.osv):
         ('closed', 'Closed & Posted'),
     ]
 
+    def _compute_cash_journal_id(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for record in self.browse(cr, uid, ids, context=context):
+            for st in record.statement_ids:
+                if st.journal_id.type == 'cash':
+                    result[record.id] = st.journal_id.id
+                    break
+        return result
+
     def _compute_cash_register_id(self, cr, uid, ids, fieldnames, args, context=None):
         result = dict.fromkeys(ids, False)
         for record in self.browse(cr, uid, ids, context=context):
@@ -211,6 +220,9 @@ class pos_session(osv.osv):
                 required=True, readonly=True,
                 select=1),
 
+        'cash_journal_id' : fields.function(_compute_cash_journal_id, method=True, 
+                type='many2one', relation='account.journal',
+                string='Cash Journal', store=True),
         'cash_register_id' : fields.function(_compute_cash_register_id, method=True, 
                 type='many2one', relation='account.bank.statement',
                 string='Cash Register', store=True),
@@ -459,26 +471,33 @@ class pos_order(osv.osv):
         order_ids = []
         for tmp_order in orders:
             order = tmp_order['data']
-            # order :: {'name': 'Order 1329148448062', 'amount_paid': 9.42, 'lines': [[0, 0, {'discount': 0, 'price_unit': 1.46, 'product_id': 124, 'qty': 5}], [0, 0, {'discount': 0, 'price_unit': 0.53, 'product_id': 62, 'qty': 4}]], 'statement_ids': [[0, 0, {'journal_id': 7, 'amount': 9.42, 'name': '2012-02-13 15:54:12', 'account_id': 12, 'statement_id': 21}]], 'amount_tax': 0, 'amount_return': 0, 'amount_total': 9.42}
-            # get statements out of order because they will be generated with add_payment to ensure
-            # the module behavior is the same when using the front-end or the back-end
-            statement_ids = order.get('statement_ids', [])
-            order_id = self.create(cr, uid, order, context)
-            order_ids.append(order_id)
-            # call add_payment; refer to wizard/pos_payment for data structure
-            # add_payment launches the 'paid' signal to advance the workflow to the 'paid' state
+            order_id = self.create(cr, uid, {
+                'name': order['name'],
+                'user_id': order['user_id'] or False,
+                'session_id': order['pos_session_id'],
+                'lines': order['lines']
+            }, context)
 
-            data = {
-                'journal': statement_ids[0][2]['journal_id'],
-                'amount': order['amount_paid'],
-                'payment_name': order['name'],
-                'payment_date': statement_ids[0][2]['name'],
-            }
+            for payments in order['statement_ids']:
+                payment = payments[2]
+                self.add_payment(cr, uid, order_id, {
+                    'amount': payment['amount'] or 0.0,
+                    'payment_date': payment['name'],
+                    'payment_name': payment.get('note', False),
+                    'journal': payment['journal_id']
+                }, context=context)
+
+            if order['amount_return']:
+                session = self.pool.get('pos.session').browse(cr, uid, order['pos_session_id'], context=context)
+                self.add_payment(cr, uid, order_id, {
+                    'amount': -order['amount_return'],
+                    'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'payment_name': _('return'),
+                    'journal': session.cash_journal_id.id
+                }, context=context)
+            order_ids.append(order_id)
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
-            wf_service.trg_write(uid, 'pos.order', order_id, cr)
-
-            #self.add_payment(cr, uid, order_id, data, context=context)
         return order_ids
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index 92c04944792..dda0b78e952 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -32,6 +32,181 @@
 
 If you install the PoS proxy, you will be able to interface OpenERP with retail materials; barcode scanners, printers, cash registers, weighing machine, credit card payments.</value>
         </function>
+
+        <record id="unreferenced_product" model="product.product">
+          <field name="list_price">1.00</field>
+          <field name="name">Unreferenced Products</field>
+          <field name="pos_categ_id" ref="categ_others"/>
+          <field name="image">iVBORw0KGgoAAAANSUhEUgAAAFUAAABQCAYAAABoODnpAAAABGdBTUEAALGPC/xhBQAAAAFzUkdC
+AkDAfcUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dE
+AP4A/gD+6xjUggAAAAlwSFlzAAAXEgAAFxIBZ5/SUgAAAAl2cEFnAAAAVQAAAFAA8yp5GQAAJFFJ
+REFUeNrdfXecVNXZ//fembnTy07f2dm+O9sXFtgC0kEBX9EQI0YRDWpiibFEjeaNJmqKRiXRBGI0
+eWMvYAMEEYWlKGULZXudrbO703sv9/7+WCHbUDC0/J7PZygzd855zvc85zzn+Z7nnCFwsYRhILr+
+DQTnlHD0va1Kud+ZJgr5c0RhfzY/GkzjR0PJVCwqpxJRMUnTPAAEACZBssIxNscfZVPOMMUfDlKC
+/gBPaPTxxUaXSD5gyiiwC7+oi3m33QGwiYvStAtaK2d9HWJqNZFRd0CpdlsKlT57pcJrn6X0OfLl
+fkeyLOCWSEJeDj8SJLixCDiJGFh0AgTDnCqDJkjQJIkYi4MIh4sQV8B4eeKoWyjzOcWKEbtE2eEQ
+K+vtYsURq0zb2jdrvp1jszKxB8v//wGVfLkN9Pfzkf67txUpdlNVsntkeYrDNF/vMGVrXSNCud8F
+fjQINp04pQwz5vvMFGUSU/ybARAnWQhyBXCJ5DDLtIEhhd44JE/5ciQp+bMhhf5I3/KbHJy2Jib2
+YOl/J6jKR7bCI1Wy8ntOGFIdg6syrL3fyzIbi9PtA/wkvxNUIn4KDOY/q2pSg042KspiwyVMwqAy
+LWzUZrf2qTO3DipTP+zMKmmXuBwJ63Pf/+8ANfmh9+EWK1j5/Y3TM6x9t+QPta/KG+pI0TmHCF48
+es5BPJMGEgAibArDSTqmIyVvpCMlf0ufOuPV9rSSE1K/Mz68fvU5r/OcSNKvPoVr9gqidMvGvExL
+zx3FA803FA80abRuC1gMDfoMGw+Mgk4TBBIECzRJgibIU8+RDA0WnQDJ0CAZZtx3vq2zSAAJgoRF
+qkZrapG1Kb10c48m6+8NC25oVbYdYuxPX32JgPpSHyoOvgeHTJuUZe6+pbS/8WdlPceyUpzDIBn6
+tA09CSKDUSvy8cXwCKSMRyCL+ARiX4Ar9IQovifKpgJxFifCAAwJhmAnYjwqHhPyoiGJIBKUikNe
+sTTo4coCHkIU8oEbj4D8FpAJjDq84aRkHM+a2deYXrqxR5v1qspjdRwuWQI88p85tf8IVN2DmzGc
+XU6U13w0u3Cw5deVXTVLDMOdbCoRO61lnrQWL18Mi0xLD8t1drMsucshVjS6hdJmP0/cHeCJhv08
+kdMrkAR9Amk0IlUnQLIZJGIE12NhS4IeShzyCYThgEwYCejEIV+ONOgpVnrtJRq3OU/nGlJqXWZS
+EvKB9XXHMqfRJcrioCs5N1FjqNrXmlr4ZG3JkoP6oXba9OcbLjyoRT95CR6BVFhgarutvLv2kYqu
+Wp084JoSzJNWGaD4MClSaaM2e2hAmXbQkqTdbZOoaoeVaX32pSv9GB5mcHPK2SvzjhnQawjFZ9uF
+Kdb+DKXXVql1m5em2QbmZFl69KmOQVIQCQLfAK5LKENtToWlLqfi2bbUglekAY+/+ZW7AOLsITrr
+bwhfakTZ/m1wSFUpRYMtv53bdmBNyUAzxU7EJyl8snC3QIquZEOoIyWvtk+d8eGwPGVXT0ZBr9hi
+jVn/eB3AO4f+spOBauNm+DTJ7Kz+1kydc/iKdGvfdflDbRWG4U6+LOiZElwCQJxkoyW1MPpV4fz3
+mtOKH1O7zIO1M5Yj+GjV+QNV9/NNKO86ggFVRsn03hMvLmquXpRu6z9t73t5IrSmFgWb0kuqezTZ
+/+zXZO6d+/Eb3vdeegNYrjx3QJ6ucTuGsHbdWlTf9BNJuqV3UZbZeGvJQOOSwsFWoSTsP+2oGlSm
+orp48YETmWX3F/Y1Ht9ddQ3MT19z7kFNvf8dfO/IhziSN2dOeXfdxiWNu6erfPZJihEA4iw2OpMN
+8bqc8kOdKXkvGnW5u1RDA4HGZ34GpFHnHcxJ4omh5J4NsGv1gqzhrivyhjrum2msn5s33MnmJGKT
+jIIEYBcpUF26pLk2p/ynN3z17oE/rXwQgy+uOXegZt/zOq6u+QAHC+YvqOo88vLSxt150qBnyiHk
+EMlRY6gyHc+a8WK3NufVzIFWR/Wqe8CsS7vwYE6UTf1Y9PbL6EvPk+eMdP2orOf4fZVdNWlKn33K
+tnj5YlSXLOk+nDfnzlVHPtzz8vK70fPXW/5zUDN/9hqm9TZgSKG/bE77wX9d3viFQRzyTTnku5Nz
+EwcK5+9qTi1+4ti0m+qlnbsYz0s3XWwoJ4ng7k0Izl+Nss9enFFkanlyXuuBFYaRLtbEJSABwM8T
+YXfpUuOh/MtuyzYb99fmlqN7423fWD7rGwG971WkWU2wyjSllV1H/nlFwxdFkpB3SkBpgkRNblXw
+SM6s3/9kLnXgk7sW8Njtn/MKCgq4fD6f29bWxp02bRq3sLCQa7PZuPv27ePeeeedXI1Gww2FQtyn
+nnqK+/bbb3MpiuLqdDpuRUUF99ixY1yZTMadPXs2d9GiRdyFCxdy582bx50/fz73nXfe4T7//PNc
+gUDAraqq4j711FPcV199lVtYWMgtLCzkrlmzhrtt2zbuNddcwy0sLORu376dS1EUd/369Vyl6Svu
+jnUVVIHYYetUGfY1QkKBpqdpXWY2ixk/oXHjUaQ4h+Rhild+IrOsRuOxjnDmr4WjfttpcWN/E6hK
+txM2qUpf0VnzwpLGPdOmGvKneoehsbBlnygcj70wUrL6gThNX8ho9KyFIAiM2P34Qb6GaaK11GD2
+Ncyuz4RY0nwA/Fj4VDsZAOKQD4ubqouCXMGfjxhmr5UFXP3aJz+G+Terzg7UsltfxJBMI5zTfuip
+xc3Vi6ZySmOFASCMBLCi7YD6+C6Fet/sStBjwshLWTgkASk3CHr11WhIz0DxjjcgmgCswu/Eoqa9
+83x8ye8O5c25K7lvwG8+TXnkVG+W3foCjv/fvSgcaPnx3LYv16Tb+scBOurhOYizqXGgMQAEsTBm
+7v0A9Y8+jrZeFwg252JjdkbC0DSqSjOx5A+Po2HFTQhy+OPaRgNIdQxiXuuB6wsHW+46/vC9RNm6
+F88M1Iq1z0MS8mHWj/502Sxj/cMlA03UxHEcY3Gwu3QRtk6/HAGeaBKwvEQMsw5th6GmHj0mPwjW
+N07dl4wwDIOZBXpk3HoDdhVehtgURlM02MIp7677ecUz6+fLgm6U3/z8t4NKs0j0K9OTCk2tj1V2
+HdGxv+Y9/y0EagyVCC5bjPDcMlTP+x68fMmkyik6jqoT1ZheVw+NrgTRxCU9xY4TIRmAb14V6ovn
+gZ4wgbHoBCq6a7WFppbH+1XpCoacPNjHvVNx83O4ed8byDF3r63oql2q8LsmLTGM6UVonjkLSlEC
+aQouvoy78EZuJVwi+bjCGAAkncCivuOoOlqLHTsOIxiJ/VfMsWAYpKq5OF5UjM6MkkkGkxRwo7Kz
+ZmHOSPeP/vbaz1ExwVrHgUoAePmKO3KKB5ruzhvuYE+cR22CJHhvuQtzF5SCjscAAH5rH7YNNOPd
+onmwS9WTTJ9gaExrPQz3r3+JfXtOABwewFz6VkvHoigpTUVw3d2wiBST5tfckS5WyUDTXbf9eGM+
+MaE9pzCoXPscal5/CFmWnh+V9RzP48aj4x6MESQ6FlyNFbdfD7mIB+brggiCQMQ9AlZRCqqXXodh
+qXYysGBQ2FGL8j2fYqjHgyjYuLD8/9kLA0Am4OJ/bv0BuhevQpQY7xeoRAzTe49nZ1p6b6t54iGi
+8ubnJoNKACj+yUt5BabWG1Idg+O8PQmgW1+A3DtuR16qAlMtQeUCEkSWDIdWrkFfkm7KYV482IKZ
+Oz5AjrYQMYK65C2WZhjk6hUouPN2dGUUT7LWFKcJhabW1aVPbywca60kAFStfRb3b/8T0m391xcO
+tmSx6cSpBwgAPjYPnqt/iCVLZp1WAYZhoBRRsJBuvJlXjj5t1iRgGQAFlm5c31qH/R8fwLDT913o
+ygsuixaUwb/qRngpwbg2sWkaRQPNaenWvh8efvMXqLz52X+DyhAEHrvh97pss/HaFOfQpEV+d24Z
+Zq35PuQi3rcqEPHakVKaAv9DT6I7JW9KYLMsPVD8+Sl88sqHiBL8S955SQUUKn/4PRjzxhsVDSDZ
+NYwcs/H7eXf9M/UklUJWrv0jZAE39E7TYsNwRyH3awcEfG2lHD7Cy66JlpflntFYZRhAIebjxruu
+Q8f169CoywMxATYGQJp9AHN2vINwpxXOEAPyEjfZmaVZMd/C5XbPBGulEnEYRjry9A7TUqXXhtlr
+nwVJEAR2zf0hJ8VhWplqH2BPXEL1qDJC6suqDoh5nMSZKsAwDGQCLoRKoH3VDTiWVjxpW4IGkOq1
+oGrbGyhgyUEIFaDpb9tzvXgi5LLDwrKyD3rUWcGJSyy93cRKcZpW7ii/hksDIMEAhW0HM9JtA7Mn
+MlBRFgcdyYa2svKiL3CakPabhM8mwROG8bpKh+OGCtBTAKvx2nBLZy2Gdh5CY9fQpTzHkpVzp1d3
+6gwtEfa/ifZRwsWLdFt/ZUnviSwCACkJeqH2WCr1jgEda4wHIwDYJCr0KNM/L01XDuM7bhLGIyEI
++CGIf/VrNExbCJpkTfKiioATxe/9DTuf/BMsPgYkedb9d0FAnZOrNfco0j61SlTjLIwEkGof1Kq8
+1iq53wny8w9+C7XXdpnWbWFNHPompT7YJ1TuIoDEdwWVYRhQbBLXXjMf1D33YG9uJeIszqQoRRb2
+Yfaud6Bo7sWAPQzy0uQLmD6h6vNBZZp3Yr6X2mMh1R7b3E8/epogNQ9/IFd7rGXi4MShz4ZJru9u
+Cwoa8B2G/kThUWwoJAlYll+OA6ULEZ2CrJBEg5i790MU9NsgUmUjcenNsWR7WNxsUug7o6x/s28n
+OVeV11qq+/kmJal2W9OVXls6lRjv9f08MSwyzVHm0/kunKP0IBIMdHIWPqYI7J62GCE2dxKw/GgQ
+13bXQH2oHnsOtYxyspfOPEswv8nyWmSaeq9gPInEScSh8trSVV5bJikNeQxyn1M2MT3RKUqCU6w4
++tFHvpNvnQudwNAJxHwmpN3zY5xYsQaBCUsUBgAvHsGsA1vQ8MhjaGi3gLyEONk3OjhwieTHXCL5
+pJROuc8plQS9+WxRyG+QhjyTVvUukTzkEUjbInzROVeMADB/lgFmQw62OZxYdmwPxGHfOKadS8cx
+48gOxP0+dLPmIF3HBzGJhrzwQotE8Aik7S5Rkh/AOHCkQQ8lDvvySGEkkCUIB8bNpzQAt1Dm9vHE
+JkWS+LwoRxIEtBISoVkF2LfoWrj40kkWy6ETqGo+gNw9u2G2JRC7BKgCrVIGL19scgtkzrEzPgNA
+EAlAGA5kkvxISMeLRcZ9kSZJ+Hkih0codepU0vOjHUGAYRjo5VwcJQN4f9pCOESKKTnZ2V11yNz2
+MbweNkKxM45BzovoNTK4RHK3nydyJMjxKxRuLAJ+NKQjufGwij0hSyNOshHm8Fx2sTIklwrPu6Ih
+xyDSrrwMxtsehFkymZMFQ6OivwHZH22C38VCKHbxVgXKJBGsCn0oRPEdcda/900ZAOxEHNxYWEFy
+4nERix7f+zTJQoxN+SPqjJiQf/7TdBiGQa5eie//4g7sX3Y9BmXJUwDLYPpAE8p2fgTbQABR5uKs
+Y0V8LpBTEY+yKX9iQiDDYhLgJGJCkmQSFIHxkRRNEIizWBFoc2gO+8IozzAMNFIKRJoYtdesRY9c
+PyXDlT/QggX7PsUnb38GqztwwRkuFkkAKQRDk6zY2AxvACAYBiTDUKMU/AQHwIAAA4IBCwxxAdVm
+GEAhYmMg4MNr2dNxC5eHrJHuSadVcka60Lv+CbwZCMBKhyAgL6CO4/+Y8nOSJsgoM2Z1zWA0r55N
+J7gw97FiiQvtGAhEvA7Is2QIPPwEOlMLp7TYTFs/kjf8Ae4WM3xxFi7U9gzDMIAVBEnTnIm5VwxB
+gCbIKBlncfwTvRiLToCKRUSU2cjxByNnV+s5UjxJxMVNd/wA/Wt/jOO6fBDEFJysaxjL9m+Fs64b
+YUJwQXQLhKJAZz2bSsSErAlhdIJgIc5iB8gwh+uIs9gTtgni4EdDcpXXxnd4Ahcc1JPASgVciORA
+x/euR3166ZScrMY1gpVHduLYW5+gy+Q87yGt3e2H0jHI40XDchb972DkZF5uhMN1skNc/kiEwwNC
+vlMPkDQNUdgvlwY8crPdYy/J0V0UYAGAywLUWg5arrgSzAE+ZnTUnjoccRJYtd8B8q2/4uNYDIG8
+lElWfS7FZHFD7nPKhGG/cmKiSZTDRZjiD5MBrqgnwB0ff5MApEGPTBz26e1O31lVej6EpOPITBej
+4bJ5OFq6AHFiCk425EHhe3+DY/s++GnBqS30cy1mmweSkFcnDXrkY30/ASBICRDgCntJP0/U5RVI
+J02cSX6XQBr0FHBD/ouN6ehhtXgMORlSNFdVombGUkRJ9mTqMOzDVUd3If75V/DT5ydoYfxeSIOe
+fIXfMYkU8QokUR9P1EF6BZIOp0jumbhsSQo4keR3lX1/wbfvoF4woePQqzgwLZyL/WVLEGZNkXUY
+DmD50S8Q+ehT7K/r+NaThmcrt6RGIPc7Z8p9TmIiZk6R3OsVSDtIm0Tdb5Oo+qciXTVu80xizWEZ
+cM51+07CMABJADJeBHm/fAjHlq5GcApOVhAPY2b1+6j9xWPY/WUTGOKcrbYZ4uk+scpjnTlxPy/G
+YsMmVQ/aJcpecmT9dQ6bVH3cxxdP2nrVO0w5+aJgyaUC6kkhCWBhVQHmP/Mkai//IXwTcklPpnPO
+OLAF/r//A/6IEJF44lw4MNog8hfqHaZ8akxa1MmzAVapusH0wA02cvm1v2KsEtVBq0xDT1Qs1TEo
+ygjYrwBOHfe8ZIQAUDUtE6HZ07Bn3jXwTjCKUeowjkUdhyF45x1s2X7wXABLZATtl6faB6UTCWqr
+VMNYJeqDV937CE26hTLYpOqaQUXqyNhcTAaA0mNDtmNgedOgI/lSA/VkY6RUBJz5M7Cj6n/gEiZN
+og7ZdALTT1TD8vhjMPa4wUxwcGchTF2vTZXhGFyh8VjGDV0agEmpt9ikqsN2iXJUh+ac8t5+VfoR
+r2B8b3MTMRhGOguP1bYsxSU2BZwUkiDBTfgw/UfXovPm+2CZipNlGExvO4zKg/tRvfsYAtHvFHon
+Dn91YkHecOe0sfwzAcDPF6NflVHbnFZsBAGQDMngyiMfRocU+k9MitTExCGUZe0VWA7VLPJH4pfk
+njEwGn0VZKiw+okH0HHLfRiagpMlwKC0+yioPz0Dry2B4FluI4RiCZ7v2PHVORajcNJWvlxPmxT6
+7VfVfxIGA5A1rz8Ch1gBk1y/p1NnaI9OIF4lsRC4u7ZRRxuNZzRqplp0n3yPYZgpX2Ofm/j9qf4/
+9rmT/6ZpBulqCdIWTMPOuVdhUJE65TAvNbVi1s6P8f5r2+Dwhs44rD3R2s8R7t+llUX8470+yUKX
+ztA9JE/5wiLV4sibvxjtUIJhUPfSbSajNuejkSTdpF7O7jqG2ne3wB2Mfmvler0eWq0WAKBUKqHR
+aJCZmQmSJCGVSqFSqZCTkwMejwcejweVSoWMjAwkJSWBxWJBrVZDp9MhJSXlVBlcLhcAwGazoVKp
+oFarweGMLgEVCgXUajWEwtHFvlLIRtlVs1H3vbUY0GZPyXDlmtrAf+Zx1H5eD5ojxLe5C184hkPv
+bEFWa82490kA5qRkdGuzt7a/9OO+k7w0CwBMjV9g39pnYZeoLNKgZ2WWxSgdm8TKT8TgNlvhKJ6F
+/Fw9mpqa4HA4QJIkWlpaYLVaUV5eDolEgnvvvRcymQwDAwNITU3FsmXLYDAY0N/fDz6fj0WLFmHu
+3LmwWq0IBoOoqqrC8uXLEYvFYDabUVRUhBUrVkCpVKK/vx96vR7xeBxWqxVKpRLr1q2DQqGA2WyG
+SCRCWVkZ0tLSTulTVFyMgtwssGQC7I3wwB42QxVwTQIqye+E0m6FUZYBS8QHDkEjJSUFBoMBHR0d
+GB4ehlAoRGVlJT7fexyB557GxBPjNEHiiKFquD6n4peZH+w3H3nrkVNgj/YgQaDx6Z+2tekLNw/J
+9eOslQaQ29+Ctr//H4zDLpCnIYVJkoTb7cbbb7+N+vp6OJ1OsNlsbN68GQcPHkRfXx/4fD727t2L
+nTt3oq2tDSwWC0ajEZs3b0ZDQwPC4TDC4TDeeust1NXVwWq1gvV1ChCbzUZHRwfef/997N+/H/v2
+7YPH48Gbb76JmpoabNu2DcFgEO9/8AE6m45BmipA7813oCO9eJKuDIBMxyBS//4M7Mf6EKQn5xaQ
+BIGeEReaXnkNht6GcYCSAIblOrSmFm0+sepnjYkxaUqnsKt542FU/vx5pleT+c/jmWXGsREWAFBM
+AjnVH+PTf30AXygGFkmCIIhTyWQkSYIkSXg8HlitVvj9fpAkiUgkgqGhIfh8PtA0DYZhMDw8DK/X
+i3A4DDabDZvNBqfTiUAgADabDZ/PB4vFAp/PB4IgTr0YhsGuXbsQDAbB4/GQnZ2N+vp69Pf3gyRJ
+ZGdnw2Kx4MiRI2AAFOZm4p6H1oF8/PdozZmJiTkhNIAU1whWfLUdtkOtiJCjnOxouwgEonFsf30L
+sj5/H1x6PCMVY7FxPLOsr0ed+c+qzc/Rta8/dOqzcR49ZfoyvPTq/Y5Ns6/jqD3WJRqvjRzbO6Jo
+CK7efjiLK3HVVUtRVFiIiooKrFy5EosXL0ZJSQmUSiWKioqQkZGBzZs3Y9q0acjPz8fMmTOxc+dO
+iMVilJaWoqKiAt3d3eju7kZlZSXKyspAURS2b9+OOXPmoLCwEAaDAZs2bUJlZSXKy8uRm5uLw4cP
+IysrC7NmzUJ1dTUIgoDb7cbq1atRXV0NPp+PpqYm3HTTTTAajSBB48qrr8AuLw1b3xB0HsukIEEU
+9kNvNaGdSIJiWimy07RIz8hCa6cNwlc2INtsnGSlnToDvb9o4XMH3/nfj14pW4bhhs9PfT7ubGrt
+Gw/hnlv+BKdY/lpNbuWVOtfwYlnAPS5zxNDXhGPvvw/7nEosmVOIwsLCcT3Y1tYGiqKQlJQEgUAA
+v9+PeDwOjUaDpKQkhMNhMAwDg8EAtVoNr9cLt9sNiUQCrVYLNpsNj8cDFosFrVYLgUCA5ORk5OTk
+AAAMBgNUKhUAwOfzoaysDH6/H3w+H16vFxKJBHl5eZDJZPD7/YjFYoiHgyBIJ2S/eRINf3kRJQ37
+waYT4zhZZcCFonc3Yks4jCufeAjuMAXutk+Q33Ni0lkyD1+C2tzKr4zJOf9Xcct61L3+4DgMJh/4
+JRik2/odralFv9U7h4oWN+3RkGO2sFlgUFK/G7VPPQPO7x83zZ+Z2zJ2XCUSCWzcuBH9/f1Ys2YN
+9Ho93nvvPfzhD39AaWkpKisr8e6772L9+vXg8Xh49tlnYTQa8fzzz8PlcuHRRx+FQCDAhg0bYDQa
+cfXVVyMzM/NU/fPnz8fDDz8Mv9+Pxx57DOXl5di2bRs2bdqEG2+8EbNnz0ZjYyPWrl2LGTNm4O67
+74bZbAafYuOG65fh1ThJHV4fnVHVVSMZeysFAyAp7EPpR//AVq8PRCyKypqdYE/YF6VJEvU55faW
+1KLfZVj6rB6RBGckZbe+AOxmiGXX/uqRDWklsf0As2/Maz/AfEoJmIeqVvUv/+mGFQzDsBmGoU6+
+nnnmGSo5OZnq7u6mGIah9u/fT0mlUurDDz+kGIahrFYrlZeXRz3wwAMUwzAUTdPUjTfeSFVVVVF+
+v59iGIZ6+eWXKYVCQTU2NlJjy2YYhlq3bh01b948KhgMUgzDUP/6178ojUZDtba2UgzDUI2NjZRK
+paJef/11imEYaseOHdRbb71FMQxD/bXWxFt8/RM/eaJ4keMLNsVM1bZdLIrZdZrP/pZaFF+x6peP
+4xUTWXbr1Ad+T7v0nXHrC7CJVeI5HYdevrpuyw2pjqFJJ6n9PBH2lCzuOWyY87PDbz3yaco9b2Jo
+481n1nMXSXJ/+i905c8mFxz64Ia5rV+un992QMOLhr+V2CABDCXpsLXimg+O5M3+sdzndB979f4p
+nz1t6EktXY1kuzU6JE85FmdRs/SOwTRBNDTuGW48ijTHYBLBMIvZ+3ttXWmFLZnFC2ln3daLjd1p
+xVm3FdlZs5jjN93bzJhMxgTJmqNzDknH5udOFAKAWyjD59OX1R7Lmnm33O8aDnN4sB779OxA9Rza
+CkHVaqS4R9x96szGOIs9L9UxqJp4vJJKxJBmHxDzoqElLDpBWaWaE5lFC8LmWzcCO/9ysTGcUlx1
+W5Eiz8dV9dvbq0uXDALEiiyLkUtOEWITAAI8IfaULu2qza28U+W1NlplGrS8ctdpy/9GksR59BOw
+59+M6f0nhpvSSltpkjVP7zAlTexVNp2A3jHEVfgcc2mSLLRJ1e3m3y+3yGPlCH35zsXGcJLInvwM
+1qdX4cGr7ivIG+64a1pfwzS11zoppCEABLkC7C1ePHAo/7K7yo11+49mzULH33/yjeV/K/PkrN+G
+wJU/xaMf/bHvwznXtsdZ7LkpzqGkiRZLgIHaayPTbP35VDy2TLC7PRHgCjoMhqrI8O0bgZ0bLjaW
+wBYGZZQYCYIt/iS99ObZHYf/ennj5wuyrL2T8uEIAAGuEHuLF/cfLJj700NvPfrZ/St/jq6Xbv/W
+as6IznPVbsWJ2/+CPf+4x/jsktuawxS/XOseUQmnmOBFkSAyrT1JSp/jcioeLXeJlY4IGJO+aGHc
+8cQnwLtPXngwexhkRdIA9whX7bEtmmE8+vzi5up75nQe0simuGyHxOgcuqd0aefhvMvuPvTWo59l
+3fMajBtvPaPqzpgjddVuwZuPfITFRz/rPVxwWY2PLy6W+xyp0tDkvAAWTUPrsbCyLMZsud91tSjo
+LQnzBL6EfWSkWGGImTbsAN58+vyD2UWj2C4Cuq38FNfQ/FmdNU/Oa/vysYUte0syrX3siSmkwKiF
+Dst1+Hz6spoaQ9UdK49uP3D92udgOsPb006WcVYieHI3Zjfth1muyygeaPr9vNYD1xWa2jisMRHK
+xMKdoiR06PL97fr8Q/3K9E3DipQ9nYYyk8huS/h+t/w73fz4jTo+UY2gXE0a2mtSdI6hRem2/uvy
+htvn5w21SxR+JwiGmVLXBMlCe0p+/EDh/I+b00oeTXGaeg7lzoHvmavOqv7v1poBBqVPbIBHLBMX
+DLbdXdFV82B5d51KGvKe9lJCAPDxRBhQpsV7tNn9A8q0AxaZ9gubRFU/qMsZ9P1mSRh7gsDS75AE
+sScILOZD/FQ1L2W4O0Xttc3QuC1LU+0DC7PNxqw0ez9b8vWIOt1ljx6+GPXZ5fba3MoX2vUFG6QB
+l+fErKuAu7PPWp3/yERS738bg5pMsrL1q4XFg82/ruysmZdtMZJTXft5srLRKzVZcAukGElKjg/L
+U8wWmbbNLlY0eISyZh9PZAzwRGafQOJxCZNCAVVGFAotDSmPgSNAwGsn+Y4BTpLPwZcEvVJRyK8V
+h31Z0qCnSO5zTNe4LQUpzqHkZNcIRxZwgfP1CDqdPgmSBaMmi64xVB1sTit5qrZg9l69dSAx8MKZ
+D/dzCioA4M0GLNzyMYY1enWWuef20r6GO2f0HkvVus1TDrOJANMEgRCHB69AArcwifYIpEEvX+IJ
+cgWuMMXzRNlcX5xkRRiSjBM0zWHRCYqKR4W8WFgmDAeSxCGfTBZ0C2QBNykJesCLhcH6ut5vqpsh
+CFikGhzPLBtqyJj2sjE555XUoR7L3utuBn1T/n8EyTmbzFS/3ApbWgFRVrezNMvSc1dJf+MPigZb
+FCqvDSTDnNVF3zRGiYsEyUKCZIEmSDAECYKhRy/4pkcv+2bRiVOE8Jle9E0TBGxiJVpTi1xN6aUf
+G7XZG45PW9KgHu6irX9chXMh5zznMPW+t+GRyjmG/tZZmda+W/OG2lfmDbdrtC4zuF+zQmebQDCR
+/zzb7xIYPWtrlmnRqcuztqcU7OjVZL7ao8utEftd0b4zuL7zooJ6UnQPvAefWM7JNrUX6R2D12Za
+e6/ONnfnp9kHKWnADc7Xy5nzce//xLl7UJka7dFkd/Vqsj4ZVKa+b9TnN4m9ztjQn394zlce5xXU
+k0Ktr0E0PZ/I3vexWuccuizZOXxlqmPwshSHKUPrtvBkARd40TDYY67YZCb8/U2Kj21AgiAR5vDg
+FspgTtJGTAp9v0mRenA4KXnniDzlq+7KZWauuZ+J/GL2eW3zBT0xI3hiL4IKBZnTflSr9lhKFV57
+ldLnmKX02nLlfodaFvCIxCEvmx8NgRuLgE3HQdKj8+hJOfmDNHGSPfqDNBQfPr447hHKAg6RwuoQ
+K7rsEuVRu1h1xCZVN3TnTTML7M5E4LeXX7B2XrxD3w0xoJQN/tNf8XRD3RpZwJ0hCvtyROFAjiAS
+TOdHQzoqHpWxEzERi06c+ukkmiAjoz+dxHWHKP5IkCvoD/CE3T6euNsjlPYO6XLMof+dF8aJOFB2
+cU5f/z+rXz1t3lG/LgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wOC0xMFQxMzoyNjoxNSswMjow
+MJsC4wUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDgtMTBUMTM6MjY6MDkrMDI6MDDhVTFTAAAA
+GXRFWHRTb2Z0d2FyZQBNaWNyb3NvZnQgT2ZmaWNlf+01cQAAAABJRU5ErkJggg==</field>
+        </record>
     </data>
 </openerp>
 
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index bd11f5c070c..1168faa21ac 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -11,181 +11,6 @@
         <record id="categ_others" model="pos.category">
             <field name="name">Others</field>
         </record>
-        <record id="pomme_de_terre" model="product.product">
-          <field name="list_price">1.00</field>
-          <field name="name">Unreferenced Products</field>
-          <field name="pos_categ_id" ref="categ_others"/>
-          <field name="image">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</field>
-        </record>
-
 
         <record model="ir.ui.view" id="view_pos_pos_form">
             <field name="name">pos.order</field>
@@ -193,21 +18,19 @@ GXRFWHRTb2Z0d2FyZQBNaWNyb3NvZnQgT2ZmaWNlf+01cQAAAABJRU5ErkJggg==</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Point of Sale Orders" version="7.0">
-                    <div class="oe_form_topbar">
-                        <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft" context="{'pos_session_id' : session_id}"/>
-                        <button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
-                        <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                    <header>
+                        <button name="%(action_pos_payment)d" string="Payment" class="oe_highlight" type="action" states="draft" context="{'pos_session_id' : session_id}"/>
+                        <button name="action_invoice" string="Invoice" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
+                        <button name="refund" string="Return Products" type="object" 
                             attrs="{'invisible':[('state','=','draft')]}"/>
-                        <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                            <div class="oe_right">
-                                <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
-                            </div>
-                    </div>
+                        <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
+                    </header>
                     <sheet>
                     <group col="4" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="session_id" required="1" />
+                        <field name="session_id" required="1"/>
                         <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
                     </group>
                     <notebook colspan="4">
@@ -236,14 +59,14 @@ GXRFWHRTb2Z0d2FyZQBNaWNyb3NvZnQgT2ZmaWNlf+01cQAAAABJRU5ErkJggg==</field>
                             <group class="oe_subtotal_footer">
                                 <field name="amount_tax"/>
                                 <field name="amount_total"/>
-                                <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
+                                <button name="button_dummy" string="Update" class="oe_link" states="draft"/>
                             </group>
                         </page>
                         <page string="Payments">
                             <field name="statement_ids" colspan="4" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
                                     <field name="journal_id"/>
-                                    <field name="statement_id" />
+                                    <field name="statement_id"/>
                                     <field name="amount"/>
                                 </tree>
                                 <form string="Statement lines" version="7.0">
@@ -339,7 +162,7 @@ GXRFWHRTb2Z0d2FyZQBNaWNyb3NvZnQgT2ZmaWNlf+01cQAAAABJRU5ErkJggg==</field>
             </field>
         </record>
 
-        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="10" />
+        <menuitem name="Daily Operations" id="menu_point_of_sale" parent="menu_point_root" sequence="10"/>
         <menuitem parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="2" groups="group_pos_manager,group_pos_user"/>
         <menuitem name="Products" id="menu_point_of_sale_product" parent="menu_point_root" sequence="15" />
 
@@ -1099,15 +922,15 @@ GXRFWHRTb2Z0d2FyZQBNaWNyb3NvZnQgT2ZmaWNlf+01cQAAAABJRU5ErkJggg==</field>
                             <button name="%(action_pos_box_out)d" string="Take Money Out" type="action" states="opened,closing_control"/>
                         </div>
                         <h1 class="oe_title">
-                            Point of Sale Session: 
+                            Point of Sale Session:
                             <field name="name" attrs="{'invisible': [('name','=','/')]}" class="oe_inline"/>
                         </h1>
-                        <field name="config_id" invisible="1"/>
                         <field name="has_opening_control" invisible="1" />
                         <field name="has_closing_control" invisible="1" />
                         <group>
                             <group>
                                 <field name="user_id"/>
+                                <field name="config_id" attrs="{'invisible' : [('config_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
                                 <field name="start_at" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
@@ -1140,10 +963,11 @@ GXRFWHRTb2Z0d2FyZQBNaWNyb3NvZnQgT2ZmaWNlf+01cQAAAABJRU5ErkJggg==</field>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
                                     <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theorical Balance"/>
                                 </group>
-                                <div attrs="{'invisible' : [('state', '&lt;&gt;', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
+                                <div class="oe_clear"/>
+                                <div attrs="{'invisible' : [('cash_journal_id', '=', False)]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
                                     <p class="oe_view_nocontent_create">
                                     You can define another list of available currencies on the
-                                    <i>Cash Registers</i> tab of the <b><field name="cash_register_id" class="oe_inline"/></b>
+                                    <i>Cash Registers</i> tab of the <b><field name="cash_journal_id" class="oe_inline"/></b>
                                     payment method.
                                     </p>
                                 </div>
@@ -1219,6 +1043,19 @@ GXRFWHRTb2Z0d2FyZQBNaWNyb3NvZnQgT2ZmaWNlf+01cQAAAABJRU5ErkJggg==</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_pos_session_search" />
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to start a new session.
+              </p><p>
+                A session is a period of time, usually one day, during which
+                you sell through the point of sale. The user has to check the
+                currencies in your cash registers at the beginning and the end
+                of each session.
+              </p><p>
+                Note that you should better to use the menu <i>Your Session</i>
+                to quickly open a new session.
+              </p>
+            </field>
         </record>
 
         <menuitem
diff --git a/addons/point_of_sale/wizard/pos_box_entries.xml b/addons/point_of_sale/wizard/pos_box_entries.xml
index 7601ba97632..ae80722474e 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.xml
+++ b/addons/point_of_sale/wizard/pos_box_entries.xml
@@ -8,22 +8,24 @@
             <field name="model">pos.box.entries</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Put Money">
-                    <separator string="Fill in this form if you put money in the cash register:" colspan="4"/>
-                    <field name="journal_id"/>
-                    <field name="product_id"/>
-                    <field name="amount"/>
-                    <field name="session_id" />
-                    <field name="name"/>
-                    <field name="user_id" invisible="1" />
-                    <separator colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group col="2" colspan="2"/>
-                         <button icon="gtk-stop" special="cancel"
-                            string="Cancel" />
-                        <button name="get_in" string="Put Money"
-                            colspan="1" type="object" icon="gtk-apply" />
+                <form string="Put Money" version="7.0">
+                    <separator string="Fill in this form if you put money in the cash register:"/>
+                    <group col="4">
+                        <field name="journal_id"/>
+                        <field name="product_id"/>
+                        <field name="amount"/>
+                        <field name="session_id"/>
+                        <field name="name"/>
+                        <field name="user_id" invisible="1"/>
                     </group>
+                    <footer>
+                        <button name="get_in" string="Put Money" class="oe_highlight"
+                            type="object"/>
+                        or
+                        <button class="oe_link" special="cancel"
+                            string="Cancel"/>
+
+                    </footer>
                 </form>
             </field>
         </record>
@@ -34,7 +36,7 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
-            id="action_box_entries" />
+            id="action_box_entries"/>
 
         <act_window name="Put Money In"
             res_model="pos.box.entries"
@@ -42,7 +44,7 @@
             view_mode="form"
             target="new"
             key2="client_action_multi"
-            id="action_pos_session_box_entries" />
+            id="action_pos_session_box_entries"/>
 
 
     </data>
diff --git a/addons/point_of_sale/wizard/pos_box_out.xml b/addons/point_of_sale/wizard/pos_box_out.xml
index 1fed5b567b0..29c9df57b36 100644
--- a/addons/point_of_sale/wizard/pos_box_out.xml
+++ b/addons/point_of_sale/wizard/pos_box_out.xml
@@ -8,22 +8,23 @@
             <field name="model">pos.box.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Output Operation">
-                    <separator string="Describe why you take money from the cash register:" colspan="4"/>
-                    <field name="journal_id"/>
-                    <field name="product_id"/>
-                    <field name="amount"/>
-                    <field name="session_id" />
-                    <field name="name"/>
-                    <field name="user_id" invisible="1" />
-                    <separator colspan="4"/>
-                    <group colspan="4" col="4">
-                        <group col="2" colspan="2"/>
-                         <button icon="gtk-stop" special="cancel"
-                            string="Cancel" />
-                        <button name="get_out" string="Take Money"
-                            colspan="1" type="object" icon="gtk-apply" />
+                <form string="Output Operation" version="7.0">
+                    <separator string="Describe why you take money from the cash register:"/>
+                    <group colspan="4">
+                        <field name="journal_id"/>
+                        <field name="product_id"/>
+                        <field name="amount"/>
+                        <field name="session_id" />
+                        <field name="name"/>
+                        <field name="user_id" invisible="1" />
                     </group>
+                    <footer>
+                        <button name="get_out" string="Take Money"
+                            type="object" class="oe_highlight"/> or 
+                         <button icon="gtk-stop" special="cancel"
+                            string="Cancel" class="oe_link"/>
+
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_confirm.xml b/addons/point_of_sale/wizard/pos_confirm.xml
index dc0ea8eec4d..f7baa27f439 100644
--- a/addons/point_of_sale/wizard/pos_confirm.xml
+++ b/addons/point_of_sale/wizard/pos_confirm.xml
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Post All Orders" version="7.0">
-                    <header>
+                    <separator string="Generate Journal Entries"/>
+                    <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>
+                    <footer>
                         <button name="action_confirm" string="Generate Entries" type="object"  class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <separator string="Generate Journal Entries"/>
-                    <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 2280a971546..85f71c63433 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -9,16 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="POS Details" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print Report" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4" string="Dates">
                         <field name="date_start"/>
                         <field name="date_end"/>
                     </group>
                     <field name="user_ids"/>
+                    <footer>
+                        <button name="print_report" type="object" string="Print Report" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_discount.xml b/addons/point_of_sale/wizard/pos_discount.xml
index 57100ebd1c9..d17bea7f454 100644
--- a/addons/point_of_sale/wizard/pos_discount.xml
+++ b/addons/point_of_sale/wizard/pos_discount.xml
@@ -9,14 +9,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Apply Discount" version="7.0">
-                    <header>
-                        <button name="apply_discount" string="Apply Discount" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
                     <group>
                         <field name="discount"/>
                     </group>
+                    <footer>
+                        <button name="apply_discount" string="Apply Discount" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_open_statement.xml b/addons/point_of_sale/wizard/pos_open_statement.xml
index 2e2b295267f..6c4c96edcc9 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.xml
+++ b/addons/point_of_sale/wizard/pos_open_statement.xml
@@ -9,13 +9,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Open Statements" version="7.0">
-                    <header>
+                    <separator string="Do you want to open cash registers?"/>
+                    <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>
+                    <footer>
                         <button name="open_statement" type="object" string="Open Registers" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <separator string="Do you want to open cash registers?"/>
-                    <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 6d450f93043..4a8b0dfba84 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -3,25 +3,21 @@
     <data>
 
         <record id="view_pos_payment" model="ir.ui.view">
-            <field name="name">Add payment :</field>
+            <field name="name">Pay Order</field>
             <field name="model">pos.make.payment</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Add payment :">
-                <group colspan="4" col="4" >
-                    <group colspan="4">
-                        <field name="journal_id" />
-                        <field name="amount" />
-                        <field name="payment_name"/>
-                    </group>
-                    <newline/>
-                    <separator colspan="4"/>
-                    <group colspan="2"/>
-                    <group colspan="2">
-                        <button icon="gtk-stop" special="cancel" string="Cancel"/>
-                        <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
-                    </group>
+            <form string="Pay Order" version="7.0">
+                <group>
+                    <field name="journal_id" />
+                    <field name="amount" />
+                    <field name="payment_name"/>
                 </group>
+                <footer>
+                    <button name="check" string="Make Payment" type="object" class="oe_highlight"/>
+                    or 
+                    <button icon="gtk-stop" special="cancel" string="Cancel" class="oe_link"/>
+                </footer>
             </form>
             </field>
         </record>
diff --git a/addons/point_of_sale/wizard/pos_payment_report_user.xml b/addons/point_of_sale/wizard/pos_payment_report_user.xml
index c1a5e1447c5..cd06b6a6992 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_user.xml
+++ b/addons/point_of_sale/wizard/pos_payment_report_user.xml
@@ -4,7 +4,7 @@
         <!--   pos.details -->
 
         <record id="view_pos_payment_report" model="ir.ui.view">
-            <field name="name">Pyament Report</field>
+            <field name="name">Payment Report</field>
             <field name="model">pos.payment.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
diff --git a/addons/point_of_sale/wizard/pos_sales_user.xml b/addons/point_of_sale/wizard/pos_sales_user.xml
index 74299505567..cf39f3bb4ec 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.xml
+++ b/addons/point_of_sale/wizard/pos_sales_user.xml
@@ -9,16 +9,16 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sale By User" version="7.0">
-                    <header>
-                        <button name="print_report" type="object" string="Print Report" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" special="cancel" class="oe_link"/>
-                    </header>
                     <group col="4">
                         <field name="date_start"/>
                         <field name="date_end"/>
                         <field name="user_id"/>
                     </group>
+                    <footer>
+                        <button name="print_report" type="object" string="Print Report" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" special="cancel" class="oe_link"/>
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 96d55722752..918d29fcd02 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -36,8 +36,8 @@
                                             <field name="street2"/>
                                             <field name="zip"/>
                                             <field name="city"/>
-                                            <field name="country_id"/>
-                                            <field name="state_id"/>
+                                            <field name="country_id" options='{"no_open": true}'/>
+                                            <field name="state_id" options='{"no_open": true}'/>
                                             <templates>
                                                 <t t-name="kanban-box">
                                                     <h4><field name="name"/></h4>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index df81b11d6f0..5fdb968c239 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -49,7 +49,7 @@
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
                     <field name="price" invisible="not context.get('pricelist',False)"/>
-                    <field name="standard_price"/>
+                    <field name="standard_price" invisible="1"/>
                     <field name="state"/>
                     <field name="company_id" groups="base.group_multi_company" invisible="1"/>
                 </tree>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29ecea22de2..41e9ae51923 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -89,7 +89,7 @@
                     <group>
                         <group>
                             <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="partner_id" string = "Contact" on_change="onchange_partner_id(partner_id)"/>
+                            <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
                             <field name="privacy_visibility"/>
                             <field name="analytic_account_id" invisible="1" required="0"/>
                         </group>
@@ -328,7 +328,7 @@
                         <field colspan="4" name="name"/>
                         <field name="hours" widget="float_time"/>
                         <field name="date"/>
-                        <field name="user_id"/>
+                        <field name="user_id" options='{"no_open": true}'/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </form>
@@ -422,7 +422,7 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": true}'/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                         <group>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index cce02ab329d..a76b90e2f08 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -98,8 +98,8 @@
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="progress" position="after">
-                <field name="context_id" widget="selection"/>
-                <field name="timebox_id" widget="selection"/>
+                <field name="context_id" widget="selection" options='{"no_open": true}'/>
+                <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
             </field>
         </field>
     </record>
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index ca6a4d5f7a4..7b01dc519c3 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                       <group col="4">
-                          <field name="timebox_id" widget="selection"/>
+                          <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 9bdb71bb6db..06ed65fbfad 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
+    <data>
+        <record id="account_voucher.todo_open_invoice_menu" model="ir.actions.todo">
+            <field name="state">done</field>
+        </record>
+    </data>
     <data noupdate="1">
 
         <!-- After installation of the module, open the related menu -->
@@ -40,7 +45,7 @@
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
             <value>The Sales Management application has been installed.</value>
-            <value>&lt;b&gt;Click on the top menu &lt;i&gt;'Sales'&lt;/i&gt;&lt;/em&gt; to start managing your customers, sending quotations and processing sale orders.
+            <value>This modules allows you to create and send easily quotations and process your sales orders; from the delivery to the invoicing.
 
 If you need to manage your sales pipeline (leads, opportunities, phonecalls), you can install the module &lt;i&gt;CRM&lt;/i&gt; from the top menu Settings.</value>
         </function>
diff --git a/addons/sale_journal/i18n/nb.po b/addons/sale_journal/i18n/nb.po
new file mode 100644
index 00000000000..f913257447f
--- /dev/null
+++ b/addons/sale_journal/i18n/nb.po
@@ -0,0 +1,132 @@
+# 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-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-08-10 09:39+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: 2012-08-11 05:45+0000\n"
+"X-Generator: Launchpad (build 15780)\n"
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordrereferanse må være unik pr. firma!"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Merknad"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Type"
+msgstr "Faktureringstype"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid ""
+"This invoicing type will be used, by default, for invoicing the current "
+"partner."
+msgstr ""
+"Denne faktureringstypen blir brukt som standard for å fakturere aktuell "
+"partner."
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Feil! Du kan ikke lage uendelig struktur av assosierte medlemmer."
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Salg & Innkjøp"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Merknader"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Faktureringsmåte"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr "Faktureringstyper"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "Ikke gruppert"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Gruppert"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+
+#. module: sale_journal
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "Referanse må være unik pr firma!"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Faktureringstype"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Fakturering"
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 321a2498126..a4aa3a3fd68 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -64,7 +64,7 @@
                     <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
                     <div groups="base.group_user">
                         <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/> - 
-                        <button name="%(action_view_change_standard_price)d" string="Update"
+                        <button name="%(action_view_change_standard_price)d" string="update"
                             type="action" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"
                             class="oe_link"/>
                     </div>
@@ -104,17 +104,19 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations">
-                        <field name="qty_available"/>
-                        <field name="incoming_qty" groups="base.group_user"/>
+                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}">
+                        <label for="qty_available"/>
+                        <div>
+                            <field name="qty_available" class="oe_inline"/>
+                            <button name="%(action_view_change_product_quantity)d" string="update"
+                                type="action" groups="stock.group_stock_manager,stock.group_stock_user"
+                                class="oe_link"/>
+                        </div>
                         <label for="virtual_available" groups="base.group_user"/>
                         <div groups="base.group_user">
                             <field name="virtual_available" class="oe_inline"/>
-
-                            <button name="%(action_view_change_product_quantity)d" string="Update" attrs="{'invisible': [('type', '=', 'service')]}"
-                                type="action" icon="gtk-execute" groups="stock.group_stock_manager,stock.group_stock_user" class="oe_inline"/>
+                            (+<field name="incoming_qty" class="oe_inline"/> -<field name="outgoing_qty" class="oe_inline"/>)
                         </div>
-                        <field name="outgoing_qty" groups="base.group_user"/>
                     </group>
                     <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
                         <field name="track_production" groups="stock.group_production_lot"/>
diff --git a/addons/wiki/i18n/ar.po b/addons/wiki/i18n/ar.po
deleted file mode 100644
index d90b7d1f909..00000000000
--- a/addons/wiki/i18n/ar.po
+++ /dev/null
@@ -1,440 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-03-19 10:19+0000\n"
-"Last-Translator: kifcaliph <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: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: wiki
-#: field:wiki.groups,template:0
-msgid "Wiki Template"
-msgstr "نموذج ويكي"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki
-#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
-msgid "Wiki Pages"
-msgstr "صفحات ويكي"
-
-#. module: wiki
-#: field:wiki.groups,method:0
-msgid "Display Method"
-msgstr "طريقة العرض"
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
-msgid "Author"
-msgstr "المؤلف"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
-#: view:wiki.wiki.page.open:0
-msgid "Open Page"
-msgstr "صفحة عامة"
-
-#. module: wiki
-#: field:wiki.groups,menu_id:0
-msgid "Menu"
-msgstr "قائمة"
-
-#. module: wiki
-#: field:wiki.wiki,section:0
-msgid "Section"
-msgstr "قسم"
-
-#. module: wiki
-#: help:wiki.wiki,toc:0
-msgid "Indicates that this pages have a table of contents or not"
-msgstr "يوضح ما اذا كانت هذه الصفحات تحتوى على جدول محتويات او لا تحتوى"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
-msgid "Wiki History"
-msgstr "تاريخ ويكي"
-
-#. module: wiki
-#: field:wiki.wiki,minor_edit:0
-msgid "Minor edit"
-msgstr "تحرير ثانوى"
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,text_area:0
-msgid "Content"
-msgstr "محتوى"
-
-#. module: wiki
-#: field:wiki.wiki,child_ids:0
-msgid "Child Pages"
-msgstr "صفحات فرعية"
-
-#. module: wiki
-#: field:wiki.wiki,parent_id:0
-msgid "Parent Page"
-msgstr "صفحة رئيسية"
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
-msgid "Last Contributor"
-msgstr "المشارك الاخير"
-
-#. module: wiki
-#: field:wiki.create.menu,menu_parent_id:0
-msgid "Parent Menu"
-msgstr "القائمة الرئيسية"
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_make_index.py:52
-#, python-format
-msgid "There is no section in this Page"
-msgstr "ليس هناك قسم فى هذه الصفحة"
-
-#. module: wiki
-#: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
-msgid "Wiki Group"
-msgstr "مجموعة ويكي"
-
-#. module: wiki
-#: field:wiki.wiki,name:0
-msgid "Title"
-msgstr "العنوان"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_create_menu
-msgid "Wizard Create Menu"
-msgstr "إنشائ قائمة بالمعالج"
-
-#. module: wiki
-#: field:wiki.wiki,history_id:0
-msgid "History Lines"
-msgstr "سطور التاريخ"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Page Content"
-msgstr "محتوى الصفحة"
-
-#. module: wiki
-#: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
-#, python-format
-msgid "Warning !"
-msgstr "تحذير !"
-
-#. module: wiki
-#: code:addons/wiki/wiki.py:237
-#, python-format
-msgid "There are no changes in revisions"
-msgstr "لا يوجد تغيير فى المراجعات"
-
-#. module: wiki
-#: help:wiki.wiki,section:0
-msgid "Use page section code like 1.2.1"
-msgstr "استخدم كود مقطع الصفحة مثل 1.2.1"
-
-#. module: wiki
-#: field:wiki.create.menu,menu_name:0
-msgid "Menu Name"
-msgstr "اسم القائمة"
-
-#. module: wiki
-#: field:wiki.groups,notes:0
-msgid "Description"
-msgstr "الوصف"
-
-#. module: wiki
-#: field:wiki.wiki,review:0
-msgid "Needs Review"
-msgstr "يحتاج مراجعة"
-
-#. module: wiki
-#: help:wiki.wiki,review:0
-msgid ""
-"Indicates that this page should be reviewed, raising the attention of other "
-"contributors"
-msgstr ""
-"يشير إلى أنه ينبغي استعراض هذه الصفحة، زيادة اهتمام المشاركين الآخرين"
-
-#. module: wiki
-#: view:wiki.create.menu:0 view:wiki.make.index:0
-msgid "Menu Information"
-msgstr "معلومات القائمة"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
-msgid "Page History"
-msgstr "تاريخ الصفحة"
-
-#. module: wiki
-#: selection:wiki.groups,method:0
-msgid "Tree"
-msgstr "شجرة"
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Page Template"
-msgstr "قالب الصفحات"
-
-#. module: wiki
-#: field:wiki.wiki,tags:0
-msgid "Keywords"
-msgstr "كلمات مفتاحية"
-
-#. module: wiki
-#: model:ir.actions.act_window,help:wiki.action_wiki
-msgid ""
-"With Wiki Pages you can share ideas and questions with your coworkers. You "
-"can create a new document that can be linked to one or several applications "
-"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
-"There is a basic wiki editing for text format."
-msgstr ""
-"مع صفحات ويكي بإمكانك مشاركة أفكارك وأسألتك مع زملائك في العمل. بإمكانك "
-"إنشاء مستند جديد وربطه بتطبيق أو عدد من التطبيقات(المبيعات،إدارة شئون "
-"العملاء وغيرها). بإمكانك إستخدام كلمات لتسهيل الدخول لصفحاتك على الويكي. "
-"وهناك محرر ويكي لتنسيق النص."
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:54
-#, python-format
-msgid "Warning"
-msgstr "تحذير"
-
-#. module: wiki
-#: help:wiki.groups,home:0
-msgid "Required to select home page if display method is Home Page"
-msgstr "يتطلب اختيار الصفحة الرئيسية إذا كانت طريقة العرض هي الصفحة الرئيسية"
-
-#. module: wiki
-#: field:wiki.wiki.history,create_date:0
-msgid "Date"
-msgstr "التاريخ"
-
-#. module: wiki
-#: view:wiki.make.index:0
-msgid "Want to create a Index on Selected Pages ? "
-msgstr "يريد انشاء فهرسة للصفحات المختارة "
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
-#: view:wizard.wiki.history.show_diff:0
-msgid "Difference"
-msgstr "الفرق"
-
-#. module: wiki
-#: field:wiki.groups,page_ids:0
-msgid "Pages"
-msgstr "صفحات"
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Group Description"
-msgstr "وصف المجموعة"
-
-#. module: wiki
-#: view:wiki.wiki.page.open:0
-msgid "Want to open a wiki page? "
-msgstr "تريد أن تفتح صفحة ويكي؟ "
-
-#. module: wiki
-#: field:wiki.groups,section:0
-msgid "Make Section ?"
-msgstr "إنشاء قسم؟"
-
-#. module: wiki
-#: field:wiki.wiki.history,text_area:0
-msgid "Text area"
-msgstr "مساحة نصية"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Meta Information"
-msgstr "معلومات ميتا (meta)"
-
-#. module: wiki
-#: field:wiki.wiki,create_date:0
-msgid "Created on"
-msgstr "تم إنشاؤه في"
-
-#. module: wiki
-#: view:wiki.groups:0 view:wizard.wiki.history.show_diff:0
-msgid "Notes"
-msgstr "ملاحظات"
-
-#. module: wiki
-#: selection:wiki.groups,method:0
-msgid "List"
-msgstr "قائمة"
-
-#. module: wiki
-#: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
-msgid "Summary"
-msgstr "ملخّص"
-
-#. module: wiki
-#: field:wiki.groups,create_date:0
-msgid "Created Date"
-msgstr "تاريخ الإنشاء"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_history
-msgid "All Page Histories"
-msgstr "تاريخ كل الصفحات"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki
-msgid "wiki.wiki"
-msgstr "wiki.wiki"
-
-#. module: wiki
-#: help:wiki.groups,method:0
-msgid "Define the default behaviour of the menu created on this group"
-msgstr "تعريف السلوك الإفتراضي للقائمة المنشأة لهذه المجموعة"
-
-#. module: wiki
-#: view:wizard.wiki.history.show_diff:0
-msgid "Close"
-msgstr "إغلاق"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
-msgid "wizard.wiki.history.show_diff"
-msgstr "wizard.wiki.history.show_diff"
-
-#. module: wiki
-#: field:wiki.wiki.history,wiki_id:0
-msgid "Wiki Id"
-msgstr "معرف ويكي"
-
-#. module: wiki
-#: field:wiki.groups,home:0 selection:wiki.groups,method:0
-msgid "Home Page"
-msgstr "الصفحة الرئيسية"
-
-#. module: wiki
-#: help:wiki.wiki,parent_id:0
-msgid "Allows you to link with the other page with in the current topic"
-msgstr "يسمح لك لربط مع صفحة أخرى في هذا الموضوع الحالي"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Modification Information"
-msgstr "معلومات التعديل"
-
-#. module: wiki
-#: help:wiki.wiki,group_id:0
-msgid "Topic, also called Wiki Group"
-msgstr "موضوع، أيضاً يدعى مجموعة ويكي"
-
-#. module: wiki
-#: model:ir.ui.menu,name:wiki.menu_wiki_configuration view:wiki.wiki:0
-msgid "Wiki"
-msgstr "الويكي"
-
-#. module: wiki
-#: field:wiki.wiki,write_date:0
-msgid "Modification Date"
-msgstr "تاريخ التعديل."
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Configuration"
-msgstr "إعدادات"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
-#: model:ir.model,name:wiki.model_wiki_make_index view:wiki.make.index:0
-msgid "Create Index"
-msgstr "إنشاء فهرست"
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:54
-#, python-format
-msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr "تحتاج إلى اختيار كحد أدنى 1 وكحد أقصى 2 كمراجعة تاريخية"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Group By..."
-msgstr "تجميع حسب..."
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
-#: view:wiki.create.menu:0 view:wiki.groups:0 view:wiki.make.index:0
-msgid "Create Menu"
-msgstr "إنشاء القائمة"
-
-#. module: wiki
-#: field:wiki.wiki.history,minor_edit:0
-msgid "This is a major edit ?"
-msgstr "هذا التعديل الرئيسي؟"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_groups
-#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
-#: model:ir.model,name:wiki.model_wiki_groups
-#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups view:wiki.groups:0
-msgid "Wiki Groups"
-msgstr "مجموعات ويكي"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Topic"
-msgstr "موضوع"
-
-#. module: wiki
-#: field:wiki.wiki.history,write_uid:0
-msgid "Modify By"
-msgstr "التحرير بواسطة"
-
-#. module: wiki
-#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
-#: field:wiki.wiki,toc:0
-#, python-format
-msgid "Table of Contents"
-msgstr "المحتويات"
-
-#. module: wiki
-#: view:wiki.groups:0 view:wiki.wiki.page.open:0
-msgid "Open Wiki Page"
-msgstr "افتح صفحة ويكي"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki_page_open
-msgid "wiz open page"
-msgstr "افتح صفحة وز"
-
-#. module: wiki
-#: view:wiki.create.menu:0 view:wiki.make.index:0 view:wiki.wiki.page.open:0
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: wiki
-#: field:wizard.wiki.history.show_diff,file_path:0
-msgid "Diff"
-msgstr "فروق"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Need Review"
-msgstr "يحتاج مراجعة"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_review
-msgid "Pages Waiting Review"
-msgstr "مراجعة صفحات الانتظار"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
-msgid "Search Page"
-msgstr "بحث الصفحة"
diff --git a/addons/wiki/i18n/wiki.pot b/addons/wiki/i18n/wiki.pot
deleted file mode 100644
index 8349e7691be..00000000000
--- a/addons/wiki/i18n/wiki.pot
+++ /dev/null
@@ -1,454 +0,0 @@
-# #-#-#-#-#  wiki.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* wiki
-#
-# #-#-#-#-#  wiki.pot.web (PROJECT VERSION)  #-#-#-#-#
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"#-#-#-#-#  wiki.pot (OpenERP Server 6.1rc1)  #-#-#-#-#\n"
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+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"
-"#-#-#-#-#  wiki.pot.web (PROJECT VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#. module: wiki
-#: field:wiki.groups,template:0
-msgid "Wiki Template"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki
-#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
-msgid "Wiki Pages"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,method:0
-msgid "Display Method"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
-msgid "Author"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
-#: view:wiki.wiki.page.open:0
-msgid "Open Page"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,menu_id:0
-msgid "Menu"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,section:0
-msgid "Section"
-msgstr ""
-
-#. module: wiki
-#: help:wiki.wiki,toc:0
-msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
-msgid "Wiki History"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,minor_edit:0
-msgid "Minor edit"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,text_area:0
-msgid "Content"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,child_ids:0
-msgid "Child Pages"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,parent_id:0
-msgid "Parent Page"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
-msgid "Last Contributor"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.create.menu,menu_parent_id:0
-msgid "Parent Menu"
-msgstr ""
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_make_index.py:52
-#, python-format
-msgid "There is no section in this Page"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
-msgid "Wiki Group"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,name:0
-msgid "Title"
-msgstr ""
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_create_menu
-msgid "Wizard Create Menu"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,history_id:0
-msgid "History Lines"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Page Content"
-msgstr ""
-
-#. module: wiki
-#: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: wiki
-#: code:addons/wiki/wiki.py:237
-#, python-format
-msgid "There are no changes in revisions"
-msgstr ""
-
-#. module: wiki
-#: help:wiki.wiki,section:0
-msgid "Use page section code like 1.2.1"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.create.menu,menu_name:0
-msgid "Menu Name"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,notes:0
-msgid "Description"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,review:0
-msgid "Needs Review"
-msgstr ""
-
-#. module: wiki
-#: help:wiki.wiki,review:0
-msgid ""
-"Indicates that this page should be reviewed, raising the attention of other "
-"contributors"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.create.menu:0 view:wiki.make.index:0
-msgid "Menu Information"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
-msgid "Page History"
-msgstr ""
-
-#. module: wiki
-#: selection:wiki.groups,method:0
-msgid "Tree"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Page Template"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,tags:0
-msgid "Keywords"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,help:wiki.action_wiki
-msgid ""
-"With Wiki Pages you can share ideas and questions with your coworkers. You "
-"can create a new document that can be linked to one or several applications "
-"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
-"There is a basic wiki editing for text format."
-msgstr ""
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:54
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: wiki
-#: help:wiki.groups,home:0
-msgid "Required to select home page if display method is Home Page"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki.history,create_date:0
-msgid "Date"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.make.index:0
-msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
-#: view:wizard.wiki.history.show_diff:0
-msgid "Difference"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,page_ids:0
-msgid "Pages"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Group Description"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki.page.open:0
-msgid "Want to open a wiki page? "
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,section:0
-msgid "Make Section ?"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki.history,text_area:0
-msgid "Text area"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Meta Information"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,create_date:0
-msgid "Created on"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.groups:0 view:wizard.wiki.history.show_diff:0
-msgid "Notes"
-msgstr ""
-
-#. module: wiki
-#: selection:wiki.groups,method:0
-msgid "List"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_history
-msgid "All Page Histories"
-msgstr ""
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki
-msgid "wiki.wiki"
-msgstr ""
-
-#. module: wiki
-#: help:wiki.groups,method:0
-msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
-
-#. module: wiki
-#: view:wizard.wiki.history.show_diff:0
-msgid "Close"
-msgstr ""
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
-msgid "wizard.wiki.history.show_diff"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki.history,wiki_id:0
-msgid "Wiki Id"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.groups,home:0 selection:wiki.groups,method:0
-msgid "Home Page"
-msgstr ""
-
-#. module: wiki
-#: help:wiki.wiki,parent_id:0
-msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Modification Information"
-msgstr ""
-
-#. module: wiki
-#: help:wiki.wiki,group_id:0
-msgid "Topic, also called Wiki Group"
-msgstr ""
-
-#. module: wiki
-#: model:ir.ui.menu,name:wiki.menu_wiki_configuration view:wiki.wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki,write_date:0
-msgid "Modification Date"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Configuration"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
-#: model:ir.model,name:wiki.model_wiki_make_index view:wiki.make.index:0
-msgid "Create Index"
-msgstr ""
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:54
-#, python-format
-msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Group By..."
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
-#: view:wiki.create.menu:0 view:wiki.groups:0 view:wiki.make.index:0
-msgid "Create Menu"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki.history,minor_edit:0
-msgid "This is a major edit ?"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_groups
-#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
-#: model:ir.model,name:wiki.model_wiki_groups
-#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups view:wiki.groups:0
-msgid "Wiki Groups"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Topic"
-msgstr ""
-
-#. module: wiki
-#: field:wiki.wiki.history,write_uid:0
-msgid "Modify By"
-msgstr ""
-
-#. module: wiki
-#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
-#: field:wiki.wiki,toc:0
-#, python-format
-msgid "Table of Contents"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.groups:0 view:wiki.wiki.page.open:0
-msgid "Open Wiki Page"
-msgstr ""
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki_page_open
-msgid "wiz open page"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.create.menu:0 view:wiki.make.index:0 view:wiki.wiki.page.open:0
-msgid "Cancel"
-msgstr ""
-
-#. module: wiki
-#: field:wizard.wiki.history.show_diff,file_path:0
-msgid "Diff"
-msgstr ""
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Need Review"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_review
-msgid "Pages Waiting Review"
-msgstr ""
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
-msgid "Search Page"
-msgstr ""
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
deleted file mode 100644
index 0cbce7333f3..00000000000
--- a/addons/wiki/security/ir.model.access.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-wiki_wiki_all,wiki.wiki,model_wiki_wiki,,1,0,0,0
-wiki_groups_all,wiki.groups,model_wiki_groups,,1,0,0,0
-wiki_wiki,wiki.wiki,model_wiki_wiki,base.group_user,1,1,1,1
-wiki_groups,wiki.groups,model_wiki_groups,base.group_system,1,1,1,1
-wiki_wiki_history,wiki.wiki.history,model_wiki_wiki_history,base.group_user,1,0,1,0
-access_wiki_wiki_sale_manager,wiki.wiki.manager,model_wiki_wiki,base.group_sale_manager,1,1,1,1
-wiki_wiki_user,wiki.wiki user,model_wiki_wiki,base.group_document_user,1,1,1,1
diff --git a/addons/wiki/static/src/js/wiki.js b/addons/wiki/static/src/js/wiki.js
deleted file mode 100644
index 88bfec6602e..00000000000
--- a/addons/wiki/static/src/js/wiki.js
+++ /dev/null
@@ -1,13 +0,0 @@
-openerp.wiki = function (openerp) {
-    openerp.web.form.widgets.add( 'text_wiki', 'openerp.web.form.FieldText');
-/*
-    openerp.wiki = {};
-    openerp.wiki.FieldWikiReadonly = openerp.web.page.FieldCharReadonly.extend({
-        set_value: function (value) {
-            var show_value = wiky.process(value || '');
-            this.$element.find('div').html(show_value);
-            return show_value;
-        }
-    });
-*/
-};
diff --git a/addons/wiki/test/wiki_test00.yml b/addons/wiki/test/wiki_test00.yml
deleted file mode 100644
index d5a9cbc4bbb..00000000000
--- a/addons/wiki/test/wiki_test00.yml
+++ /dev/null
@@ -1,81 +0,0 @@
--
-    In order to test the wiki in OpenERP, I create a new wiki group on Select Display Method Tree
--
-    !record {model: wiki.groups, id: wiki_groups_wikigrouptest0}:
-      method: tree
-      name: Wiki Group Test
-      notes: I can Generate New Group for Select Display method = Tree.
--
-    Now I will create new wikipage and assign Group test to this page
--
-    !record {model: wiki.wiki, id: wiki_wiki_openerpwikiediting0}:
-      group_id: wiki.wiki_groups_wikigrouptest0
-      name: OpenERP Wiki Test
-      section: '1.1'
-      text_area: '=The Open ERP wiki=
-
-      The Open ERP wiki allows you to manage your enterprise contents using wiki
-
-      restructured texts. This module provides a collaborative way to manage internal
-
-      FAQs, quality manuals, technical references, etc.
-
-      '
--
-    I create Index on this current page by clicking on "Create Index" wizard
--
-    !python {model: wiki.make.index}: |
-      self.wiki_do_index(cr, uid, [1], {"active_model": "wiki.wiki", 
-            "active_ids": [ref("wiki_wiki_openerpwikiediting0")], "tz": False, 
-            "active_id": ref("wiki_wiki_openerpwikiediting0"), })
--
-    Now I will update the wikipage with other text
--
-    !record {model: wiki.wiki, id: wiki_wiki_openerpwikiediting0}:
-      text_area: '=The Open ERP wiki=
-
-      The Open ERP wiki allows you to manage your enterprise contents using wiki
-
-      restructured texts. This module provides a collaborative way to manage internal
-
-      FAQs, quality manuals, technical references, etc.
-      
-      Wiki text can easily be edited
-      '
--
-    I check the page history for the current page by clicking on "Page History".After that find difference between history.
--
-    !python {model: wizard.wiki.history.show_diff}: |
-      hist_obj = model.pool.get('wiki.wiki.history')
-      ids = hist_obj.search(cr, uid, [('wiki_id', '=', ref("wiki_wiki_openerpwikiediting0"))])
-      model.get_diff(cr, uid, {'active_ids': ids[:] })
--
-    I create a new wiki group on the Given Home Page
--
-    !record {model: wiki.groups, id: wiki_groups_wikigroupediting0}:
-      name: Wiki Group Editing
-      home: wiki.wiki_wiki_quickstart0
--
-    I Open the page for click on  "Open Wiki Page" button.
--
-    !python {model: wiki.groups}: |
-      self.open_wiki_page(cr, uid, [ref("wiki_groups_wikigroupediting0")], context)
--
-    In order to create a menu I will create wizard data
--
-    !record {model: wiki.groups, id: wiki.wiki_groups_wikiformatting0}:
-      home: wiki.wiki_wiki_main
--
-    I create a Menu by clicking on "create menu" button.
--
-    !record {model: wiki.create.menu, id: wiki_create_menu_0}:
-      menu_name: Wiki Test menu
-      menu_parent_id: base.menu_base_partner
--
-    I fill in the form and create the menu
--
-    !python {model: wiki.create.menu}: |
-      ids = self.search(cr, uid, [])
-      self.wiki_menu_create(cr, uid, ids, context)
-
-
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
deleted file mode 100644
index b945635bb92..00000000000
--- a/addons/wiki/wiki.py
+++ /dev/null
@@ -1,243 +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 osv import fields, osv
-from tools.translate import _
-import difflib
-import tools
-
-class wiki_wiki(osv.osv):
-    """ wiki """
-    _name = "wiki.wiki"
-
-wiki_wiki()
-
-class wiki_group(osv.osv):
-    """ Wiki Groups """
-
-    _name = "wiki.groups"
-    _description = "Wiki Groups"
-    _order = 'name'
-
-    _columns = {
-       'name':fields.char('Wiki Group', size=256, select=True, required=True),
-       'page_ids':fields.one2many('wiki.wiki', 'group_id', 'Pages'),
-       'notes':fields.text("Description"),
-       'create_date':fields.datetime("Created Date", select=True),
-       'template': fields.text('Wiki Template'),
-       'section': fields.boolean("Make Section ?"),
-       'method':fields.selection([('list', 'List'), ('page', 'Home Page'), \
-                                   ('tree', 'Tree')], 'Display Method', help="Define the default behaviour of the menu created on this group"),
-       'home':fields.many2one('wiki.wiki', 'Home Page', help="Required to select home page if display method is Home Page"),
-       'menu_id': fields.many2one('ir.ui.menu', "Menu", readonly=True),
-    }
-
-    _defaults = {
-        'method': lambda *a: 'page',
-    }
-
-    def open_wiki_page(self, cr, uid, ids, context=None):
-
-        """ Opens Wiki Page of Group
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of open wiki group’s IDs
-        @return: dictionay of open wiki window on give group id
-        """
-        if type(ids) in (int,long,):
-            ids = [ids]
-        group_id = False
-        if ids:
-            group_id = ids[0]
-        if not group_id:
-            return {}
-        value = {
-            'name': 'Wiki Page',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'wiki.wiki',
-            'view_id': False,
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-        }
-        group = self.browse(cr, uid, group_id, context=context)
-        value['domain'] = "[('group_id','=',%d)]" % (group.id)
-        if group.method == 'page':
-            value['res_id'] = group.home.id
-        elif group.method == 'list':
-            value['view_type'] = 'form'
-            value['view_mode'] = 'tree,form'
-        elif group.method == 'tree':
-            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
-            value['view_id'] = view_id
-            value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
-            value['view_type'] = 'tree'
-
-        return value
-wiki_group()
-
-
-class wiki_wiki2(osv.osv):
-    """ Wiki Page """
-
-    _inherit = "wiki.wiki"
-    _description = "Wiki Page"
-    _order = 'section,create_date desc'
-
-    _columns = {
-        'name': fields.char('Title', size=256, select=True, required=True),
-        'write_uid': fields.many2one('res.users', "Last Contributor", select=True),
-        'text_area': fields.text("Content"),
-        'create_uid': fields.many2one('res.users', 'Author', select=True, readonly=True),
-        'create_date': fields.datetime("Created on", select=True, readonly=True),
-        'write_date': fields.datetime("Modification Date", select=True, readonly=True),
-        'tags': fields.char('Keywords', size=1024, select=True),
-        'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'),
-        'minor_edit': fields.boolean('Minor edit', select=True),
-        'summary': fields.char('Summary', size=256),
-        'section': fields.char('Section', size=32, help="Use page section code like 1.2.1", select=True),
-        'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null',
-            help="Topic, also called Wiki Group"),
-        'toc': fields.boolean('Table of Contents',
-            help="Indicates that this pages have a table of contents or not"),
-        'review': fields.boolean('Needs Review', select=True,
-            help="Indicates that this page should be reviewed, raising the attention of other contributors"),
-        'parent_id': fields.many2one('wiki.wiki', 'Parent Page', help="Allows you to link with the other page with in the current topic"),
-        'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'),
-    }
-    _defaults = {
-        'toc': True,
-        'review': True,
-        'minor_edit': True,
-    }
-
-    def onchange_group_id(self, cr, uid, ids, group_id, content, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param ids: List of wiki page’s IDs
-            @return: dictionay of open wiki page on give page section  """
-
-        if (not group_id) or content:
-            return {}
-        grp = self.pool.get('wiki.groups').browse(cr, uid, group_id, context=context)
-        section = '0'
-        for page in grp.page_ids:
-            if page.section: section = page.section
-        s = section.split('.')
-        template = grp.template
-        try:
-            s[-1] = str(int(s[-1])+1)
-        except:
-            pass
-        section = '.'.join(s)
-        return {
-            'value':{
-                'text_area': template,
-                'section': section
-            }
-        }
-
-    def copy_data(self, cr, uid, id, default=None, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param id: Give wiki page's ID """
-
-        return super(wiki_wiki2, self).copy_data(cr, uid, id, {'wiki_id': False}, context)
-
-    def create_history(self, cr, uid, ids, vals, context=None):
-        history_id = False
-        history = self.pool.get('wiki.wiki.history')
-        if vals.get('text_area'):
-            res = {
-                'minor_edit': vals.get('minor_edit', True),
-                'text_area': vals.get('text_area', ''),
-                'write_uid': uid,
-                'wiki_id': ids[0],
-                'summary':vals.get('summary', '')
-            }
-            history_id = history.create(cr, uid, res)
-        return history_id
-
-    def create(self, cr, uid, vals, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks, """
-        wiki_id = super(wiki_wiki2, self).create(cr, uid,
-                             vals, context)
-        self.create_history(cr, uid, [wiki_id], vals, context)
-        return wiki_id
-
-    def write(self, cr, uid, ids, vals, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks, """
-        result = super(wiki_wiki2, self).write(cr, uid, ids, vals, context)
-        self.create_history(cr, uid, ids, vals, context)
-        return result
-
-wiki_wiki2()
-
-
-class wiki_history(osv.osv):
-    """ Wiki History """
-
-    _name = "wiki.wiki.history"
-    _description = "Wiki History"
-    _rec_name = "summary"
-    _order = 'id DESC'
-
-    _columns = {
-          'create_date': fields.datetime("Date", select=True),
-          'text_area': fields.text("Text area"),
-          'minor_edit': fields.boolean('This is a major edit ?', select=True),
-          'summary': fields.char('Summary', size=256, select=True),
-          'write_uid': fields.many2one('res.users', "Modify By", select=True),
-          'wiki_id': fields.many2one('wiki.wiki', 'Wiki Id', select=True)
-    }
-
-    _defaults = {
-        'write_uid': lambda obj, cr, uid, context: uid,
-    }
-
-    def getDiff(self, cr, uid, v1, v2, context=None):
-
-        """ @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks, """
-
-        history_pool = self.pool.get('wiki.wiki.history')
-        text1 = history_pool.read(cr, uid, [v1], ['text_area'])[0]['text_area']
-        text2 = history_pool.read(cr, uid, [v2], ['text_area'])[0]['text_area']
-        line1 = line2 = ''
-        if text1:
-            line1 = tools.ustr(text1.splitlines(1))
-        if text2:
-            line2=tools.ustr(text2.splitlines(1))
-        if (not line1 and not line2) or (line1 == line2):
-            raise osv.except_osv(_('Warning!'), _('There are no changes in revisions.'))
-        diff = difflib.HtmlDiff()
-        return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
-
-wiki_history()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/wiki_demo.xml b/addons/wiki/wiki_demo.xml
deleted file mode 100644
index 66cd6c74c18..00000000000
--- a/addons/wiki/wiki_demo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman')),(4, ref('base.group_document_user'))]" name="groups_id"/>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
deleted file mode 100644
index d0d4c35a80d..00000000000
--- a/addons/wiki/wiki_view.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <!-- Top menu item -->
-        <menuitem name="Knowledge"
-            id="knowledge.menu_document"
-            sequence="130"/>
-
-        <menuitem name="Configuration"
-            id="knowledge.menu_document_configuration"
-            parent="knowledge.menu_document" sequence="50"/>
-
-        <menuitem name="Wiki" id="menu_wiki_configuration"
-            parent="knowledge.menu_document_configuration" sequence="2"/>
-
-
-        <!--  Wiki Groups Tree view -->
-       <record model="ir.ui.view" id="wiki_group_tree">
-            <field name="name">wiki.groups.tree</field>
-            <field name="model">wiki.groups</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Wiki Groups">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <!--  Wiki Groups Form view -->
-        <record model="ir.ui.view" id="wiki_group_form">
-            <field name="name">wiki.groups.form</field>
-            <field name="model">wiki.groups</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wiki Groups" version="7.0">
-                    <group col="4" colspan="3" >
-                        <field name="name"/>
-                        <field name="create_date" readonly="2"/>
-                    </group>
-                    <group col="2" colspan="1">
-                        <field name="method"/>
-                        <field name="home" domain="[('group_id','=',active_id)]"
-                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Notes">
-                            <separator string="Group Description" colspan="4"/>
-                            <field name="notes" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Configuration">
-                            <separator string="Page Template" colspan="4"/>
-                            <field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
-                        </page>
-                    </notebook>
-                     <field name="menu_id"/>
-                     <button
-                        name="%(wiki.action_wiki_create_menu)d"
-                         string="Create Menu"
-                          type="action"
-                          icon="gtk-justify-fill"
-                          attrs="{'invisible':[('menu_id','!=',False)]}"/>
-                     <button
-                         name="open_wiki_page"
-                         string="Open Wiki Page"
-                          type="object"
-                          icon="gtk-ok"/>
-                </form>
-            </field>
-        </record>
-
-        <!--  Wiki Groups Action  -->
-        <record model="ir.actions.act_window" id="action_wiki_groups">
-            <field name="name">Wiki Groups</field>
-            <field name="res_model">wiki.groups</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-      <menuitem name="Wiki Groups"
-            parent="menu_wiki_configuration"
-            id="menu_action_wiki_groups"
-            action="action_wiki_groups"/>
-
-        <record model="ir.actions.act_window" id="action_wiki_groups_browse">
-            <field name="name">Wiki Groups</field>
-            <field name="res_model">wiki.groups</field>
-            <field name="view_type">tree</field>
-        </record>
-
-        <!-- wiki Tree view For child -->
-        <record id="view_wiki_tree_children" model="ir.ui.view">
-            <field name="name">wiki.wiki.tree.children</field>
-            <field name="model">wiki.wiki</field>
-            <field name="type">tree</field>
-            <field name="field_parent">child_ids</field>
-            <field name="priority">100</field>
-            <field name="arch" type="xml">
-                <tree string="Wiki">
-                    <field name="name"/>
-                    <field name="section" invisible="not context.get('section',False)"/>
-                    <field name="review"/>
-                    <field name="write_uid"/>
-                    <field name="write_date"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- wiki Tree view  -->
-        <record model="ir.ui.view" id="view_wiki_tree">
-            <field name="name">wiki.wiki.tree</field>
-            <field name="model">wiki.wiki</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Wiki">
-                    <field name="name"/>
-                    <field name="group_id"/>
-                    <field name="section" invisible="not context.get('section',False)"/>
-                    <field name="review"/>
-                    <field name="create_uid" invisible="context.get('create_uid',False)"/>
-                    <field name="write_uid"/>
-                    <field name="write_date" groups="base.group_no_one"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- wiki Form view  -->
-        <record model="ir.ui.view" id="view_wiki_form">
-            <field name="name">wiki.wiki.form</field>
-            <field name="model">wiki.wiki</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wiki" version="7.0">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name" class="oe_edit_only"/>
-                                <h1><field name="name" select="1"/></h1>
-                            <label for="group_id" class="oe_edit_only"/>
-                            <h2>
-                            <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/></h2>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="parent_id" domain="[('group_id','=',group_id)]"/>
-                                <field name="section"/>
-                            </group>
-                        </group>
-                        <notebook colspan="4">
-                            <page string="Content">
-                            <field name="text_area" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content"/>
-                            </page>
-                        </notebook>
-                        <group col="2" colspan="2" groups="base.group_no_one">
-                            <separator colspan="4" string="Modification Information"/>
-                            <field name="write_date" readonly="1"/>
-                            <field name="minor_edit"/>
-                            <field name="review"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator colspan="4" string="Meta Information"/>
-                            <field name="tags" widget="many2many_tags"/>
-                            <field name="toc" groups="base.group_no_one"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- wiki Search view  -->
-        <record id="view_wiki_filter" model="ir.ui.view">
-            <field name="name">wiki.wiki.search</field>
-            <field name="model">wiki.wiki</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Wiki">
-                    <field name="name"
-                        filter_domain="['|', '|', ('name','ilike',self), ('section','ilike',self), ('tags','ilike',self)]"
-                        string="Wiki"/>
-                    <field name="write_date" groups="base.group_no_one"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
-                    <field name="group_id"/>
-                    <field name="write_uid"/>
-                    <group expand="0" string="Group By...">
-                        <filter icon="terp-folder-blue" string="Wiki Group" domain="[]" context="{'group_by':'group_id'}"/>
-                        <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <!-- search page for wiki -->
-        <record model="ir.actions.act_window" id="action_wiki">
-            <field name="name">Wiki Pages</field>
-            <field name="res_model">wiki.wiki</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
-            <field name="search_view_id" ref="view_wiki_filter"/>
-            <field name="help">With Wiki Pages you can share ideas and questions with your coworkers. You can create a new document that can be linked to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format.</field>
-        </record>
-
-        <menuitem parent="knowledge.menu_document2"
-            id="menu_action_wiki_wiki" name="Wiki Pages"
-            action="action_wiki"/>
-
-        <!--  Pages Waiting Review -->
-        <record model="ir.actions.act_window" id="action_wiki_review">
-            <field name="name">Pages Waiting Review</field>
-            <field name="res_model">wiki.wiki</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
-            <field name="context">{'section':'1'}</field>
-            <field name="domain">[('review','=',True)]</field>
-            <field name="filter" eval="True"/>
-        </record>
-
-        <!-- History Tree view -->
-        <record model="ir.ui.view" id="view_wiki_history_tree">
-            <field name="name">wiki.wiki.history.tree</field>
-            <field name="model">wiki.wiki.history</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Wiki History">
-                    <field name="create_date"/>
-                    <field name="write_uid"/>
-                    <field name="minor_edit" groups="base.group_no_one"/>
-                    <field name="summary"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- History Form view  -->
-        <record model="ir.ui.view" id="wiki_history_form">
-            <field name="name">wiki.wiki.history.form</field>
-            <field name="model">wiki.wiki.history</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Wiki History" version="7.0">
-                    <sheet>
-                        <field name="wiki_id" colspan="4"/>
-                        <field name="summary" colspan="4"/>
-                        <field name="text_area" colspan="4" nolabel="1" widget="text_wiki"/>
-                        <field name="create_date" readonly="1"/>
-                        <field name="minor_edit" groups="base.group_no_one"/>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- History Action  -->
-        <record model="ir.actions.act_window" id="action_history">
-            <field name="name">All Page Histories</field>
-            <field name="res_model">wiki.wiki.history</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <act_window
-            context="{'search_default_wiki_id': [active_id], 'default_wiki_id': active_id}"
-            id="act_wiki_wiki_history"
-            name="Page History"
-            res_model="wiki.wiki.history"
-            src_model="wiki.wiki"/>
-
-        <act_window
-            context="{'search_default_group_id': [active_id], 'default_group_id': active_id}"
-            id="act_wiki_group_open"
-            name="Search Page"
-            res_model="wiki.wiki"
-            src_model="wiki.groups"/>
-
-        <record id="ir_open_wiki_pages" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">wiki.groups</field>
-            <field name="name">Search a Page</field>
-             <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/wiki_faq/__init__.py b/addons/wiki_faq/__init__.py
deleted file mode 100644
index 938f045b9fd..00000000000
--- a/addons/wiki_faq/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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/>.
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py
deleted file mode 100644
index e89a7f7e0c7..00000000000
--- a/addons/wiki_faq/__openerp__.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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': 'Wiki: Internal FAQ',
-    'version': '1.0',
-    'category': 'Knowledge Management',
-    'description': """
-This module provides a Wiki FAQ Template.
-=========================================
-
-It provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki FAQ.
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
-    'depends': ['wiki'],
-    'init_xml': [],
-    'update_xml': ['wiki_faq.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'auto_install': False,
-    'certificate' : '00475023941677743389',
-    'images': ['images/wiki_groups_internal_faq.jpeg','images/wiki_pages_internal_faq.jpeg'],
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_faq/i18n/ar.po b/addons/wiki_faq/i18n/ar.po
deleted file mode 100644
index 10a51a22c91..00000000000
--- a/addons/wiki_faq/i18n/ar.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-01-07 23:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"هذا البرنامج يوفر لك قالب للأسئلة الشائعة\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "مرجع إدارة الوثائق - الأسئلة الشائعة"
diff --git a/addons/wiki_faq/i18n/bg.po b/addons/wiki_faq/i18n/bg.po
deleted file mode 100644
index 81c48575203..00000000000
--- a/addons/wiki_faq/i18n/bg.po
+++ /dev/null
@@ -1,30 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-01 14:44+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Управление на документи - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/ca.po b/addons/wiki_faq/i18n/ca.po
deleted file mode 100644
index 628fb906088..00000000000
--- a/addons/wiki_faq/i18n/ca.po
+++ /dev/null
@@ -1,33 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-05 23:22+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Aquest mòdul proporciona una plantilla de FAQ (preguntes freqüents) per a la "
-"wiki.\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestió documental - Wiki - FAQ (preguntes freqüents)"
diff --git a/addons/wiki_faq/i18n/cs.po b/addons/wiki_faq/i18n/cs.po
deleted file mode 100644
index f11c798bbf8..00000000000
--- a/addons/wiki_faq/i18n/cs.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Czech 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-04-06 04:46+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Tento modul poskytuje šablonu wiki FAQ\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Správa dokumentů - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/da.po b/addons/wiki_faq/i18n/da.po
deleted file mode 100644
index 7d796c189e7..00000000000
--- a/addons/wiki_faq/i18n/da.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-11-17 08:48+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Dette modul leverer en wiki FAQ skabelon\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Dokument administration - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/de.po b/addons/wiki_faq/i18n/de.po
deleted file mode 100644
index 9e6257fe342..00000000000
--- a/addons/wiki_faq/i18n/de.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-05-19 18:57+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Dieses Modul bietet ein wiki als FAQ Template\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Dokumenten Management - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/el.po b/addons/wiki_faq/i18n/el.po
deleted file mode 100644
index ae1dd3afcb4..00000000000
--- a/addons/wiki_faq/i18n/el.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-09 10:31+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Αυτό το άρθρωμα παρέχει πρότυπο  Συχνών Ερωτήσεων WIKI\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr ""
diff --git a/addons/wiki_faq/i18n/es.po b/addons/wiki_faq/i18n/es.po
deleted file mode 100644
index 62593eaed6d..00000000000
--- a/addons/wiki_faq/i18n/es.po
+++ /dev/null
@@ -1,32 +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:16+0000\n"
-"PO-Revision-Date: 2010-12-28 07:46+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestion documental - Wiki - Preguntas frecuentes"
diff --git a/addons/wiki_faq/i18n/es_CR.po b/addons/wiki_faq/i18n/es_CR.po
deleted file mode 100644
index fba52c90eb5..00000000000
--- a/addons/wiki_faq/i18n/es_CR.po
+++ /dev/null
@@ -1,34 +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: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-02-18 23:26+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestion documental - Wiki - Preguntas frecuentes"
diff --git a/addons/wiki_faq/i18n/es_MX.po b/addons/wiki_faq/i18n/es_MX.po
deleted file mode 100644
index 39cb8f8bb5c..00000000000
--- a/addons/wiki_faq/i18n/es_MX.po
+++ /dev/null
@@ -1,32 +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:16+0000\n"
-"PO-Revision-Date: 2010-12-28 07:46+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2011-09-05 05:49+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestion documental - Wiki - Preguntas frecuentes"
diff --git a/addons/wiki_faq/i18n/es_VE.po b/addons/wiki_faq/i18n/es_VE.po
deleted file mode 100644
index 39cb8f8bb5c..00000000000
--- a/addons/wiki_faq/i18n/es_VE.po
+++ /dev/null
@@ -1,32 +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:16+0000\n"
-"PO-Revision-Date: 2010-12-28 07:46+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2011-09-05 05:49+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestion documental - Wiki - Preguntas frecuentes"
diff --git a/addons/wiki_faq/i18n/fi.po b/addons/wiki_faq/i18n/fi.po
deleted file mode 100644
index cc1d6532e75..00000000000
--- a/addons/wiki_faq/i18n/fi.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-06-29 07:33+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Tämä moduuli sisältää wiki UKK (faq) pohjan\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Dokumenttienhallinta - Wiki UKK (FAQ)"
diff --git a/addons/wiki_faq/i18n/fr.po b/addons/wiki_faq/i18n/fr.po
deleted file mode 100644
index 6e7fcf2251a..00000000000
--- a/addons/wiki_faq/i18n/fr.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-24 16:38+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Ce module fournit un modèle de FAQ Wiki\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestion documentaire - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/gl.po b/addons/wiki_faq/i18n/gl.po
deleted file mode 100644
index 1a5fb1c147e..00000000000
--- a/addons/wiki_faq/i18n/gl.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-14 12:02+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo facilita unha plantilla para as FAQ dunha wiki\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Xestión Documental - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/hr.po b/addons/wiki_faq/i18n/hr.po
deleted file mode 100644
index 6f00c88a0aa..00000000000
--- a/addons/wiki_faq/i18n/hr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-12-08 15:09+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Ovaj modul nudi obrazac za wiki često postavljana pitanja\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Upravljanje dokumentima - Wiki - Često postavljanja pitanja"
diff --git a/addons/wiki_faq/i18n/hu.po b/addons/wiki_faq/i18n/hu.po
deleted file mode 100644
index 9f48c0d82fe..00000000000
--- a/addons/wiki_faq/i18n/hu.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * wiki_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-21 15:27+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Ez a modul egy wiki GYIK sablon.\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Dokumentum menedzsment - Wiki - GYIK"
diff --git a/addons/wiki_faq/i18n/it.po b/addons/wiki_faq/i18n/it.po
deleted file mode 100644
index 611dc8b63ad..00000000000
--- a/addons/wiki_faq/i18n/it.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-12 17:11+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Questo modulo fornisce un Template per le FAQ del wiki\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestione documentale - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/ja.po b/addons/wiki_faq/i18n/ja.po
deleted file mode 100644
index 2ce0cb12d47..00000000000
--- a/addons/wiki_faq/i18n/ja.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-06-16 05:48+0000\n"
-"Last-Translator: Akira Hiyama <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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"このモジュールはWiki FAQテンプレートを提供します。\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "ドキュメント管理 - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/lv.po b/addons/wiki_faq/i18n/lv.po
deleted file mode 100644
index 932fa2b4fb7..00000000000
--- a/addons/wiki_faq/i18n/lv.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-09-01 14:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian <lv@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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Šis modulis nodrošina wiki BUJ Veidni\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Dokumentu Pārvaldība - Wiki - BUJ"
diff --git a/addons/wiki_faq/i18n/mn.po b/addons/wiki_faq/i18n/mn.po
deleted file mode 100644
index 61e09ae7f0a..00000000000
--- a/addons/wiki_faq/i18n/mn.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-29 09:21+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Энэ модуль нь викид ТАА нэмнэ\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Баримтын удирдлага - Вики - ТАА"
diff --git a/addons/wiki_faq/i18n/nl.po b/addons/wiki_faq/i18n/nl.po
deleted file mode 100644
index 4675dbafea7..00000000000
--- a/addons/wiki_faq/i18n/nl.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-25 19:40+0000\n"
-"Last-Translator: Maarten Verhavert <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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Deze module voorziet in een wiki veelgestelde vragen (FAQ) sjabloon\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Documentbeheer - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/oc.po b/addons/wiki_faq/i18n/oc.po
deleted file mode 100644
index 18faa113ba4..00000000000
--- a/addons/wiki_faq/i18n/oc.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-11-20 09:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Occitan (post 1500) <oc@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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Aqueste modul provesís un modèl de FAQ Wiki\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestion documentària - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/pt.po b/addons/wiki_faq/i18n/pt.po
deleted file mode 100644
index 49b5ea9ca4e..00000000000
--- a/addons/wiki_faq/i18n/pt.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-11-27 14:19+0000\n"
-"Last-Translator: OpenERP Administrators <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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo disponibiliza um Template FAQ wiki\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestão de Documentos - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/pt_BR.po b/addons/wiki_faq/i18n/pt_BR.po
deleted file mode 100644
index fb96a3f0bef..00000000000
--- a/addons/wiki_faq/i18n/pt_BR.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-16 18:48+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo fornece um Modelo de FAQ Wiki\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Gestão de Documento - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/ro.po b/addons/wiki_faq/i18n/ro.po
deleted file mode 100644
index c955cde1b2d..00000000000
--- a/addons/wiki_faq/i18n/ro.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-01-08 19:43+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Acest modul oferă un Sablon pentru Intrebari Frecvente wiki\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Managementul Documentelor - Wiki - Intrebari Frecvente"
diff --git a/addons/wiki_faq/i18n/ru.po b/addons/wiki_faq/i18n/ru.po
deleted file mode 100644
index 5dd4d01a6d9..00000000000
--- a/addons/wiki_faq/i18n/ru.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Russian 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:16+0000\n"
-"PO-Revision-Date: 2011-03-20 08:40+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Этот модуль предоставляет шаблон ЧаВо\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Управления документами - Вики - ЧаВо"
diff --git a/addons/wiki_faq/i18n/sk.po b/addons/wiki_faq/i18n/sk.po
deleted file mode 100644
index 3521575652f..00000000000
--- a/addons/wiki_faq/i18n/sk.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-21 13:15+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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Tento modul poskytuje šablóny pre wiki FAQ\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Správa dokumentu - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/sl.po b/addons/wiki_faq/i18n/sl.po
deleted file mode 100644
index cd1ac56fe3a..00000000000
--- a/addons/wiki_faq/i18n/sl.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-25 11:08+0000\n"
-"Last-Translator: Simon Vidmar <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Ta modul omogoča predlogo za wiki pogosto zastavljenih vprašanj (FAQ)\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Upravljanje dokumentov - Wiki - Pogosto zastavljena vprašanja (FAQ)"
diff --git a/addons/wiki_faq/i18n/sr@latin.po b/addons/wiki_faq/i18n/sr@latin.po
deleted file mode 100644
index b975a39c207..00000000000
--- a/addons/wiki_faq/i18n/sr@latin.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-10-17 13:50+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Ovaj modul obezbeđuje wiki za FAQ-model\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Uređivanje dokumenata - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/sv.po b/addons/wiki_faq/i18n/sv.po
deleted file mode 100644
index 168765535f6..00000000000
--- a/addons/wiki_faq/i18n/sv.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-21 14:43+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Denna modul ger en wiki FAQ mall\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Dokumenthantering - Wiki - FAQ"
diff --git a/addons/wiki_faq/i18n/tr.po b/addons/wiki_faq/i18n/tr.po
deleted file mode 100644
index 7e5ff43201f..00000000000
--- a/addons/wiki_faq/i18n/tr.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-26 14:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Bu modül bir wiki Sıkça Sorulan Sorular Şablonu içerir\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "Döküman Yönetimi - Wiki - SSS"
diff --git a/addons/wiki_faq/i18n/wiki_faq.pot b/addons/wiki_faq/i18n/wiki_faq.pot
deleted file mode 100644
index e816b170bfc..00000000000
--- a/addons/wiki_faq/i18n/wiki_faq.pot
+++ /dev/null
@@ -1,28 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16:14+0000\n"
-"PO-Revision-Date: 2011-01-11 11:16:14+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: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid "This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr ""
-
diff --git a/addons/wiki_faq/i18n/zh_CN.po b/addons/wiki_faq/i18n/zh_CN.po
deleted file mode 100644
index 6c1565eab7a..00000000000
--- a/addons/wiki_faq/i18n/zh_CN.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-13 13:37+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_faq
-#: model:ir.module.module,description:wiki_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"此模块提供一个wiki的问答模板\n"
-"    "
-
-#. module: wiki_faq
-#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information
-msgid "Document Management - Wiki - FAQ"
-msgstr "文档管理 — wiki 问答"
diff --git a/addons/wiki_faq/wiki_faq.xml b/addons/wiki_faq/wiki_faq.xml
deleted file mode 100644
index ddc4e867396..00000000000
--- a/addons/wiki_faq/wiki_faq.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="wiki_groups_faq" model="wiki.groups">
-            <field name="name">Internal FAQ</field>
-            <field name="method">list</field>
-            <field eval="2" name="section"/>
-            <field name="template">== Question ==
-
-== Answer ==
-
-
-
-== External Links ==
-
-</field>
-        </record>
-        <record id="wiki_wiki_bugs" model="wiki.wiki">
-            <field name="name">Bug Tracker ?</field>
-            <field name="tags">crm, bugs</field>
-            <field name="group_id" ref="wiki_groups_faq"/>
-            <field name="minor_edit">0</field>
-            <field name="toc">0</field>
-            <field name="review">1</field>
-            <field name="section">2</field>
-            <field name="summary">Initial Page</field>
-            <field name="text_area">== Question ==
-
-What's the Bug Tracker ?
-
-== Answer ==
-
-The OpenERP bugtracker allows to manage bugs. Stop using a separated bugtracker. Using OpenERP
-will allow you to track time on bugs, to integrate it with the mail gateway, to
-link bugs with timesheets, to invoice bugs, etc.
-
-Key Points:
-
-* Flexible &amp; easy to use
-* eMail gateway
-* Automated rules
-
-Integration Benefits:
-
-* Linked to timesheets &amp; projects
-* Generate sales and invoices
-* Integrated in your dashboard
-
-== External Links ==
-
-* The OpenERP Website: [http://openerp.com]
-* The DMS Documentation: [http://openerp.com]
-</field>
-        </record>
-        <record id="wiki_wiki_dms" model="wiki.wiki">
-            <field name="name">Document Management System ?</field>
-            <field name="tags">dms, document</field>
-            <field name="group_id" ref="wiki_groups_faq"/>
-            <field name="minor_edit">0</field>
-            <field name="toc">1</field>
-            <field name="section">1</field>
-            <field name="summary">Initial Page</field>
-            <field name="text_area">== Question ==
-
-What's the Document Management System ?
-
-== Answer ==
-
-The document management system allows you to store, classify, and search your
-enterprise's documents. This module (called '''document''') provides an FTP access to all your ERP's
-ressources.  For a dynamic and efficient classification, the folders structure
-is provided by others objects.  It is very usefull to track documents related
-to projects, products, sales, contracts, etc.
-
-Keypoints:
-
-* FTP Access
-* Indexation of PDF, DOC, ODT.
-* Virtual files and folders
-
-Integration Benefits:
-
-* Stores automatically ERP reports
-* Automatic classification of ressources
-* Shared access rights for DMS and ERP
-* Store emails with Outlook Plugin
-
-== External Links ==
-
-* The OpenERP Website : [http://openerp.com]
-* The DMS Documentation : [http://openerp.com]
-</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/wiki_quality_manual/__init__.py b/addons/wiki_quality_manual/__init__.py
deleted file mode 100644
index 938f045b9fd..00000000000
--- a/addons/wiki_quality_manual/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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/>.
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py
deleted file mode 100644
index 5e8725c2c7d..00000000000
--- a/addons/wiki_quality_manual/__openerp__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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': 'Wiki: Quality Manual',
-    'version': '1.0',
-    'category': 'Knowledge Management',
-    'description': """
-Quality Manual Template.
-========================
-
-It provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki
-Quality Manual.
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
-    'depends': ['wiki'],
-    'init_xml': [],
-    'update_xml': ['wiki_quality_manual.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'auto_install': False,
-    'certificate' : '00705749856097740509',
-    'images': ['images/wiki_pages_quality_manual.jpeg'],
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_quality_manual/i18n/ar.po b/addons/wiki_quality_manual/i18n/ar.po
deleted file mode 100644
index eaa1961d70a..00000000000
--- a/addons/wiki_quality_manual/i18n/ar.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-01-17 10:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"قالب كتيب الجودة\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "مرجع إدارة الوثائق - كتيب الجودة"
diff --git a/addons/wiki_quality_manual/i18n/bg.po b/addons/wiki_quality_manual/i18n/bg.po
deleted file mode 100644
index 32a4d6335c0..00000000000
--- a/addons/wiki_quality_manual/i18n/bg.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-01 14:45+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Шаблон за Наръчник по качество\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Управление на документи - Wiki - Наръчник по качество"
diff --git a/addons/wiki_quality_manual/i18n/ca.po b/addons/wiki_quality_manual/i18n/ca.po
deleted file mode 100644
index 8ed0aed8b3f..00000000000
--- a/addons/wiki_quality_manual/i18n/ca.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-05 23:21+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Plantilla manual de qualitat\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestió documental - Wiki - Manual de qualitat"
diff --git a/addons/wiki_quality_manual/i18n/cs.po b/addons/wiki_quality_manual/i18n/cs.po
deleted file mode 100644
index 5efe0b3f26f..00000000000
--- a/addons/wiki_quality_manual/i18n/cs.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Czech 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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-04-06 04:47+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Šablona příručky kvality\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Správa dokumentů - Wiki - Příručka kvality"
diff --git a/addons/wiki_quality_manual/i18n/da.po b/addons/wiki_quality_manual/i18n/da.po
deleted file mode 100644
index 18c39b31a5b..00000000000
--- a/addons/wiki_quality_manual/i18n/da.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-11-17 07:47+0000\n"
-"Last-Translator: Martin Pihl <martinpihl@gmail.com>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Skabelon til kvalitetsmanual\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Dokument administration - Wiki - Kvalitetsmanual"
diff --git a/addons/wiki_quality_manual/i18n/de.po b/addons/wiki_quality_manual/i18n/de.po
deleted file mode 100644
index 0f8ecbba76a..00000000000
--- a/addons/wiki_quality_manual/i18n/de.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_quality_manual
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-01 09:42+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Qualität Handbuch Vorlage\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Dokument Management - Wiki - Qualitätssicherungs Handbuch"
diff --git a/addons/wiki_quality_manual/i18n/es.po b/addons/wiki_quality_manual/i18n/es.po
deleted file mode 100644
index 45784cf7393..00000000000
--- a/addons/wiki_quality_manual/i18n/es.po
+++ /dev/null
@@ -1,32 +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:16+0000\n"
-"PO-Revision-Date: 2010-12-28 09:12+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Plantilla manual de calidad\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestió documental - Wiki - Manual de calidad"
diff --git a/addons/wiki_quality_manual/i18n/es_CR.po b/addons/wiki_quality_manual/i18n/es_CR.po
deleted file mode 100644
index 376a1ca428a..00000000000
--- a/addons/wiki_quality_manual/i18n/es_CR.po
+++ /dev/null
@@ -1,34 +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: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-02-19 00:54+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Plantilla manual de calidad\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestió documental - Wiki - Manual de calidad"
diff --git a/addons/wiki_quality_manual/i18n/es_MX.po b/addons/wiki_quality_manual/i18n/es_MX.po
deleted file mode 100644
index 36296a9c886..00000000000
--- a/addons/wiki_quality_manual/i18n/es_MX.po
+++ /dev/null
@@ -1,32 +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:16+0000\n"
-"PO-Revision-Date: 2010-12-28 09:12+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Plantilla manual de calidad\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestió documental - Wiki - Manual de calidad"
diff --git a/addons/wiki_quality_manual/i18n/es_VE.po b/addons/wiki_quality_manual/i18n/es_VE.po
deleted file mode 100644
index 36296a9c886..00000000000
--- a/addons/wiki_quality_manual/i18n/es_VE.po
+++ /dev/null
@@ -1,32 +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:16+0000\n"
-"PO-Revision-Date: 2010-12-28 09:12+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@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: 2011-09-05 05:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Plantilla manual de calidad\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestió documental - Wiki - Manual de calidad"
diff --git a/addons/wiki_quality_manual/i18n/fi.po b/addons/wiki_quality_manual/i18n/fi.po
deleted file mode 100644
index 491d9f743d5..00000000000
--- a/addons/wiki_quality_manual/i18n/fi.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-06-27 06:33+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Laatukäsikirjan pohja\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Dokumenttienhallinta - Wiki - Laatukäsikirja"
diff --git a/addons/wiki_quality_manual/i18n/fr.po b/addons/wiki_quality_manual/i18n/fr.po
deleted file mode 100644
index 81447572ca6..00000000000
--- a/addons/wiki_quality_manual/i18n/fr.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_quality_manual
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-13 02:31+0000\n"
-"Last-Translator: t.o <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Modèle de manuel qualité\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestion documentaire - Wiki - Manuel Qualité"
diff --git a/addons/wiki_quality_manual/i18n/gl.po b/addons/wiki_quality_manual/i18n/gl.po
deleted file mode 100644
index 83c1f4f3a79..00000000000
--- a/addons/wiki_quality_manual/i18n/gl.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-03-05 01:38+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Modelo manual de calidade\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Xestión documental - Wiki - Manual de calidade"
diff --git a/addons/wiki_quality_manual/i18n/hr.po b/addons/wiki_quality_manual/i18n/hr.po
deleted file mode 100644
index de7621d6966..00000000000
--- a/addons/wiki_quality_manual/i18n/hr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-12-08 15:10+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Predložak priručnika kvalitete\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Upravljanje dokumentima - Wiki - Priručnik kvalitete"
diff --git a/addons/wiki_quality_manual/i18n/hu.po b/addons/wiki_quality_manual/i18n/hu.po
deleted file mode 100644
index 76ea0e70522..00000000000
--- a/addons/wiki_quality_manual/i18n/hu.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * wiki_quality_manual
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-21 15:36+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Minőségi kézikönyv sablon\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Dokumentum menedzsment - Wiki - Minőségi kézikönyv"
diff --git a/addons/wiki_quality_manual/i18n/it.po b/addons/wiki_quality_manual/i18n/it.po
deleted file mode 100644
index 4dea6d4b467..00000000000
--- a/addons/wiki_quality_manual/i18n/it.po
+++ /dev/null
@@ -1,34 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-05 08:58+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Modello manuale di Qualità\n"
-"    \n"
-"modulo: wiky_quality_manual\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "modulo: wiki_quality_manual"
diff --git a/addons/wiki_quality_manual/i18n/ja.po b/addons/wiki_quality_manual/i18n/ja.po
deleted file mode 100644
index 9a05423a404..00000000000
--- a/addons/wiki_quality_manual/i18n/ja.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-06-16 05:49+0000\n"
-"Last-Translator: Akira Hiyama <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"品質マニュアルのテンプレート\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "ドキュメント管理 - Wiki - 品質マニュアル"
diff --git a/addons/wiki_quality_manual/i18n/lv.po b/addons/wiki_quality_manual/i18n/lv.po
deleted file mode 100644
index 178260fefa4..00000000000
--- a/addons/wiki_quality_manual/i18n/lv.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-09-01 14:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian <lv@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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Kvalitātes Rokasgrāmatas Veidne\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Dokumentu Pārvaldība - Wiki - Kvalitātes Rokasgrāmata"
diff --git a/addons/wiki_quality_manual/i18n/mn.po b/addons/wiki_quality_manual/i18n/mn.po
deleted file mode 100644
index f9f7cd6e13f..00000000000
--- a/addons/wiki_quality_manual/i18n/mn.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-09-29 08:27+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Чанарын удирдамжийн загвар\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Баримтын удирдлага - Вики - Чанарын удирдамж"
diff --git a/addons/wiki_quality_manual/i18n/nl.po b/addons/wiki_quality_manual/i18n/nl.po
deleted file mode 100644
index 99deefcd710..00000000000
--- a/addons/wiki_quality_manual/i18n/nl.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-25 19:42+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Kwaliteitshandboek sjabloon\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Documentbeheer - Wiki - Kwaliteitshandboek"
diff --git a/addons/wiki_quality_manual/i18n/oc.po b/addons/wiki_quality_manual/i18n/oc.po
deleted file mode 100644
index a79413240ab..00000000000
--- a/addons/wiki_quality_manual/i18n/oc.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-11-20 09:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Occitan (post 1500) <oc@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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Modèl de manual qualitat\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestion documentària - Wiki - Manual Qualitat"
diff --git a/addons/wiki_quality_manual/i18n/pt.po b/addons/wiki_quality_manual/i18n/pt.po
deleted file mode 100644
index d80426802d6..00000000000
--- a/addons/wiki_quality_manual/i18n/pt.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-04 09:42+0000\n"
-"Last-Translator: OpenERP Administrators <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Template manual de qualidade\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestão de Documentos - Wiki - Manual Quality"
diff --git a/addons/wiki_quality_manual/i18n/pt_BR.po b/addons/wiki_quality_manual/i18n/pt_BR.po
deleted file mode 100644
index 27e0424b6b9..00000000000
--- a/addons/wiki_quality_manual/i18n/pt_BR.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-16 18:49+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Modelo de Manual de Qualidade\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Gestão de Documento - Wiki - Manual da Qualidade"
diff --git a/addons/wiki_quality_manual/i18n/ro.po b/addons/wiki_quality_manual/i18n/ro.po
deleted file mode 100644
index 60192db2e6d..00000000000
--- a/addons/wiki_quality_manual/i18n/ro.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2012-01-08 19:41+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Sablon Manual al Calitatii\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Managementul Documentelor - Wiki - Manualul calitatii"
diff --git a/addons/wiki_quality_manual/i18n/ru.po b/addons/wiki_quality_manual/i18n/ru.po
deleted file mode 100644
index 8f209012c0e..00000000000
--- a/addons/wiki_quality_manual/i18n/ru.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-26 05:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Шаблон руководства по качеству\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Управление документами - Вики - Руководство по качеству"
diff --git a/addons/wiki_quality_manual/i18n/sk.po b/addons/wiki_quality_manual/i18n/sk.po
deleted file mode 100644
index 3afa06c436a..00000000000
--- a/addons/wiki_quality_manual/i18n/sk.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-21 13:14+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"šablóna príručky kvality\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Správa dokumentov  - Wiki - príručka kvality"
diff --git a/addons/wiki_quality_manual/i18n/sl.po b/addons/wiki_quality_manual/i18n/sl.po
deleted file mode 100644
index 69681043cb8..00000000000
--- a/addons/wiki_quality_manual/i18n/sl.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-25 11:09+0000\n"
-"Last-Translator: Simon Vidmar <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Predloga priročnika zagotavljanja kakovosti.\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Upravljanje dokumentov - Wiki - Priročnik zagotavljanja kakovosti"
diff --git a/addons/wiki_quality_manual/i18n/sr@latin.po b/addons/wiki_quality_manual/i18n/sr@latin.po
deleted file mode 100644
index d5d3fb0eb57..00000000000
--- a/addons/wiki_quality_manual/i18n/sr@latin.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-10-17 13:36+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Model kvalitetnog priručnika\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Uređivanje dokumenata - Wiki - Kvalitetni priručnik"
diff --git a/addons/wiki_quality_manual/i18n/sv.po b/addons/wiki_quality_manual/i18n/sv.po
deleted file mode 100644
index 0bc4e3e8648..00000000000
--- a/addons/wiki_quality_manual/i18n/sv.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-21 14:38+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Kvalitetsmanual mall\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Dokumenthantering - Wiki - Kvalitetsmanual"
diff --git a/addons/wiki_quality_manual/i18n/tr.po b/addons/wiki_quality_manual/i18n/tr.po
deleted file mode 100644
index 4f84666dc6a..00000000000
--- a/addons/wiki_quality_manual/i18n/tr.po
+++ /dev/null
@@ -1,32 +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: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-04-26 14:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"Kalite El Kitabı Şablonu\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "Döküman Yönetimi - Wiki - Kalite El Kitabı"
diff --git a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
deleted file mode 100644
index f93a98d941e..00000000000
--- a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
+++ /dev/null
@@ -1,28 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_quality_manual
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16:15+0000\n"
-"PO-Revision-Date: 2011-01-11 11:16:15+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: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid "Quality Manual Template\n"
-"    "
-msgstr ""
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr ""
-
diff --git a/addons/wiki_quality_manual/i18n/zh_CN.po b/addons/wiki_quality_manual/i18n/zh_CN.po
deleted file mode 100644
index 140b8338cad..00000000000
--- a/addons/wiki_quality_manual/i18n/zh_CN.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-07 17:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,description:wiki_quality_manual.module_meta_information
-msgid ""
-"Quality Manual Template\n"
-"    "
-msgstr ""
-"质量手册模板\n"
-"    "
-
-#. module: wiki_quality_manual
-#: model:ir.module.module,shortdesc:wiki_quality_manual.module_meta_information
-msgid "Document Management - Wiki - Quality Manual"
-msgstr "文档管理 - wiki 质量手册"
diff --git a/addons/wiki_quality_manual/wiki_quality_manual.xml b/addons/wiki_quality_manual/wiki_quality_manual.xml
deleted file mode 100644
index 264b4ecc61a..00000000000
--- a/addons/wiki_quality_manual/wiki_quality_manual.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data noupdate="1">
-      <record id="wiki_quality_manual" model="wiki.wiki">
-        <field name="name">Quality Manual</field>
-        <field name="tags">quality, faq, manual</field>
-        <field name="minor_edit">0</field>
-        <field name="toc">1</field>
-        <field name="review">1</field>
-        <field name="section">2</field>
-        <field name="summary">Base template</field>
-        <field name="text_area">
-=Application Domain=
-
-==General==
-
-==Application Perimeter==
-
-=Standard References=
-
-=Terms and Definitions=
-
-==Confidentiality==
-
-=Quality Management System=
-
-==General Requirements==
-
-===Quality Comitee===
-
-==Requirements related to Documentation==
-
-===General===
-
-===Quality Manual===
-
-===Document Control===
-
-===Record Control===
-
-=Management Responsibilities=
-
-==Management Involvement==
-
-==Customer Care==
-
-==Quality Policy==
-
-==Planning==
-
-===Quality Objectives===
-
-===Planning of the quality management system===
-
-==Responsibility, Authority and Communication==
-
-===Responsibility and Authority===
-
-===Management Representative===
-
-===Internal Communication===
-
-==Management Review==
-
-===General===
-
-===Input===
-
-===Output===
-
-=Resource Management=
-
-==Resources==
-
-==Human Resources==
-
-===General===
-
-===Skills, Training and Awareness===
-
-==Infrastructure==
-
-===Equipments===
-
-===Maintenance===
-
-==Work Environment==
-
-=Goods/Services Production=
-
-==Planning of the Goods/Services Production==
-
-==Processes related to the customer==
-
-==Conception and Development==
-
-===Conception and Development Planning===
-
-===Input of the Conception and Development===
-
-===Output of the Conception and Development===
-
-===Conception and Development Review===
-
-===Conception and Development Verification===
-
-===Conception and Development Validation===
-
-===Change Management of the Conception and Development===
-
-==Purchasing==
-
-==Goods/Services Preparation and Production==
-
-===Goods/Services Preparation and Production Management===
-
-===Goods/Services Preparation and Production Processes Validation===
-
-===Identification and Traceability===
-
-===Customer Properties===
-
-===Product Preservation===
-
-==Measuring and Monitoring Equipments Control==
-
-=Measurement, Analysis and Improvement=
-
-==General==
-
-==Monitoring and Measurement==
-
-===Customer Satisfaction===
-
-===Internal Audits===
-
-===Monitoring and Measurement of Process===
-
-===Monitoring and Measurement of Service===
-
-==Control of Nonconformities==
-
-==Analysis of Data==
-
-===Statistical Data===
-
-==Improvement==
-
-===Continual Improvement===
-
-===Corrective Action===
-
-===Preventive Action===
-        </field>
-      </record>
-      <record id="wiki_group_quality_manual" model="wiki.groups">
-        <field name="name">Quality Manual</field>
-        <field name="section">2</field>
-        <field name="home" ref="wiki_quality_manual"/>
-      </record>
-    </data>
-    <data>
-      <record id="wiki_quality_manual" model="wiki.wiki">
-        <field name="group_id" ref="wiki_group_quality_manual"/>
-      </record>
-    </data>
-</openerp>
diff --git a/addons/wiki_sale_faq/__init__.py b/addons/wiki_sale_faq/__init__.py
deleted file mode 100644
index 938f045b9fd..00000000000
--- a/addons/wiki_sale_faq/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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/>.
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
deleted file mode 100644
index d63e5af7d1e..00000000000
--- a/addons/wiki_sale_faq/__openerp__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 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': 'Wiki: Sale FAQ',
-    'version': '1.0',
-    'category': 'Customer Relationship Management',
-    'description': """
-This module provides a Wiki Sales FAQ Template.
-===============================================
-
-It provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki
-Sale FAQ.
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
-    'images': ['images/sale_document.jpeg','images/wiki_pages.jpeg'],
-    'depends': ['wiki_faq','document','crm'],
-    'init_xml': [
-            'wiki_sale_faq_data.xml'
-    ],
-    'update_xml': [
-            'wiki_sale_faq_view.xml'
-    ],
-    'demo_xml': [
-    ],
-    'installable': True,
-    'auto_install': False,
-    'certificate' : '00556456617408499693',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_sale_faq/i18n/ar.po b/addons/wiki_sale_faq/i18n/ar.po
deleted file mode 100644
index 06e19d71756..00000000000
--- a/addons/wiki_sale_faq/i18n/ar.po
+++ /dev/null
@@ -1,63 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-07 23:50+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "مستندات"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "الأسئلة الشائعة"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "صفحات ويكي"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "هذا البرنامج يوفر لك قالب للأسئلة الشائعة\n"
-#~ "    "
diff --git a/addons/wiki_sale_faq/i18n/bg.po b/addons/wiki_sale_faq/i18n/bg.po
deleted file mode 100644
index e3f412ec17f..00000000000
--- a/addons/wiki_sale_faq/i18n/bg.po
+++ /dev/null
@@ -1,78 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-06 19:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki страниците ви позволяват да споделяте идеи и въпроси с колеги. Можете "
-"да създадете нов документ, който може да бъде свързан с едно или няколко "
-"приложения (спецификации на проекта, често задавани въпроси за търговските "
-"екипи и др.). Ключовите думи могат да бъдат използвани за лесно етикиране на "
-"уики страници. Вие трябва да използвате това приложение с уеб интерфейс на "
-"OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"\"Документи\" ви дава достъп до всички файлове, свързани с който и да е "
-"запис. Това е хранилището на всички документи, като писма, свързани с "
-"проекта прикачени файлове или други документи. От тази гледна точка, можете "
-"да търсите из съдържанието на документите. OpenERP автоматично да задава "
-"мета данни въз основа на записа като свързаните с тях партньори и индексира "
-"съдържанието от .DOC,. ODT. TXT,. SXW и. PDF документи."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Документи"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "ЧЗВ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Уики страници"
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki-продажба - Въпроси и отговори"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Този модул предостава шаблон за често задавани въпроси за Уики\n"
-#~ "    "
diff --git a/addons/wiki_sale_faq/i18n/ca.po b/addons/wiki_sale_faq/i18n/ca.po
deleted file mode 100644
index 7971c60bd1f..00000000000
--- a/addons/wiki_sale_faq/i18n/ca.po
+++ /dev/null
@@ -1,78 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-31 21:34+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Les pàgines del wiki us permeten intercanviar idees i preguntes amb els "
-"vostres companys de treball. Podeu crear un nou document que pot ser "
-"relacionat amb una o diverses aplicacions (especificacions d'un projecte, "
-"FAQ per a l'equip de vendes, etc). Les paraules clau poden ser utilitzades "
-"per etiquetar fàcilment pàgines del wiki. Heu d'utilitzar aquesta aplicació "
-"amb el client web d'OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documents us dóna accés a tots els fitxers adjunts de qualsevol registre. És "
-"un repositori de tots els documents com a emails, fitxers adjunts de "
-"projectes o qualsevol altre document. Des d'aquesta vista, podeu realitzar "
-"cerques sobre el contingut dels documents. OpenERP assigna automàticament "
-"meta dades basades en el registre com l'empresa relacionada i indexa el "
-"contingut de documents .DOC, .ODT, .TXT, .SXW i .PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documents"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ (Preguntes freqüents)"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Pàgines Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Aquest mòdul proporciona una plantilla de FAQ per a la wiki.\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Venda - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/da.po b/addons/wiki_sale_faq/i18n/da.po
deleted file mode 100644
index e3b1c4da8b3..00000000000
--- a/addons/wiki_sale_faq/i18n/da.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-11-09 20:09+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumenter"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr ""
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Dette modul leverer en wiki FAQ skabelon\n"
-#~ "    "
diff --git a/addons/wiki_sale_faq/i18n/de.po b/addons/wiki_sale_faq/i18n/de.po
deleted file mode 100644
index 3ddcff7e257..00000000000
--- a/addons/wiki_sale_faq/i18n/de.po
+++ /dev/null
@@ -1,75 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_sale_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-12 14:19+0000\n"
-"Last-Translator: Ferdinand-camptocamp <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki Seiten erlauben Ideen und Fragen mit Mitarbeitern gemeinsam zu "
-"bearbeiten. Dokumente können mit mehreren Anwendungen verlinkt werden. "
-"Schüsselwörter können verwendet werden.Bitte verwenden Sie die OpenERP WEB-"
-"Anwendung."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokumente erlauben den Zugriff auf Anhänge jedes Datensatzes. Es handelt "
-"sich dabei um einen Aufbewahrungsort (Repository) für Dokumente aller Art "
-"(EMails, Anhänge, ....). In dieser Sicht können sie alle Domkumente "
-"durchsuchen. OpenERP erzeugt automatisch Meta-Daten wie zB dem zugehörigen "
-"Partner und indiziert den Inhalt von DOC, .ODT, .TXT, .SXW und .PDF "
-"Dokumenten"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumente"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "Häufige Fragen"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki Seiten"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Dieses Modul bitete eine Wiki F&A Vorlage\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki -Verkauf - F&A"
diff --git a/addons/wiki_sale_faq/i18n/es.po b/addons/wiki_sale_faq/i18n/es.po
deleted file mode 100644
index 39d12287cc0..00000000000
--- a/addons/wiki_sale_faq/i18n/es.po
+++ /dev/null
@@ -1,79 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 02:44+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Las páginas del wiki le permiten intercambiar ideas y preguntas con sus "
-"compañeros de trabajo. Puede crear un nuevo documento que puede ser "
-"relacionado con una o varias aplicaciones (especificaciones de un proyecto, "
-"FAQ para equipo de ventas, etc). Las palabras clave pueden ser utilizadas "
-"para etiquetar fácilmente páginas del wiki. Debe utilizar esta aplicación "
-"con el cliente web de OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documentos le da acceso a todos los ficheros adjuntos de cualquier registro. "
-"Es un repositorio de todos los documentos como emails, ficheros adjuntos de "
-"proyectos o cualquier otro documento. Desde esta vista, puede realizar "
-"búsquedas sobre el contenido de los documentos. OpenERP asigna "
-"automáticamente meta datos basados en el registro como la empresa "
-"relacionada e indexa el contenido de documentos .DOC, .ODT, .TXT, .SXW y "
-".PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Páginas Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Venta - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/es_CR.po b/addons/wiki_sale_faq/i18n/es_CR.po
deleted file mode 100644
index 732af589c9d..00000000000
--- a/addons/wiki_sale_faq/i18n/es_CR.po
+++ /dev/null
@@ -1,81 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-19 00:54+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Las páginas del wiki le permiten intercambiar ideas y preguntas con sus "
-"compañeros de trabajo. Puede crear un nuevo documento que puede ser "
-"relacionado con una o varias aplicaciones (especificaciones de un proyecto, "
-"FAQ para equipo de ventas, etc). Las palabras clave pueden ser utilizadas "
-"para etiquetar fácilmente páginas del wiki. Debe utilizar esta aplicación "
-"con el cliente web de OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documentos le da acceso a todos los ficheros adjuntos de cualquier registro. "
-"Es un repositorio de todos los documentos como emails, ficheros adjuntos de "
-"proyectos o cualquier otro documento. Desde esta vista, puede realizar "
-"búsquedas sobre el contenido de los documentos. OpenERP asigna "
-"automáticamente meta datos basados en el registro como la empresa "
-"relacionada e indexa el contenido de documentos .DOC, .ODT, .TXT, .SXW y "
-".PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Páginas Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Venta - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/es_MX.po b/addons/wiki_sale_faq/i18n/es_MX.po
deleted file mode 100644
index b2c0decf5af..00000000000
--- a/addons/wiki_sale_faq/i18n/es_MX.po
+++ /dev/null
@@ -1,83 +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:16+0000\n"
-"PO-Revision-Date: 2011-01-13 02:44+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\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:49+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Páginas Wiki"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-"    "
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Las páginas del wiki le permiten intercambiar ideas y preguntas con sus "
-"compañeros de trabajo. Puede crear un nuevo documento que puede ser "
-"relacionado con una o varias aplicaciones (especificaciones de un proyecto, "
-"FAQ para equipo de ventas, etc). Las palabras clave pueden ser utilizadas "
-"para etiquetar fácilmente páginas del wiki. Debe utilizar esta aplicación "
-"con el cliente web de OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
-msgid "Wiki -Sale - FAQ"
-msgstr "Wiki - Venta - FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documentos le da acceso a todos los ficheros adjuntos de cualquier registro. "
-"Es un repositorio de todos los documentos como emails, ficheros adjuntos de "
-"proyectos o cualquier otro documento. Desde esta vista, puede realizar "
-"búsquedas sobre el contenido de los documentos. OpenERP asigna "
-"automáticamente meta datos basados en el registro como la empresa "
-"relacionada e indexa el contenido de documentos .DOC, .ODT, .TXT, .SXW y "
-".PDF."
diff --git a/addons/wiki_sale_faq/i18n/es_VE.po b/addons/wiki_sale_faq/i18n/es_VE.po
deleted file mode 100644
index b2c0decf5af..00000000000
--- a/addons/wiki_sale_faq/i18n/es_VE.po
+++ /dev/null
@@ -1,83 +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:16+0000\n"
-"PO-Revision-Date: 2011-01-13 02:44+0000\n"
-"Last-Translator: Carlos @ smile.fr <Unknown>\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:49+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Páginas Wiki"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.module.module,description:wiki_sale_faq.module_meta_information
-msgid ""
-"This module provides a wiki FAQ Template\n"
-"    "
-msgstr ""
-"Este módulo proporciona una plantilla de FAQ para la wiki.\n"
-"    "
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Las páginas del wiki le permiten intercambiar ideas y preguntas con sus "
-"compañeros de trabajo. Puede crear un nuevo documento que puede ser "
-"relacionado con una o varias aplicaciones (especificaciones de un proyecto, "
-"FAQ para equipo de ventas, etc). Las palabras clave pueden ser utilizadas "
-"para etiquetar fácilmente páginas del wiki. Debe utilizar esta aplicación "
-"con el cliente web de OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
-msgid "Wiki -Sale - FAQ"
-msgstr "Wiki - Venta - FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documentos le da acceso a todos los ficheros adjuntos de cualquier registro. "
-"Es un repositorio de todos los documentos como emails, ficheros adjuntos de "
-"proyectos o cualquier otro documento. Desde esta vista, puede realizar "
-"búsquedas sobre el contenido de los documentos. OpenERP asigna "
-"automáticamente meta datos basados en el registro como la empresa "
-"relacionada e indexa el contenido de documentos .DOC, .ODT, .TXT, .SXW y "
-".PDF."
diff --git a/addons/wiki_sale_faq/i18n/fi.po b/addons/wiki_sale_faq/i18n/fi.po
deleted file mode 100644
index 1c92c8291dc..00000000000
--- a/addons/wiki_sale_faq/i18n/fi.po
+++ /dev/null
@@ -1,66 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-08 10:28+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Asiakirjat"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "UKK"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki sivustot"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Tämä moduuli sisältää wiki UKK (faq) pohjan\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki -Myynti - UKK"
diff --git a/addons/wiki_sale_faq/i18n/fr.po b/addons/wiki_sale_faq/i18n/fr.po
deleted file mode 100644
index 09ff2a5b9c6..00000000000
--- a/addons/wiki_sale_faq/i18n/fr.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_sale_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 20:46+0000\n"
-"Last-Translator: Aline (OpenERP) <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Les pages de wiki vous permettent de partager des idées et des questions "
-"avec des collègues. Vous pouvez créer un nouveau document qui peut être lié "
-"à une ou plusieurs applications (spécifications pour un projet, FAQ pour les "
-"équipes de vente, etc.). Les mot-clés peuvent être utilisés pour trier les "
-"pages de wiki. Vous devez utiliser cette application avec l'interface web "
-"d'OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Les documents vous donnent accès à tous les fichiers attachés à chaque "
-"enregistrement. C'est un répertoire pour tous les documents comme les "
-"courriels, les pièces jointes liées au projet ou tout autre document. Depuis "
-"cette vue, vous pouvez chercher à l'intérieur du contenu des documents. "
-"OpenERP assigne automatiquement des meta-données basées sur un "
-"enregistrement comme un partenaire lié et indexe le contenu des fichiers "
-".doc, .odt, .txt, .sxw et .pdf."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documents"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Pages de wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ce module fournit un Modèle Wiki pour les FAQ\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "FAQ Wiki Ventes"
diff --git a/addons/wiki_sale_faq/i18n/gl.po b/addons/wiki_sale_faq/i18n/gl.po
deleted file mode 100644
index 39be2e9048c..00000000000
--- a/addons/wiki_sale_faq/i18n/gl.po
+++ /dev/null
@@ -1,77 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-05 01:34+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"As páxinas do wiki permítenlle trocar ideas e preguntas cos seus compañeiros "
-"de traballo. Pode crear un novo documento que pode ser relacionado cunha ou "
-"varias aplicacións (especificacións dun proxecto, FAQ para equipo de vendas, "
-"etc.). Pódense utilizar as palabras chave para etiquetar facilmente páxinas "
-"do wiki. Debe utilizar esta aplicación co cliente web do OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documentos facilítalle acceso a tódolos arquivos anexos de calquera "
-"rexistro. É unha compilación de tódolos documentos como emails, arquivos "
-"anexos de proxectos ou calquera outro documento. Desde esta vista, pode "
-"realizar buscas sobre o contido dos documentos. O OpenERP asigna "
-"automaticamente meta datos baseados no rexistro como a empresa relacionada, "
-"e indexa o contido de documentos .DOC, .ODT, .TXT, .SXW e .PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Páxinas Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo facilita un modelo para as FAQ dunha wiki\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Venda - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/hr.po b/addons/wiki_sale_faq/i18n/hr.po
deleted file mode 100644
index 47835bbfe33..00000000000
--- a/addons/wiki_sale_faq/i18n/hr.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Croatian 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-12-08 15:04+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki stranice dozvoljavaju razmjenu ideja i pitanja sa suradnicima. Možete "
-"kreirati novi dokument kojeg je moguće povezati s jednom ili više aplikacija "
-"(specifikacije projekata, često postavljana pitanja za prodajne timove, "
-"itd.). Pomoću ključnih riječi može se lako istaknuti wiki stranice. Ovu "
-"aplikaciju bi trebali koristiti kroz OpenERP web sučelje."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokumenti vam daju pristup svih datotekama dodjeljenim bilo kojem zapisu. To "
-"je repozitorij svih dokumenata poput el. poruka, privitaka vezanih uz neki "
-"projekt, ili bilo koji drugi dokument. Iz ovog pregleda možete pretraživati "
-"sadržaj dokumenata. OpenERP automatski dodjeljuje meta podatke bazirane na "
-"zapisima poput povezanog partnera i indeksira sadržaj .DOC, .ODT, .TXT, .SXW "
-"i .PDF dokumente."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumenti"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "Često postavljana pitanja"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki stranice"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ovaj modul nudi obrazac za wiki često postavljana pitanja\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki-Prodaja-često postavljana pitanja"
diff --git a/addons/wiki_sale_faq/i18n/hu.po b/addons/wiki_sale_faq/i18n/hu.po
deleted file mode 100644
index 5c6728d6a69..00000000000
--- a/addons/wiki_sale_faq/i18n/hu.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * wiki_sale_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-21 15:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumentumok"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "GYIK"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki oldalak"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ez a modul egy wiki GYIK sablon.\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Értékesítés - GYIK"
diff --git a/addons/wiki_sale_faq/i18n/it.po b/addons/wiki_sale_faq/i18n/it.po
deleted file mode 100644
index 1e9a0a4ae45..00000000000
--- a/addons/wiki_sale_faq/i18n/it.po
+++ /dev/null
@@ -1,78 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-12 18:28+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Le pagine Wiki vi permettono di condividere idee e domande con i "
-"collaboratori. E' possibile creare un nuovo documento che può essere "
-"collegato a diverse applicazioni (specifiche di un progetto, FAQ per team di "
-"vendita, ecc.). Le parole chiave possono essere usate per etichettare le "
-"pagine Wiki. E' consigliabile utilizzare l'applicazione con l'interfaccia "
-"web client di OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"I Documenti vi forniscono accesso a tutti i file allegati ad ogni record. E' "
-"un deposito di tutti i documenti come email, allegati relativi ad un "
-"progetto o qualsiasi altro documento. Da questa vista, è possibile cercare "
-"dentro il contenuto dei documenti. OpenERP assegna automaticamente meta-data "
-"basandosi sul record, come il partner relativo, e indicizza il contenuto di "
-"documenti formato: DOC, ODT, TXT, SXW e PDF"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documenti"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Pagine del Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Questo modulo fornisce un Template per le FAQ del wiki\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - FAQ  vendite"
diff --git a/addons/wiki_sale_faq/i18n/ja.po b/addons/wiki_sale_faq/i18n/ja.po
deleted file mode 100644
index c90db442b10..00000000000
--- a/addons/wiki_sale_faq/i18n/ja.po
+++ /dev/null
@@ -1,62 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-16 06:04+0000\n"
-"Last-Translator: Akira Hiyama <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wikiページは同僚とアイディアを疑問を共有できます。１つまたは幾つかのアプリケーション（プロジェクトの仕様、販売チームのFAQなど）にリンクすることがで"
-"きる新しいドキュメントを作成できます。キーワードはWikiページに簡単にタグをつけるために使用できます。OpenERP "
-"Webクライアントインタフェースとともにこのアプリケーションを使うべきです。"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"ドキュメントは任意のレコードに添付されている全てのファイルにアクセスできます。Eメール、プロジェクトに関連する添付物、そのほかのドキュメントなどの全てのド"
-"キュメントの貯蔵庫です。このビューからドキュメントのコンテンツを検索できます。OpenERPは自動的に関連したパートナや "
-".DOC、.ODT、.TXT、.SXW、.PDFドキュメントのコンテンツのインデックスのようなレコードを基準としたメタデータを割り当てます。"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "ドキュメント"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wikiページ"
diff --git a/addons/wiki_sale_faq/i18n/lv.po b/addons/wiki_sale_faq/i18n/lv.po
deleted file mode 100644
index 7fa0d3b5822..00000000000
--- a/addons/wiki_sale_faq/i18n/lv.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Latvian 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-09-01 14:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian <lv@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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki lapas ļauj koplietot idejas un jautājumus ar kolēģiem. Jūs varat "
-"izveidot jaunu dokumentu, ko var saistīt ar vienu vai vairākiem projektiem "
-"(specifikācijas, bieži uzdotie jautājumi pārdošanas speciālistiem utt.). Var "
-"izmantot atslēgvārdus, lai viegli meklētu Wiki lapās. Izmantojiet šo "
-"programmu caur OpenERP web klienta interfeisu."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokumenti ļauj piekļūt visiem failiem kas pievienoti ierakstiem. Tas ir visu "
-"dokumentu apkopojums, piemēram, e-pasta ziņojumu, pielikumus vai jebkurus "
-"citus dokumentus, kas attiecas uz projektu. Tāpēc no šejienes jūs variet "
-"meklēt dokumentu saturā. OpenERP automātiski piešķirt meta datus, "
-"pamatojoties uz ierakstu saturu par saistīto partneri un indeksē DOC, ODT, "
-"TXT, PDF  un SXW dokumentus."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumenti"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "BUJ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki Lapas"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Šis modulis nodrošina wiki BUJ veidni\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Pārdošana - BUJ"
diff --git a/addons/wiki_sale_faq/i18n/mn.po b/addons/wiki_sale_faq/i18n/mn.po
deleted file mode 100644
index c180a1b9d29..00000000000
--- a/addons/wiki_sale_faq/i18n/mn.po
+++ /dev/null
@@ -1,66 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-19 23:55+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Баримтууд"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "ТАА"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Вики хуудсууд"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Энэ модуль нь викид ТАА нэмнэ\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Вики - Борлуулалт - ТАА"
diff --git a/addons/wiki_sale_faq/i18n/nl.po b/addons/wiki_sale_faq/i18n/nl.po
deleted file mode 100644
index 935360c67b1..00000000000
--- a/addons/wiki_sale_faq/i18n/nl.po
+++ /dev/null
@@ -1,77 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-25 19:49+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki pagina's laten je ideeën en vragen delen met collega's. Je kunt een "
-"nieuw document maken dat verbonden kan worden met één of meer applicaties "
-"(specificaties van een project, FAQ voor het verkoopteams, etc.). "
-"Trefwoorden kunnen gebruikt worden om wiki pagina's makkelijk terug te "
-"vinden. Gebruik deze applicatie samen met de OpenERP web client interface."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documenten geeft toegang tot alle bestanden gekoppeld aan een record. Het is "
-"een verzamelbak van alle documenten zoals emails, project-gerelateerde "
-"bijlagen of andere documenten. Vanuit deze weergave kun je zoeken door de "
-"inhoud van de documenten. OpenERP wijst automatisch metadata toe gebaseerd "
-"op het record, zoals de gekoppelde relatie en indexeert de inhoud van .DOC, "
-".ODT, .TXT, .SXW en .PDF documenten."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documenten"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "Veelgestelde vragen (FAQ)"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki pagina's"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Deze module voorziet in een wiki veelgestelde vragen (FAQ) sjabloon\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Verkoop - Veel gestelde vragen (FAQ)"
diff --git a/addons/wiki_sale_faq/i18n/oc.po b/addons/wiki_sale_faq/i18n/oc.po
deleted file mode 100644
index 04290d335f7..00000000000
--- a/addons/wiki_sale_faq/i18n/oc.po
+++ /dev/null
@@ -1,59 +0,0 @@
-# Occitan (post 1500) 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-11-20 09:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Occitan (post 1500) <oc@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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documents"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "Questions frequentas (FAQ)"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Paginas del wiki"
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "FAQ Wiki Vendas"
diff --git a/addons/wiki_sale_faq/i18n/pl.po b/addons/wiki_sale_faq/i18n/pl.po
deleted file mode 100644
index d2febc4398b..00000000000
--- a/addons/wiki_sale_faq/i18n/pl.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Polish 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-14 18:39+0000\n"
-"Last-Translator: Adam Czabara <kolofaza@o2.pl>\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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Strony wiki pozwalają na dzielenie się pomysłami i pytaniami z osobami "
-"współpracującymi. Można utworzyć dokument, który będzie się odnosił do "
-"jednej lub kilku aplikacji (specyfikacje projektu, FAQ dla zespołów "
-"sprzedaży, itp.). Słowa kluczowe mogą zostać użyte do łatwego oznaczenia "
-"stron wiki. Należy korzystać z tej aplikacji z poziomu interfejsu "
-"internetowego klienta OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokumenty umożliwiają dostęp do wszystkich plików załączonych do każdego "
-"rekordu. Jest to repozytorium wszystkich dokumentów, takich jak e-maile, "
-"załączniki związane z projektem lub inne dokumenty. Od tego widoku można "
-"przeglądać zawartość dokumentów. OpenERP automatycznie przypisuje metadane "
-"na podstawie zapisu, jak i indeksu zawartości. DOC,. ODT. TXT,. SXW i. "
-"dokumenty PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumenty"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Strony Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ten moduł udostępnia szablon wiki FAQ\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki -Sale - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/pt.po b/addons/wiki_sale_faq/i18n/pt.po
deleted file mode 100644
index 65fdf4628f8..00000000000
--- a/addons/wiki_sale_faq/i18n/pt.po
+++ /dev/null
@@ -1,66 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-09 11:13+0000\n"
-"Last-Translator: OpenERP Administrators <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Páginas Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo disponibiliza um modelo de wiki de perguntas frequentes\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki de perguntas frequentes de vendas"
diff --git a/addons/wiki_sale_faq/i18n/pt_BR.po b/addons/wiki_sale_faq/i18n/pt_BR.po
deleted file mode 100644
index 3ca717f3c53..00000000000
--- a/addons/wiki_sale_faq/i18n/pt_BR.po
+++ /dev/null
@@ -1,77 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-23 09:26+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"As páginas Wiki permite você compartilhar ideias e questões com colegas. "
-"Você pode criar um novo documento que pode ser relacionado a uma ou vários "
-"sistemas (especificações de um projeto, FAQ para a equipe de vendas, etc.). "
-"Palavras chave podem ser usadas para marcar as páginas wiki. Você deve usar "
-"este sistema com a interface de cliente web do OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Os Documentos permitem que você acesse todos os arquivos anexados a qualquer "
-"registro. É um repositório para todos os documentos como email, anexos "
-"relacionados a projetos ou qualquer outro documento. A partir desta "
-"visualização, você  pode procurar nos conteúdos dos documentos. O OpenERP "
-"automaticamente atribui meta dados baseados no registro, como o parceiro "
-"relacionado, e indexa o conteúdo de documentos .DOC, .ODT, .TXT, .SXW e .PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Páginas do Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo fornece um Modelo de FAQ Wiki\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "FAQ Wiki de Vendas"
diff --git a/addons/wiki_sale_faq/i18n/ro.po b/addons/wiki_sale_faq/i18n/ro.po
deleted file mode 100644
index 7fd7b4e4982..00000000000
--- a/addons/wiki_sale_faq/i18n/ro.po
+++ /dev/null
@@ -1,78 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-08 19:40+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Paginile wiki va permit sa impartasiti idei si intrebari cu colegii "
-"dumneavoastra. Puteti crea un document nou care poate fi conectat la una sau "
-"la mai multe aplicatii (specificatii ale unui proiect, Intrebari Frecvente "
-"pentru echipele de vanzari, etc.). Cuvintele cheie pot fi folosite pentru a "
-"eticheta cu usurinta paginile wiki. Ar trebui sa folositi aceasta aplicatie "
-"cu interfata clientului web OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Documentele va permit accesul la toate fisierele atasate oricarei "
-"inregistrari. Este un depozit al tuturor documentelor precum e-mail-uri, "
-"atasamente legate de proiect sau orice alte documente. Din aceasta "
-"fereastra, puteti cauta prin cuprinsul documentelor. OpenERP atribuie "
-"automat date meta bazate pe inregistrare, precum partenerul asociat si "
-"indexeaza continutul documentelor .DOC, .ODT, .TXT, .SXW si .PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Documente"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "Intrebari Frecvente"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Pagini Wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Acest modul oferă un Sablon pentru Intrebari frecvente\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Vanzare - Intrebări frecvente"
diff --git a/addons/wiki_sale_faq/i18n/ru.po b/addons/wiki_sale_faq/i18n/ru.po
deleted file mode 100644
index 5033bc05aad..00000000000
--- a/addons/wiki_sale_faq/i18n/ru.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Russian 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-12 17:33+0000\n"
-"Last-Translator: vadag <vadag.ru@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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Вики-страницы позволяют вам делиться идеями и вопросами с коллегами. Вы "
-"можете создать новый документ, который может быть ассоциирован с одним или "
-"несколькими применениями (спецификация проекта, ЧаВо для отдела продаж и "
-"т.д.). Вики-страницам легко могут быть присвоены метки с помощью ключевых "
-"слов. Вы должны использовать это приложение через веб-интерфейс OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Документы дают вам доступ ко всем файлам, связанным с любой записью. Это "
-"хранилище всех документов, таких как электронные письма, вложения проектов и "
-"т.д. Из этого вида (?-view), вы можете производить поиск по содержимому "
-"документов. OpenERP автоматически присваивает мета-информацию, основываясь "
-"на записи (такую, как связанный партнер) и индексирует .DOC, .ODT, .TXT, "
-".SXW и .PDF-файлы."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Документы"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "ЧаВо"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki страницы"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Этот модуль предоставляет шаблон ЧаВо\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Вики - Продажи - ЧаВо"
diff --git a/addons/wiki_sale_faq/i18n/sk.po b/addons/wiki_sale_faq/i18n/sk.po
deleted file mode 100644
index 1521f40d781..00000000000
--- a/addons/wiki_sale_faq/i18n/sk.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Slovak 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-21 13:12+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki stránky umožňujú zdieľať svoje myšlienky a otázky so spolupracovníkmi. "
-"Môžete vytvoriť nový dokument, ktorý môže byť spojený s jednou alebo "
-"viacerými aplikáciami (špecifikácie projektu, FAQ na predajné tímy, atď). "
-"Kľúčové slová možno použiť ako tag wiki stránok. Mali by ste používať túto "
-"aplikáciu s klientom webového rozhrania OpenERP."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokumenty, ktoré vám dajú prístup k všetkým súborom pripojené k nejakému "
-"záznamu. Jedná sa o úložisko všetkých dokumentov, ako sú e-maily, projektovo "
-"súvisiace prílohy alebo akékoľvek iné dokumenty. Z tohto pohľadu možno "
-"prehľadávať obsah dokumentov. OpenERP automaticky priradiť metadáta na "
-"základe zápisu ako súvisiaci partner a indexovanie v obsahu DOC,. ODT,. "
-"TXT,. sxw a. PDF dokumentov."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumenty"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki stánky"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Tento modul poskytuje wiki FAQ šablóny\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki -Predaj - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/sl.po b/addons/wiki_sale_faq/i18n/sl.po
deleted file mode 100644
index 06f55e00fb8..00000000000
--- a/addons/wiki_sale_faq/i18n/sl.po
+++ /dev/null
@@ -1,77 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-25 11:10+0000\n"
-"Last-Translator: Simon Vidmar <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki strani vam omogočajo, da delite ideje in vprašanja s sodelavci. "
-"Ustvarite lahko nov dokument, ki ga je mogoče povezati z eno ali več "
-"aplikacij (specifikacije projekta, FAQ za prodajne ekipe, itd). Ključne "
-"besede se lahko uporabljajo za enostavno povezavo na   wiki strani . Morate "
-"uporabiti to aplikacijo z web OpenERP vmesnikom odjemalca."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokumenti vam omogočajo dostop do vseh datotek, ki so povezani na bilo "
-"kateri zapis. To je skladišče vseh dokumentov, kot so e-pošta, povezane s "
-"projektom priponk ali kateri koli drugi dokumenti. V tem pogledu lahko "
-"iščete po vsebini dokumentov. OpenERP samodejno dodeli meta podatke, ki "
-"temeljijo na zapisih, kot so povezani z končnicami . DOC,. ODT,. TXT,. Sxw "
-"in. Dokument PDF."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumenti"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "Pogosto zastavljena vprašanja"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Strani wiki"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ta modul omogoča predlogo za wiki pogosto zastavljenih vprašanj (FAQ)\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Prodaja - Pogosto zastavljena vprašanja"
diff --git a/addons/wiki_sale_faq/i18n/sr@latin.po b/addons/wiki_sale_faq/i18n/sr@latin.po
deleted file mode 100644
index a1e58c475a5..00000000000
--- a/addons/wiki_sale_faq/i18n/sr@latin.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Serbian Latin 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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-10-17 14:04+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki stranice omogućavaju Vam podelu ideja i pitanja sa saradnicima. Možete "
-"napraviti novi dokument koji može biti povezan s jednom ili nekoliko "
-"aplikacija (specifikacije projekta, FAQ za timove prodaje). Ključne reči se "
-"mogu upotrebiti za lako obeležavanje wiki stranica. Ovu bi aplikaciju "
-"trebalo koristiti zajedno s OpenERP-ovim korisničkim interfejsom."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokumenta Vam daju pristup svim datotekama povezanim s bilo kojim zapisom. "
-"To je skladište svih dokumenata, poput e-pošte, dodatke povezane s "
-"projektima ili bilo koja druga dokumenta. S ovog pregleda možete "
-"pretraživati sadržaj dokumenata. OpenERP automatski  dodeljuje meta podatke "
-"vezane za zapis, kao što su povezani partneri i indeksi sadržaja tipa .DOC, "
-".ODT, .TXT, .SXW i .PDF dokumenata."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokumenta"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki stranice"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ovaj modul obezbeđuje wiki za FAQ-model\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Prodaja - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/sv.po b/addons/wiki_sale_faq/i18n/sv.po
deleted file mode 100644
index b35f7a01d4d..00000000000
--- a/addons/wiki_sale_faq/i18n/sv.po
+++ /dev/null
@@ -1,77 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-21 14:39+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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki sidorna kan du dela idéer och frågor med dina medarbetare. Du kan skapa "
-"ett nytt dokument som kan kopplas till en eller flera tillämpningar "
-"(specifikationerna för ett projekt, FAQ för säljteam osv.) Sökord kan "
-"användas för att enkelt märka wikisidor. Du bör använda denna applikation "
-"via webbklientens gränssnitt."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dokument ger dig tillgång till alla filer som bifogats till en post. Det är "
-"en förvaringsplats för alla dokument som e-post, projektrelaterade bilagor "
-"eller andra handlingar. Från denna vy kan du söka igenom innehållet i "
-"dokumenten. OpenERP tilldela automatiskt metadata baserade på skivan som den "
-"tillhörande partner och indexerar innehållet i. Doc. ODT, TXT,. Sxw och. PDF-"
-"dokument."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dokument"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "FAQ"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wikisidor"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Denna modul ger en wiki FAQ mall\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Försäljning - FAQ"
diff --git a/addons/wiki_sale_faq/i18n/tr.po b/addons/wiki_sale_faq/i18n/tr.po
deleted file mode 100644
index 7db0d607364..00000000000
--- a/addons/wiki_sale_faq/i18n/tr.po
+++ /dev/null
@@ -1,77 +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-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-07 20:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"Wiki sayfaları çalışma arkadaşlarınızla sorular ve fikirler paylaşmanıza "
-"yardım eder. Bir veya birden çok uygulamadan bağlantı verilebilecek yeni "
-"dökümanlar oluşturabilirsiniz. (Bir projenin özellikleri, Satış temsilcileri "
-"için SSS, vb. ) Wiki sayfalarını anahtar kelimelerle kolayca "
-"etiketleyebilirsiniz. Bu uygulamayı OpenERP web istemci arayüzü ile "
-"kullanmalısınız."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"Dökümanlar size herhangi bir kayda eklenmiş bütün dosyalara erişim verir. "
-"Bütün dökümanları, mesela e-posta mesajları, proje-ilgili ekler vs gibi "
-"kapsayan bir depolama kabıdır. Bu görüntüden dökümanın içeriğinde arama "
-"yapabilirsiniz. OpenERP dökümanın meta-bilgilerini ilgili cari ve kaydedilen "
-"dökümanların içeriklerinde (.DOC, .ODT, .TXT, .SXW ve PDF) oluşturur."
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "Dökümanlar"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "SSS"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "Wiki Sayfaları"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "Bu modül bir wiki Sıkça Sorulan Sorular Şablonu içerir\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "Wiki - Satış - SSS"
diff --git a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
deleted file mode 100644
index 2f050f513d3..00000000000
--- a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
+++ /dev/null
@@ -1,44 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* wiki_sale_faq
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+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: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid "Wiki pages allow you to share ideas and questions with coworkers. You can create a new document that can be linked to one or several applications (specifications of a project, FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid "Documents give you access to all files attached to any record. It is a repository of all documents such as emails, project-related attachments or any other documents. From this view, you can search through the content of the documents. OpenERP automatically assign meta data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents."
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr ""
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr ""
-
diff --git a/addons/wiki_sale_faq/i18n/zh_CN.po b/addons/wiki_sale_faq/i18n/zh_CN.po
deleted file mode 100644
index 403f4fa278d..00000000000
--- a/addons/wiki_sale_faq/i18n/zh_CN.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-07 16:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid ""
-"Wiki pages allow you to share ideas and questions with coworkers. You can "
-"create a new document that can be linked to one or several applications "
-"(specifications of a project, FAQ for sales teams, etc.). Keywords can be "
-"used to easily tag wiki pages. You should use this application with the "
-"OpenERP web client interface."
-msgstr ""
-"wiki页面让你与同事去共享构思和问题，你可以创建一个新的文档那么你可以链接到一个或多个服务器的应用（项目的说明书或销售团队的问题与解答（FAQ）等）关键"
-"字可以轻松标记出wiki页面。在系统的web客户端你应该使用这应用。"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid ""
-"Documents give you access to all files attached to any record. It is a "
-"repository of all documents such as emails, project-related attachments or "
-"any other documents. From this view, you can search through the content of "
-"the documents. OpenERP automatically assign meta data based on the record "
-"like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW "
-"and .PDF documents."
-msgstr ""
-"文档使你可以访问到任何记录到的所有文件。这是一个所有文档的仓库如电子邮件，项目相关的附件或其它任何文档。\r\n"
-"在这个视图，你能搜索这文档的内容。\r\n"
-"系统根据记录的业务伙伴相关的和内容索引的各种文档如.DOC, .ODT, .TXT, .SXW 和 .PDF自动分配元数据。"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_sales
-msgid "Documents"
-msgstr "文档"
-
-#. module: wiki_sale_faq
-#: model:ir.ui.menu,name:wiki_sale_faq.menu_action_wiki_wiki
-msgid "FAQ"
-msgstr "问答（FAQ）"
-
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,name:wiki_sale_faq.action_wiki_test
-msgid "Wiki Pages"
-msgstr "wiki页面"
-
-#~ msgid ""
-#~ "This module provides a wiki FAQ Template\n"
-#~ "    "
-#~ msgstr ""
-#~ "此模块提供一个wiki的问答（FAQ）模板\n"
-#~ "    "
-
-#~ msgid "Wiki -Sale - FAQ"
-#~ msgstr "wiki - 销售问答（FAQ）"
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_data.xml b/addons/wiki_sale_faq/wiki_sale_faq_data.xml
deleted file mode 100644
index d9bd8de43ff..00000000000
--- a/addons/wiki_sale_faq/wiki_sale_faq_data.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data noupdate="1">
-        <record model="document.directory" id="dir_sale">
-            <field name="name">Sales Document</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="parent_id" ref="document.dir_root"/>
-            <field name="ressource_id">0</field>
-        </record>
-
-        <record id="wiki_groups_sale_faq" model="wiki.groups">
-            <field name="name">Sale FAQ</field>
-            <field name="method">list</field>
-            <field eval="2" name="section"/>
-            <field name="template">== Question ==
-
-
-== Answer ==
-
-
-
-== External Links ==
-
-</field>
-        </record>
-
-    
-   </data>
-</openerp>
diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml
deleted file mode 100644
index f3116bc73b5..00000000000
--- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
-
-        <menuitem name="Documents"
-           id="menu_sales" sequence="10"
-           parent="base.menu_base_partner"/>
-
-       <record model="ir.actions.act_window" id="action_document_form">
-           <field name="name">Documents</field>
-           <field name="type">ir.actions.act_window</field>
-           <field name="res_model">ir.attachment</field>
-           <field name="view_type">form</field>
-           <field name="context" eval="{'default_parent_id':ref('dir_sale')}"/>
-           <field name="help">Documents give you access to all files attached to any record. It is a repository of all documents such as emails, project-related attachments or any other documents. From this view, you can search through the content of the documents. OpenERP automatically assign meta data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents.</field>
-       </record>
-
-       <record model="ir.actions.act_window" id="action_wiki_test">
-           <field name="name">Sales FAQ</field>
-           <field name="res_model">wiki.wiki</field>
-           <field name="view_type">form</field>
-           <field name="view_mode">tree,form</field>
-           <field name="domain" eval="[('group_id','=',ref('wiki_groups_sale_faq'))]"/>
-           <field name="search_view_id" ref="wiki.view_wiki_filter"/>
-           <field name="help">Wiki pages allow you to share ideas and questions with coworkers. You can create a new document that can be linked to one or several applications (specifications of a project, FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface.</field>
-       </record>
-
-        <menuitem
-        name="Sales Documents"
-        action="action_document_form"
-        id="menu_document_files"
-        parent="menu_sales"/>
-
-        <menuitem parent="menu_sales"
-            id="menu_action_wiki_wiki" name="Sales FAQ"
-            action="action_wiki_test" />
-
-
-      </data>
-</openerp>