diff --git a/addons/account/account.py b/addons/account/account.py index 2910d3d64a1..6368149ba5c 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -845,16 +845,11 @@ class account_journal(osv.osv): def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): if not args: args = [] - if context is None: - context = {} - ids = [] - if context.get('journal_type', False): - args += [('type','=',context.get('journal_type'))] - if name: - ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context) - if not ids: - ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator - + if operator in expression.NEGATIVE_TERM_OPERATORS: + domain = [('code', operator, name), ('name', operator, name)] + else: + domain = ['|', ('code', operator, name), ('name', operator, name)] + ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context) return self.name_get(cr, user, ids, context=context) account_journal() @@ -944,13 +939,11 @@ class account_fiscalyear(osv.osv): def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): if args is None: args = [] - if context is None: - context = {} - ids = [] - if name: - ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit) - if not ids: - ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit) + if operator in expression.NEGATIVE_TERM_OPERATORS: + domain = [('code', operator, name), ('name', operator, name)] + else: + domain = ['|', ('code', operator, name), ('name', operator, name)] + ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context) return self.name_get(cr, user, ids, context=context) account_fiscalyear() @@ -1045,19 +1038,11 @@ class account_period(osv.osv): def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): if args is None: args = [] - if context is None: - context = {} - ids = [] - if name: - ids = self.search(cr, user, - [('code', 'ilike', name)] + args, - limit=limit, - context=context) - if not ids: - ids = self.search(cr, user, - [('name', operator, name)] + args, - limit=limit, - context=context) + if operator in expression.NEGATIVE_TERM_OPERATORS: + domain = [('code', operator, name), ('name', operator, name)] + else: + domain = ['|', ('code', operator, name), ('name', operator, name)] + ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context) return self.name_get(cr, user, ids, context=context) def write(self, cr, uid, ids, vals, context=None): @@ -1195,36 +1180,6 @@ class account_move(osv.osv): 'company_id': company_id, } - def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): - """ - Returns a list of tupples containing id, name, as internally it is called {def name_get} - result format: {[(id, name), (id, name), ...]} - - @param cr: A database cursor - @param user: ID of the user currently logged in - @param name: name to search - @param args: other arguments - @param operator: default operator is 'ilike', it can be changed - @param context: context arguments, like lang, time zone - @param limit: Returns first 'n' ids of complete result, default is 80. - - @return: Returns a list of tuples containing id and name - """ - - if not args: - args = [] - ids = [] - if name: - ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context) - - if not ids and name and type(name) == int: - ids += self.search(cr, user, [('id','=',name)]+args, limit=limit, context=context) - - if not ids: - ids += self.search(cr, user, args, limit=limit, context=context) - - return self.name_get(cr, user, ids, context=context) - def name_get(self, cursor, user, ids, context=None): if isinstance(ids, (int, long)): ids = [ids] @@ -1853,10 +1808,12 @@ class account_tax_code(osv.osv): def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80): if not args: args = [] - if context is None: - context = {} - ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context) - return self.name_get(cr, user, ids, context) + if operator in expression.NEGATIVE_TERM_OPERATORS: + domain = [('code', operator, name), ('name', operator, name)] + else: + domain = ['|', ('code', operator, name), ('name', operator, name)] + ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context) + return self.name_get(cr, user, ids, context=context) def name_get(self, cr, uid, ids, context=None): if isinstance(ids, (int, long)): @@ -1986,15 +1943,11 @@ class account_tax(osv.osv): """ if not args: args = [] - if context is None: - context = {} - ids = [] - if name: - ids = self.search(cr, user, [('description', '=', name)] + args, limit=limit, context=context) - if not ids: - ids = self.search(cr, user, [('name', operator, name)] + args, limit=limit, context=context) + if operator in expression.NEGATIVE_TERM_OPERATORS: + domain = [('description', operator, name), ('name', operator, name)] else: - ids = self.search(cr, user, args, limit=limit, context=context or {}) + domain = ['|', ('description', operator, name), ('name', operator, name)] + ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context) return self.name_get(cr, user, ids, context=context) def write(self, cr, uid, ids, vals, context=None): @@ -2003,15 +1956,17 @@ class account_tax(osv.osv): return super(account_tax, self).write(cr, uid, ids, vals, context=context) def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): + if context is None: + context = {} journal_pool = self.pool.get('account.journal') - if context and context.has_key('type'): + if context.get('type'): if context.get('type') in ('out_invoice','out_refund'): args += [('type_tax_use','in',['sale','all'])] elif context.get('type') in ('in_invoice','in_refund'): args += [('type_tax_use','in',['purchase','all'])] - if context and context.has_key('journal_id'): + if context.get('journal_id'): journal = journal_pool.browse(cr, uid, context.get('journal_id')) if journal.type in ('sale', 'purchase'): args += [('type_tax_use','in',[journal.type,'all'])] diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 94b98b78907..947aad481d1 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -457,7 +457,7 @@ - + diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index e2aac6ff141..61619276df7 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -1023,10 +1023,14 @@ class account_move_line(osv.osv): part_rec_ids = [rec['reconcile_partial_id'][0] for rec in part_recs] unlink_ids += rec_ids unlink_ids += part_rec_ids + all_moves = obj_move_line.search(cr, uid, ['|',('reconcile_id', 'in', unlink_ids),('reconcile_partial_id', 'in', unlink_ids)]) + all_moves = list(set(all_moves) - set(move_ids)) if unlink_ids: if opening_reconciliation: obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False}) obj_move_rec.unlink(cr, uid, unlink_ids) + if all_moves: + obj_move_line.reconcile_partial(cr, uid, all_moves, 'auto',context=context) return True def unlink(self, cr, uid, ids, context=None, check=True): diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index e6349985205..07a3b27e2d7 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-02-04 01:12+0000\n" -"Last-Translator: Mohamed M. Hagag \n" +"PO-Revision-Date: 2014-04-01 07:01+0000\n" +"Last-Translator: kifcaliph \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-06 06:23+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "System payment" -msgstr "مدفوعات النظام" +msgstr "نظام الدفع" #. module: account #: sql_constraint:account.fiscal.position.account:0 diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 861b0ae2929..1af16cc0eec 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-01-25 11:32+0000\n" -"Last-Translator: Ralf Hilgenstock \n" +"PO-Revision-Date: 2014-04-05 20:42+0000\n" +"Last-Translator: Rudolf Schnapka \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-26 05:15+0000\n" -"X-Generator: Launchpad (build 16914)\n" +"X-Launchpad-Export-Date: 2014-04-06 06:52+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -2165,7 +2165,7 @@ msgstr "Rechnung bestätigt" #. module: account #: field:account.config.settings,module_account_check_writing:0 msgid "Pay your suppliers by check" -msgstr "" +msgstr "Lieferantenzahlung per Scheck" #. module: account #: field:account.move.line.reconcile,credit:0 @@ -10850,7 +10850,7 @@ msgstr "" #. module: account #: field:account.bank.statement.line,name:0 msgid "OBI" -msgstr "" +msgstr "Zweck" #. module: account #: help:res.partner,property_account_payable:0 diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index a9a100e667e..2bbb38622b1 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-02-05 16:24+0000\n" -"Last-Translator: Carlos Vásquez (CLEARCORP) " -"\n" +"PO-Revision-Date: 2014-04-09 17:06+0000\n" +"Last-Translator: Pedro Manuel Baeza \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-06 06:23+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-10 06:46+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -475,9 +474,7 @@ msgstr "" "Le permite gestionar los activos de una compañía o persona.\n" "Realiza un seguimiento de la depreciación de estos activos, y crea asientos " "para las líneas de depreciación.\n" -"Esto instala el módulo 'account_asset'. \n" -"Si no marca esta casilla, podrá realizar facturas y pagos, pero no " -"contabilidad (asientos contables, plan de cuentas, ...)" +"Esto instala el módulo 'account_asset'." #. module: account #: help:account.bank.statement.line,name:0 diff --git a/addons/account/i18n/fr_CA.po b/addons/account/i18n/fr_CA.po index 3096f7b7c17..08fcbe3a655 100644 --- a/addons/account/i18n/fr_CA.po +++ b/addons/account/i18n/fr_CA.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-02-19 18:14+0000\n" +"PO-Revision-Date: 2014-03-19 14:03+0000\n" "Last-Translator: Philippe Latouche - Savoir-faire Linux \n" "Language-Team: French (Canada) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-20 05:41+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -27,6 +27,8 @@ msgstr "" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" +"La position fiscale d'un compte peut être définie seulement une fois pour ce " +"compte" #. module: account #: help:account.tax.code,sequence:0 @@ -225,12 +227,12 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_select msgid "Move line reconcile select" -msgstr "" +msgstr "Sélection des écritures à réconcilier" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Accounting entries are an input of the reconciliation." -msgstr "" +msgstr "Les écritures comptables sont une entrée de la réconciliation" #. module: account #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports @@ -254,11 +256,15 @@ msgid "" "legal reports, and set the rules to close a fiscal year and generate opening " "entries." msgstr "" +"Le type de compte est utilisé comme indication pour l'utilisateur, ainsi que " +"pour créer des rapports comptables spécifiques à certains pays, et enfin " +"pour gérer les clotûres d'exercices fiscaux (et établir les écritures " +"correspondantes)" #. module: account #: field:account.config.settings,sale_refund_sequence_next:0 msgid "Next credit note number" -msgstr "" +msgstr "Prochain numéro de note de crédit" #. module: account #: help:account.config.settings,module_account_voucher:0 @@ -281,7 +287,7 @@ msgstr "" #. module: account #: view:account.analytic.chart:0 msgid "Select the Period for Analysis" -msgstr "" +msgstr "Sélectionnez la période à analyser" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree3 @@ -298,6 +304,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Cliquez pour ajouter une note de crédit.\n" +"

\n" +" Une note de crédit est un document qui crédite une facture\n" +" complètement ou partiellement.\n" +"

\n" +" Au lieu de créer manuellement une note de crédit client, " +"vous\n" +" pouvez le générer directement depuis la facture client\n" +" correspondante.\n" +"

\n" +" " #. module: account #: help:account.installer,charts:0 @@ -309,7 +327,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_unreconcile msgid "Account Unreconcile" -msgstr "" +msgstr "Annuler la réconcilliation" #. module: account #: field:account.config.settings,module_account_budget:0 @@ -328,11 +346,14 @@ msgid "" "leave the automatic formatting, it will be computed based on the financial " "reports hierarchy (auto-computed field 'level')." msgstr "" +"Vous pouvez déterminer ici le format que vous souhaitez voir affiché pour " +"l'enregistrement. Si vous laissez le formatage automatique, il va être " +"établi à partir de la hiérarchie des rapports (champ auto-généré 'niveau')" #. module: account #: field:account.config.settings,group_multi_currency:0 msgid "Allow multi currencies" -msgstr "" +msgstr "Autoriser les devises multiples" #. module: account #: code:addons/account/account_invoice.py:77 @@ -366,7 +387,7 @@ msgstr "" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Vendeur" #. module: account #: view:account.bank.statement:0 @@ -393,7 +414,7 @@ msgstr "" #. module: account #: selection:account.journal,type:0 msgid "Purchase Refund" -msgstr "" +msgstr "Note de crédit fournisseur" #. module: account #: selection:account.journal,type:0 @@ -426,6 +447,14 @@ msgid "" "this box, you will be able to do invoicing & payments,\n" " but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +"Ceci permet de gérer les notes de crédit d'une société ou d'un individu.\n" +" Il garde l'historique des dépréciations sur ces notes de " +"crédit, et crée une opération de compte pour ces lignes de dépréciation.\n" +" Il installe le module account_asset. Si vous ne cochez pas " +"cette case, vous serez en mesure d'effectuer la facturation et les " +"paiements,\n" +" mais pas la comptabilité (enregistrements dans Journal , " +"Plan Comptable, ...)" #. module: account #: help:account.bank.statement.line,name:0 @@ -451,6 +480,8 @@ msgstr "" #: selection:account.invoice.refund,filter_refund:0 msgid "Modify: create refund, reconcile and create a new draft invoice" msgstr "" +"Modifier : Créer une note de crédit, la réconcilier et créer une nouvelle " +"facture" #. module: account #: help:account.config.settings,tax_calculation_rounding_method:0 @@ -554,12 +585,12 @@ msgstr "" #: help:account.vat.declaration,chart_account_id:0 #: help:accounting.report,chart_account_id:0 msgid "Select Charts of Accounts" -msgstr "" +msgstr "Sélectionner le plan comptable" #. module: account #: model:ir.model,name:account.model_account_invoice_refund msgid "Invoice Refund" -msgstr "" +msgstr "Note de crédit" #. module: account #: report:account.overdue:0 @@ -569,7 +600,7 @@ msgstr "" #. module: account #: field:account.automatic.reconcile,unreconciled:0 msgid "Not reconciled transactions" -msgstr "" +msgstr "Transactions non réconciliées" #. module: account #: report:account.general.ledger:0 @@ -582,13 +613,13 @@ msgstr "" #: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" -msgstr "" +msgstr "Affectation des taxes" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "" +msgstr "Fermer un exercice" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 @@ -691,7 +722,7 @@ msgstr "" #: code:addons/account/account.py:3201 #, python-format msgid "SAJ" -msgstr "" +msgstr "JV" #. module: account #: code:addons/account/account.py:1591 @@ -747,6 +778,9 @@ msgid "" "lines for refunds. Leave empty if you don't want to use an analytic account " "on the invoice tax lines by default." msgstr "" +"Définissez le compte analytique qui sera utilisé par défaut sur les lignes " +"de notes de crédit. Laissez vide si vous ne voulez pas utiliser de compte " +"analytique sur les lignes de notes de crédit." #. module: account #: view:account.account:0 @@ -769,7 +803,7 @@ msgstr "" #. module: account #: view:account.invoice.refund:0 msgid "Create Refund" -msgstr "" +msgstr "Créer note de crédit" #. module: account #: constraint:account.move.line:0 @@ -781,7 +815,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_report_general_ledger msgid "General Ledger Report" -msgstr "" +msgstr "Rapport de Grand Livre" #. module: account #: view:account.invoice:0 @@ -791,7 +825,7 @@ msgstr "" #. module: account #: view:account.use.model:0 msgid "Are you sure you want to create entries?" -msgstr "" +msgstr "Etes vous sûr de vouloir saisir des écritures ?" #. module: account #: code:addons/account/account_invoice.py:1361 @@ -811,6 +845,9 @@ msgid "" "Cannot %s invoice which is already reconciled, invoice should be " "unreconciled first. You can only refund this invoice." msgstr "" +"Vous ne pouvez pas %s la facture, qui est déjà réconciliée : la " +"réconciliation doit d'abord être annulée. Vous pouvez seulement créer une " +"note de crédit." #. module: account #: view:account.account:0 @@ -831,7 +868,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_charts msgid "Charts" -msgstr "" +msgstr "Graphiques" #. module: account #: code:addons/account/project/wizard/project_account_analytic_line.py:47 @@ -843,7 +880,7 @@ msgstr "" #. module: account #: field:account.invoice.refund,filter_refund:0 msgid "Refund Method" -msgstr "" +msgstr "Méthode de notes de crédit" #. module: account #: model:ir.ui.menu,name:account.menu_account_report @@ -888,20 +925,20 @@ msgstr "" #. module: account #: view:account.invoice.report:0 msgid "Supplier Invoices And Refunds" -msgstr "" +msgstr "Factures et notes de crédit fournisseurs" #. module: account #: code:addons/account/account_move_line.py:851 #, python-format msgid "Entry is already reconciled." -msgstr "" +msgstr "Cette entrée a déjà fait l'objet d'une réconciliation." #. module: account #: view:account.move.line.unreconcile.select:0 #: view:account.unreconcile.reconcile:0 #: model:ir.model,name:account.model_account_move_line_unreconcile_select msgid "Unreconciliation" -msgstr "" +msgstr "Non réconcilié" #. module: account #: model:ir.model,name:account.model_account_analytic_journal_report @@ -947,7 +984,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24 #, python-format msgid "Latest Manual Reconciliation Processed:" -msgstr "" +msgstr "Dernières reconciliation manuelles traitées:" #. module: account #: selection:account.subscription,period_type:0 @@ -977,6 +1014,8 @@ msgid "" " opening/closing fiscal " "year process." msgstr "" +"Impossible d'annuler la réconciliation d'écritures qui ont été générées par " +"le processus d'ouverture/de fermeture d'exercice" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -987,7 +1026,7 @@ msgstr "" #: view:account.payment.term:0 #: field:account.payment.term.line,value:0 msgid "Computation" -msgstr "" +msgstr "Calcul" #. module: account #: field:account.journal.cashbox.line,pieces:0 @@ -1004,12 +1043,12 @@ msgstr "" #. module: account #: view:account.fiscalyear:0 msgid "Create 3 Months Periods" -msgstr "" +msgstr "Créer des périodes trimestrielles" #. module: account #: report:account.overdue:0 msgid "Due" -msgstr "" +msgstr "Payable" #. module: account #: field:account.config.settings,purchase_journal_id:0 @@ -1025,7 +1064,7 @@ msgstr "" #: view:validate.account.move:0 #: view:validate.account.move.lines:0 msgid "Approve" -msgstr "" +msgstr "Approbation" #. module: account #: view:account.invoice:0 @@ -1037,7 +1076,7 @@ msgstr "" #. module: account #: help:account.invoice,supplier_invoice_number:0 msgid "The reference of this invoice as provided by the supplier." -msgstr "" +msgstr "La référence de la facture tel que fournie par le fournisseur" #. module: account #: selection:account.account,type:0 @@ -1051,7 +1090,7 @@ msgstr "" #: model:account.financial.report,name:account.account_financial_report_liability0 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0 msgid "Liability" -msgstr "" +msgstr "Passif" #. module: account #: code:addons/account/account_invoice.py:899 @@ -1072,7 +1111,7 @@ msgstr "" #. module: account #: selection:account.journal,type:0 msgid "Sale Refund" -msgstr "" +msgstr "Note de crédit de vente" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 @@ -1082,7 +1121,7 @@ msgstr "" #. module: account #: field:account.analytic.line,move_id:0 msgid "Move Line" -msgstr "" +msgstr "Ligne d'écriture" #. module: account #: help:account.move.line,tax_amount:0 @@ -1095,7 +1134,7 @@ msgstr "" #. module: account #: view:account.analytic.line:0 msgid "Purchases" -msgstr "" +msgstr "Achats" #. module: account #: field:account.model,lines_id:0 @@ -1117,12 +1156,12 @@ msgstr "" #: report:account.partner.balance:0 #: field:account.period,code:0 msgid "Code" -msgstr "" +msgstr "Code" #. module: account #: view:account.config.settings:0 msgid "Features" -msgstr "" +msgstr "Fonctionnalités" #. module: account #: code:addons/account/account.py:2346 @@ -1140,7 +1179,7 @@ msgstr "" #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance #: model:ir.ui.menu,name:account.menu_account_partner_balance_report msgid "Partner Balance" -msgstr "" +msgstr "Balance des partenaires" #. module: account #: model:ir.actions.act_window,help:account.action_account_gain_loss @@ -1189,7 +1228,7 @@ msgstr "" #. module: account #: help:account.fiscalyear.close,fy_id:0 msgid "Select a Fiscal year to close" -msgstr "" +msgstr "Choisissez un exercice à fermer" #. module: account #: help:account.account.template,user_type:0 @@ -1201,12 +1240,14 @@ msgstr "" #. module: account #: view:account.invoice:0 msgid "Refund " -msgstr "" +msgstr "Note de crédit " #. module: account #: help:account.config.settings,company_footer:0 msgid "Bank accounts as printed in the footer of each printed document" msgstr "" +"Comptes en banque tel qu'imprimé dans le pied de page de chaque document " +"imprimé" #. module: account #: view:account.tax:0 @@ -1223,12 +1264,12 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree #: model:ir.ui.menu,name:account.journal_cash_move_lines msgid "Cash Registers" -msgstr "" +msgstr "Caisses enregistreuses" #. module: account #: field:account.config.settings,sale_refund_journal_id:0 msgid "Sale refund journal" -msgstr "" +msgstr "Journal auxilaire - Compte clients" #. module: account #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree @@ -1264,7 +1305,7 @@ msgstr "" #. module: account #: view:account.tax:0 msgid "Refunds" -msgstr "" +msgstr "Notes de crédit" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 @@ -1282,7 +1323,7 @@ msgstr "" #: field:account.fiscal.position.tax,tax_dest_id:0 #: field:account.fiscal.position.tax.template,tax_dest_id:0 msgid "Replacement Tax" -msgstr "" +msgstr "Impôt de remplacement" #. module: account #: selection:account.move.line,centralisation:0 @@ -1293,7 +1334,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "" +msgstr "Modèles de code de taxe" #. module: account #: view:account.invoice.cancel:0 @@ -1338,12 +1379,12 @@ msgstr "" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "" +msgstr "L'écriture de cette ligne d'entrée." #. module: account #: field:account.move.line.reconcile,trans_nbr:0 msgid "# of Transaction" -msgstr "" +msgstr "# de transactions" #. module: account #: report:account.general.ledger:0 @@ -1351,7 +1392,7 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "Entry Label" -msgstr "" +msgstr "Libellé de l'écriture" #. module: account #: help:account.invoice,origin:0 @@ -1363,7 +1404,7 @@ msgstr "" #: view:account.analytic.line:0 #: view:account.journal:0 msgid "Others" -msgstr "" +msgstr "Autres" #. module: account #: view:account.subscription:0 @@ -1408,13 +1449,13 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_entries_report_all #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all msgid "Entries Analysis" -msgstr "" +msgstr "Analyse des écritures" #. module: account #: field:account.account,level:0 #: field:account.financial.report,level:0 msgid "Level" -msgstr "" +msgstr "Niveau" #. module: account #: code:addons/account/wizard/account_change_currency.py:38 @@ -1434,7 +1475,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_tax_report #: model:ir.ui.menu,name:account.next_id_27 msgid "Taxes" -msgstr "" +msgstr "Taxes" #. module: account #: code:addons/account/wizard/account_financial_report.py:70 @@ -1446,12 +1487,12 @@ msgstr "" #: model:account.financial.report,name:account.account_financial_report_profitandloss0 #: model:ir.actions.act_window,name:account.action_account_report_pl msgid "Profit and Loss" -msgstr "" +msgstr "Résultats" #. module: account #: model:ir.model,name:account.model_account_account_template msgid "Templates for Accounts" -msgstr "" +msgstr "Modèles de comptes" #. module: account #: view:account.tax.code.template:0 @@ -1463,19 +1504,19 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_reconcile_select #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile msgid "Reconcile Entries" -msgstr "" +msgstr "Écritures de réconcilliation" #. module: account #: model:ir.actions.report.xml,name:account.account_overdue #: view:res.company:0 msgid "Overdue Payments" -msgstr "" +msgstr "Paiement en souffrance" #. module: account #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "Initial Balance" -msgstr "" +msgstr "Solde initial" #. module: account #: view:account.invoice:0 @@ -1501,12 +1542,12 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_entries_report msgid "Journal Items Analysis" -msgstr "" +msgstr "Analyse des écritures comptables du journal" #. module: account #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" -msgstr "" +msgstr "Partenaires" #. module: account #: help:account.bank.statement,state:0 @@ -1535,12 +1576,12 @@ msgstr "" #: model:process.node,name:account.process_node_bankstatement0 #: model:process.node,name:account.process_node_supplierbankstatement0 msgid "Bank Statement" -msgstr "" +msgstr "Relevé bancaire" #. module: account #: field:res.partner,property_account_receivable:0 msgid "Account Receivable" -msgstr "" +msgstr "Compte client" #. module: account #: code:addons/account/account.py:612 @@ -1558,7 +1599,7 @@ msgstr "" #: selection:account.partner.balance,display_partner:0 #: selection:account.report.general.ledger,display_account:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "Compte dont le solde n'est pas 0" #. module: account #: code:addons/account/account.py:1483 @@ -1591,7 +1632,7 @@ msgstr "" #. module: account #: field:account.automatic.reconcile,max_amount:0 msgid "Maximum write-off amount" -msgstr "" +msgstr "Montant maximum des écarts de réconcilliation" #. module: account #. openerp-web @@ -1601,6 +1642,9 @@ msgid "" "There is nothing to reconcile. All invoices and payments\n" " have been reconciled, your partner balance is clean." msgstr "" +"Il n'y a rien à réconcillier. Toutes les factures et paiements\n" +" ont été réconcilliés, le solde de votre partenaire " +"est équilibré." #. module: account #: field:account.chart.template,code_digits:0 diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 958f54e473c..7772ebb6db6 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-03-08 05:09+0000\n" +"PO-Revision-Date: 2014-04-21 15:10+0000\n" "Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-09 06:02+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -687,7 +687,7 @@ msgstr "主となる順序は現在と異なる必要があります。" #: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not configured properly." -msgstr "" +msgstr "現在通貨が正しく設定されていません。" #. module: account #: field:account.journal,profit_account_id:0 @@ -739,6 +739,8 @@ msgid "" "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " "and 'draft' or ''}" msgstr "" +"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " +"and 'draft' or ''}" #. module: account #: view:account.period:0 @@ -1565,6 +1567,8 @@ msgid "" "And after getting confirmation from the bank it will be in 'Confirmed' " "status." msgstr "" +"新しい明細書が作成されるとステータスは「ドラフト」になります。\n" +"また、銀行からの確認後は「確認済み」状態になります。" #. module: account #: field:account.invoice.report,state:0 @@ -1679,7 +1683,7 @@ msgstr "" #. module: account #: view:account.config.settings:0 msgid "eInvoicing & Payments" -msgstr "請求と支払い" +msgstr "請求と支払" #. module: account #: view:account.analytic.cost.ledger.journal.report:0 @@ -2392,7 +2396,7 @@ msgstr "斜体テキスト（小）" msgid "" "If you want the journal should be control at opening/closing, check this " "option" -msgstr "" +msgstr "オープン/クローズ時に仕訳を制御する場合は、このオプションをチェックします。" #. module: account #: view:account.bank.statement:0 @@ -2895,7 +2899,7 @@ msgstr "分析勘定" #: field:account.config.settings,default_purchase_tax:0 #: field:account.config.settings,purchase_tax:0 msgid "Default purchase tax" -msgstr "デフォルト消費税（購入）" +msgstr "デフォルト購買税" #. module: account #: view:account.account:0 @@ -2908,7 +2912,7 @@ msgstr "デフォルト消費税（購入）" #: model:ir.ui.menu,name:account.menu_action_account_form #: model:ir.ui.menu,name:account.menu_analytic msgid "Accounts" -msgstr "アカウント" +msgstr "勘定科目" #. module: account #: code:addons/account/account.py:3541 @@ -2980,7 +2984,7 @@ msgstr "参照" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Purchase Tax" -msgstr "" +msgstr "購買税" #. module: account #: help:account.move.line,tax_code_id:0 @@ -3276,7 +3280,7 @@ msgstr "基本コードの金額" #. module: account #: field:wizard.multi.charts.accounts,sale_tax:0 msgid "Default Sale Tax" -msgstr "デフォルト消費税（売上）" +msgstr "デフォルト販売税" #. module: account #: help:account.model.line,date_maturity:0 @@ -3362,7 +3366,7 @@ msgstr "会計年度の選択" #: view:account.config.settings:0 #: view:account.installer:0 msgid "Date Range" -msgstr "" +msgstr "日付範囲" #. module: account #: view:account.period:0 @@ -3448,7 +3452,7 @@ msgstr "合計数量" #. module: account #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0 msgid "Write-Off account" -msgstr "償却アカウント" +msgstr "償却勘定" #. module: account #: field:account.model.line,model_id:0 @@ -4024,7 +4028,7 @@ msgstr "詳細" #. module: account #: help:account.config.settings,default_purchase_tax:0 msgid "This purchase tax will be assigned by default on new products." -msgstr "購入税はデフォルトで新製品に割り当てられます。" +msgstr "購買税はデフォルトで新製品に割り当てられます。" #. module: account #: report:account.account.balance:0 @@ -5007,7 +5011,7 @@ msgstr "番号（移動）" #. module: account #: view:cash.box.out:0 msgid "Describe why you take money from the cash register:" -msgstr "" +msgstr "キャッシュレジスタから現金を取り出した理由を説明して下さい。" #. module: account #: selection:account.invoice,state:0 @@ -5044,7 +5048,7 @@ msgstr "会社の通貨と異なる場合はレポートに通貨欄を追加し #: code:addons/account/account.py:3394 #, python-format msgid "Purchase Tax %.2f%%" -msgstr "消費税（仕入） %.2f%%" +msgstr "購買税 %.2f%%" #. module: account #: view:account.subscription.generate:0 @@ -5088,7 +5092,7 @@ msgstr "新規" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Sale Tax" -msgstr "" +msgstr "販売税" #. module: account #: view:account.move:0 @@ -5872,7 +5876,7 @@ msgstr "ドラフト返金 " #. module: account #: view:cash.box.in:0 msgid "Fill in this form if you put money in the cash register:" -msgstr "" +msgstr "キャッシュレジスタに現金を入れる場合はこのフォームに記入して下さい。" #. module: account #: view:account.payment.term.line:0 @@ -6379,7 +6383,7 @@ msgstr "日数" msgid "" "You cannot validate this journal entry because account \"%s\" does not " "belong to chart of accounts \"%s\"." -msgstr "" +msgstr "勘定科目「%s」は勘定科目表「%s」に含まれないため、この仕訳を確定できません。" #. module: account #: view:account.financial.report:0 @@ -7669,7 +7673,7 @@ msgstr "請求年によるグループ" #. module: account #: field:account.config.settings,purchase_tax_rate:0 msgid "Purchase tax (%)" -msgstr "" +msgstr "購買税(%)" #. module: account #: help:res.partner,credit:0 @@ -7723,7 +7727,7 @@ msgstr "銀行取引明細書行" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 msgid "Default Purchase Tax" -msgstr "デフォルト消費税（仕入）" +msgstr "デフォルト購買税" #. module: account #: field:account.chart.template,property_account_income_opening:0 @@ -9409,7 +9413,7 @@ msgstr "会計データ設定" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax_rate:0 msgid "Purchase Tax(%)" -msgstr "消費税（仕入）（%）" +msgstr "購買税(%)" #. module: account #: code:addons/account/account_invoice.py:901 @@ -9795,7 +9799,7 @@ msgstr "一般的なレポート" #: field:account.config.settings,default_sale_tax:0 #: field:account.config.settings,sale_tax:0 msgid "Default sale tax" -msgstr "デフォルト消費税（販売）" +msgstr "デフォルト販売税" #. module: account #: report:account.overdue:0 @@ -10045,7 +10049,7 @@ msgstr "分析勘定より" #. module: account #: view:account.installer:0 msgid "Configure your Fiscal Year" -msgstr "" +msgstr "会計年度設定" #. module: account #: field:account.period,name:0 diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index bf5699cfb5d..13dcd8f6408 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-12 05:25+0000\n" +"X-Launchpad-Export-Date: 2014-03-13 07:15+0000\n" "X-Generator: Launchpad (build 16963)\n" #. module: account diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index 4aa95ed5fc0..089d94953d5 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2014-02-25 12:37+0000\n" -"Last-Translator: Jan Jurkus (GCE CAD-Service) \n" +"PO-Revision-Date: 2014-04-20 06:40+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-26 07:31+0000\n" -"X-Generator: Launchpad (build 16935)\n" +"X-Launchpad-Export-Date: 2014-04-21 05:08+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -928,7 +928,7 @@ msgstr "Kostenplaatsboekingen per regel" #. module: account #: field:account.invoice.refund,filter_refund:0 msgid "Refund Method" -msgstr "Teruggave Methode" +msgstr "Wijze van crediteren" #. module: account #: model:ir.ui.menu,name:account.menu_account_report @@ -1418,7 +1418,7 @@ msgstr "Vervangende belasting" #. module: account #: selection:account.move.line,centralisation:0 msgid "Credit Centralisation" -msgstr "Credit centralisatie" +msgstr "Totaal credit" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form @@ -2943,7 +2943,7 @@ msgstr "Grondslag teken (+/-)" #. module: account #: selection:account.move.line,centralisation:0 msgid "Debit Centralisation" -msgstr "Verzameld debet" +msgstr "Totaal debet" #. module: account #: view:account.invoice.confirm:0 @@ -3359,8 +3359,8 @@ msgid "" "You need an Opening journal with centralisation checked to set the initial " "balance." msgstr "" -"U dient een peningsbalans opgeven in een openingsdagboek met de instelling " -"'gecentraliseerde tegenboeking'." +"U dient een openingsbalans opgeven in een openingsdagboek met de instelling " +"'Centrale tegenrekening'." #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_list @@ -5062,7 +5062,7 @@ msgstr "Rek. type" #. module: account #: selection:account.journal,type:0 msgid "Bank and Checks" -msgstr "Bank en Cheques" +msgstr "Bank en Giro" #. module: account #: field:account.account.template,note:0 @@ -5515,7 +5515,7 @@ msgstr "MEM" #. module: account #: view:res.partner:0 msgid "Accounting-related settings are managed on" -msgstr "Boekhouding instellingen worden beheert bij" +msgstr "Boekhoudingsinstellingen worden beheerd bij" #. module: account #: field:account.fiscalyear.close,fy2_id:0 @@ -6298,7 +6298,7 @@ msgstr "Vul dit formulier in als u geld in de kassa stopt." #: view:account.payment.term.line:0 #: field:account.payment.term.line,value_amount:0 msgid "Amount To Pay" -msgstr "Te betalen bedrag" +msgstr "Bedrag te betalen" #. module: account #: help:account.partner.reconcile.process,to_reconcile:0 @@ -7440,7 +7440,7 @@ msgstr "Boekingsregels" #. module: account #: field:account.move.line,centralisation:0 msgid "Centralisation" -msgstr "Centralisatie" +msgstr "Balansboekingen" #. module: account #: view:account.account:0 @@ -9460,8 +9460,7 @@ msgstr "" " met betrekking tot de dagelijkse bedrijfsvoering.\n" "

\n" " een gemiddeld bedrijf gebruikt een dagboek per " -"betaalmethode(kasboek,\n" -" bankrekeningen, cheques), een inkoopboek, een verkoopboek\n" +"betaalmethode(kas, bank en giro), een inkoopboek, een verkoopboek\n" " en een memoriaal.\n" "

\n" " " @@ -9776,7 +9775,7 @@ msgstr "" #: code:addons/account/account_move_line.py:1006 #, python-format msgid "The account move (%s) for centralisation has been confirmed." -msgstr "De boeking (%s) voor voor centralisatie is bevestigd." +msgstr "De balansboeking (%s) is bevestigd." #. module: account #: report:account.analytic.account.journal:0 @@ -10582,7 +10581,7 @@ msgstr "Directe betaling" #: code:addons/account/account.py:1502 #, python-format msgid " Centralisation" -msgstr " Centralisatie" +msgstr " Balansboeking" #. module: account #: help:account.journal,type:0 diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index f9b7003c6df..147799acd44 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-11-17 08:42+0000\n" -"Last-Translator: Mirosław Bojanowicz \n" +"PO-Revision-Date: 2014-04-18 13:02+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:52+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -190,6 +190,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"Kliknij aby utworzyć okres rozliczeniowy.\n" +"

\n" +"Typowo, rozliczeniowym okresem księgowym jest miesiąc lub kwartał.\n" +"On odpowiada okresom rozliczeń podatkowych.\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -745,6 +752,8 @@ msgid "" "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' " "and 'draft' or ''}" msgstr "" +"Faktura_${(object.number or '').replace('/','_')}_${object.state == 'draft' " +"and 'draft' or ''}" #. module: account #: view:account.period:0 @@ -999,7 +1008,7 @@ msgstr "Wrzesień" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24 #, python-format msgid "Latest Manual Reconciliation Processed:" -msgstr "" +msgstr "Ostatnio ręcznie uzgodniono:" #. module: account #: selection:account.subscription,period_type:0 @@ -1035,6 +1044,8 @@ msgid "" " opening/closing fiscal " "year process." msgstr "" +"Nie możesz anulować uzgodnień pozycji dziennika jeśli zostały one " +"wygenerowane procesem zamykania/otwierania roku." #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -1800,7 +1811,7 @@ msgstr "Powtarzanie" #. module: account #: report:account.invoice:0 msgid "TIN :" -msgstr "" +msgstr "NIP:" #. module: account #: field:account.journal,groups_id:0 @@ -1842,7 +1853,7 @@ msgstr "Konto podatku dla korekt" #. module: account #: model:ir.model,name:account.model_ir_sequence msgid "ir.sequence" -msgstr "" +msgstr "ir.sequence" #. module: account #: view:account.bank.statement:0 @@ -2400,7 +2411,7 @@ msgstr "Dobra robota!" #. module: account #: field:account.config.settings,module_account_asset:0 msgid "Assets management" -msgstr "Środku trwałe" +msgstr "Środki trwałe" #. module: account #: view:account.account:0 @@ -4935,7 +4946,7 @@ msgstr "Nie ma firmy bez planu kont. Kreator nie zostanie uruchomiony." #: view:account.move:0 #: view:account.move.line:0 msgid "Add an internal note..." -msgstr "Dodaj notatke wewnetrzną ..." +msgstr "Dodaj notatkę wewnetrzną ..." #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart @@ -5229,7 +5240,7 @@ msgstr "Podatek sprzedaży" #. module: account #: view:account.move:0 msgid "Cancel Entry" -msgstr "Anulowanie wpisu" +msgstr "Anulowanie zapisu" #. module: account #: field:account.tax,ref_tax_code_id:0 @@ -7373,7 +7384,7 @@ msgstr "Utwórz zapis" #. module: account #: view:account.open.closed.fiscalyear:0 msgid "Cancel Fiscal Year Closing Entries" -msgstr "Anulowanie wpisów zamknięcia roku finansowego" +msgstr "Anulowanie zapisów zamknięcia roku finansowego" #. module: account #: selection:account.account.type,report_type:0 @@ -7634,7 +7645,7 @@ msgstr "" #. module: account #: field:account.invoice,paypal_url:0 msgid "Paypal Url" -msgstr "" +msgstr "Paypal Url" #. module: account #: field:account.config.settings,module_account_voucher:0 @@ -7669,7 +7680,7 @@ msgstr "Podatki stosowane w sprzedaży" #. module: account #: view:account.period:0 msgid "Re-Open Period" -msgstr "" +msgstr "Otwórz okres ponownie" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree1 @@ -8421,7 +8432,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_cash_box_in msgid "cash.box.in" -msgstr "" +msgstr "cash.box.in" #. module: account #: help:account.invoice,move_id:0 @@ -8431,7 +8442,7 @@ msgstr "Połącz z automatycznie generowanymi pozycjami zapisów" #. module: account #: model:ir.model,name:account.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: account #: selection:account.config.settings,period:0 @@ -8491,6 +8502,8 @@ msgid "" "You cannot delete an invoice which is not draft or cancelled. You should " "refund it instead." msgstr "" +"Nie możńa usunąć faktury, która nie jest w stanie projektu lub anulownia. " +"Możesz tylko utowrzyć jej korektę." #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement @@ -8754,7 +8767,7 @@ msgstr "Brak roku podatkowego dla firmy" #. module: account #: view:account.invoice:0 msgid "Proforma" -msgstr "" +msgstr "Proforma" #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -9022,7 +9035,7 @@ msgstr "Typy kont" #. module: account #: model:email.template,subject:account.email_template_edi_invoice msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})" -msgstr "" +msgstr "${object.company_id.name} Faktura (Odn. ${object.number or 'n/a'})" #. module: account #: code:addons/account/account_move_line.py:1210 @@ -10239,7 +10252,7 @@ msgstr "" #: code:addons/account/account_move_line.py:780 #, python-format msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!" -msgstr "" +msgstr "Pozycja dziennika '%s' (id: %s), Zapis '%s' jest już uzgodniony!" #. module: account #: view:account.invoice:0 @@ -10253,7 +10266,7 @@ msgstr "Projekty faktur" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 #, python-format msgid "Nothing more to reconcile" -msgstr "" +msgstr "Nie ma nic więcej do uzgadniania" #. module: account #: view:cash.box.in:0 @@ -10513,7 +10526,7 @@ msgstr "Kurs waluty" #. module: account #: view:account.config.settings:0 msgid "e.g. sales@openerp.com" -msgstr "" +msgstr "np. sales@openerp.com" #. module: account #: field:account.account,tax_ids:0 diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po index 5aa3cf8f9c8..540bcb7c74c 100644 --- a/addons/account/i18n/sl.po +++ b/addons/account/i18n/sl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-12-07 07:36+0000\n" +"PO-Revision-Date: 2014-04-04 11:12+0000\n" "Last-Translator: Dušan Laznik (Mentis) \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-08 05:46+0000\n" -"X-Generator: Launchpad (build 16869)\n" +"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -4884,7 +4884,7 @@ msgstr "Zaključek poslovnega leta" #. module: account #: selection:account.move.line,state:0 msgid "Balanced" -msgstr "Uklajeno" +msgstr "Usklajeno" #. module: account #: model:process.node,note:account.process_node_importinvoice0 diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 9986dc8919e..5999ebe2175 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-11-04 11:13+0000\n" -"Last-Translator: Anders Eriksson, Mobila System \n" +"PO-Revision-Date: 2014-03-27 13:22+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:53+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -27,6 +27,7 @@ msgstr "Systembetalning" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" +"Ett kontos skatteregion kan endast definieras en gång för varje konto." #. module: account #: help:account.tax.code,sequence:0 @@ -100,6 +101,8 @@ msgid "" "Error!\n" "You cannot create recursive account templates." msgstr "" +"Fel!\n" +"Du kan inte skapa rekursiva kontomallar." #. module: account #. openerp-web @@ -187,6 +190,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att lägga till en räkenskapsperiod.\n" +" \n" +" En redovisningsperiod är vanligtvis en månad eller ett " +"kvartal. Oftast\n" +" motsvarar den skattedeklarationens perioder. \n" +" \n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -201,7 +212,7 @@ msgstr "Kolumnetikett" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "Antal siffror i kontokoderna" #. module: account #: help:account.analytic.journal,type:0 @@ -251,7 +262,7 @@ msgstr "Validerad" #. module: account #: model:account.account.type,name:account.account_type_income_view1 msgid "Income View" -msgstr "" +msgstr "Intäktsvy" #. module: account #: help:account.account,user_type:0 @@ -307,6 +318,17 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att skapa en kund återbetalning.\n" +" \n" +" En återbetalning är ett dokument som krediterar en faktura " +"helt eller\n" +" delvis.\n" +" \n" +" Istället för att manuellt skapa en kundåterbetalning, kan " +"du generera den direkt från den relaterade kundfakturan.\n" +" \n" +" " #. module: account #: help:account.installer,charts:0 @@ -371,7 +393,7 @@ msgstr "" #. module: account #: help:account.config.settings,group_analytic_accounting:0 msgid "Allows you to use the analytic accounting." -msgstr "Tillåter dig att använda analys konteringen" +msgstr "Aktiverar objektredovisningen" #. module: account #: view:account.invoice:0 @@ -439,6 +461,14 @@ msgid "" "this box, you will be able to do invoicing & payments,\n" " but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +"Detta gör det möjligt att hantera de tillgångar som ägs av ett företag eller " +"en individ.\n" +" Det håller reda på de avskrivningar inträffade på dessa " +"tillgångar, och skapar konto flytta för dessa avskrivningar linjer.\n" +" Detta installerar modulen account_asset. Om du inte " +"markerar den här rutan, kommer du att kunna göra fakturering och " +"betalningar,\n" +" men inte redovisning (Journal objekt, Kontoplan, ...)" #. module: account #: help:account.bank.statement.line,name:0 @@ -477,6 +507,12 @@ msgid "" "should choose 'Round per line' because you certainly want the sum of your " "tax-included line subtotals to be equal to the total amount with taxes." msgstr "" +"Om du väljer 'avrunda per rad \": beräknas momsbeloppet först på varje rad " +"för att avrundas PO / SO / fakturarad och sedan summeras de avrundade " +"beloppen. Om du väljer 'avrunda globalt \": summeras alla skatter och sedan " +"avrundas totalen. Om du säljer med priser med ingående moms, ska du välja " +"\"avrunda per rad\" för att försäkra dig om att ingående skatt matchar " +"utgående." #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -622,7 +658,7 @@ msgstr "Alla" #. module: account #: field:account.config.settings,decimal_precision:0 msgid "Decimal precision on journal entries" -msgstr "" +msgstr "Decimalprecition på journaltransaktioner" #. module: account #: selection:account.config.settings,period:0 @@ -1180,6 +1216,20 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att lägga till ett konto.\n" +" \n" +" När du gör affärer med flera valutor, kan du förlora eller " +"vinna\n" +" vissa belopp på grund av förändringar i växelkursen. Den " +"här menyn ger\n" +" du en prognos för vinst eller förlust du skulle realiseras " +"om de\n" +" transaktioner avslutades idag. Endast för konton som har " +"en\n" +" sekundär valuta angiven.\n" +" \n" +" " #. module: account #: field:account.bank.accounts.wizard,acc_name:0 @@ -1851,7 +1901,7 @@ msgstr "Bokslutsårsordning" #. module: account #: field:account.config.settings,group_analytic_accounting:0 msgid "Analytic accounting" -msgstr "Analyskonto" +msgstr "Objektsredovisning" #. module: account #: report:account.overdue:0 @@ -2301,7 +2351,7 @@ msgstr "Bra jobbat!" #. module: account #: field:account.config.settings,module_account_asset:0 msgid "Assets management" -msgstr "Tillgångshantering" +msgstr "Inventarier och kapitalförvaltning" #. module: account #: view:account.account:0 @@ -3879,7 +3929,7 @@ msgstr "Överföringar" #. module: account #: field:account.config.settings,expects_chart_of_accounts:0 msgid "This company has its own chart of accounts" -msgstr "" +msgstr "Bolaget har en egen kontoplan" #. module: account #: view:account.chart:0 @@ -6436,7 +6486,7 @@ msgstr "Företag relaterat till denna journal" #. module: account #: help:account.config.settings,group_multi_currency:0 msgid "Allows you multi currency environment" -msgstr "" +msgstr "Aktiverar en flervalutamiljö" #. module: account #: view:account.subscription:0 @@ -7826,7 +7876,7 @@ msgstr "Dagbok" #. module: account #: field:account.config.settings,tax_calculation_rounding_method:0 msgid "Tax calculation rounding method" -msgstr "" +msgstr "Momsavrundningsmetod" #. module: account #: model:process.node,name:account.process_node_paidinvoice0 @@ -8355,7 +8405,7 @@ msgstr "" #. module: account #: field:res.company,tax_calculation_rounding_method:0 msgid "Tax Calculation Rounding Method" -msgstr "" +msgstr "Momsavrundningsmetod" #. module: account #: field:account.entries.report,move_line_state:0 @@ -8604,6 +8654,9 @@ msgid "" "recalls.\n" " This installs the module account_followup." msgstr "" +"Detta gör det möjligt att automatisera påminnelsebrev för obetalda fakturor, " +"i flera eskalerande nivåer.\n" +" Detta installerar modulen account_followup." #. module: account #: field:account.automatic.reconcile,period_id:0 @@ -10847,7 +10900,7 @@ msgstr "Tillämplighet alternativ" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "The optional other currency if it is a multi-currency entry." +msgstr "Den valfria extra valutan om det är ett fler-valuta verifikat." #. module: account #: model:process.transition,note:account.process_transition_invoiceimport0 diff --git a/addons/account/installer.py b/addons/account/installer.py index 9ad20129587..357ec11dec3 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -47,7 +47,7 @@ class account_installer(osv.osv_memory): # try get the list on apps server try: - apps_server = self.pool.get('ir.config_parameter').get_param(cr, uid, 'apps.server', 'https://apps.openerp.com') + apps_server = self.pool.get('ir.module.module').get_apps_server(cr, uid, context=context) up = urlparse.urlparse(apps_server) url = '{0.scheme}://{0.netloc}/apps/charts?serie={1}'.format(up, serie) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 00547261ca2..600056c05f1 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -31,7 +31,7 @@ - + diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 6914adfaf20..f45d40a9d6c 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -135,21 +135,9 @@ - + [[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] - - - - Description - Taxes - Quantity - Unit Price - Disc.(%) - Price - - - @@ -214,6 +202,19 @@ + + + + + Description + Taxes + Quantity + Unit Price + Disc.(%) + Price + + + @@ -261,6 +262,7 @@ + @@ -368,6 +370,5 @@ - diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 5f5cffb2954..d046d3d3572 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -167,7 +167,7 @@ class account_invoice_refund(osv.osv_memory): to_reconcile_ids = {} for line in movelines: if line.account_id.id == inv.account_id.id: - to_reconcile_ids[line.account_id.id] = [line.id] + to_reconcile_ids.setdefault(line.account_id.id, []).append(line.id) if line.reconcile_id: line.reconcile_id.unlink() wf_service.trg_validate(uid, 'account.invoice', \ diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index 4372ce12f04..a45d2c1969b 100644 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -34,7 +34,7 @@ class validate_account_move(osv.osv_memory): if context is None: context = {} data = self.browse(cr, uid, ids, context=context)[0] - ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)]) + ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)], order="date") if not ids_move: raise osv.except_osv(_('Warning!'), _('Specified journal does not have any account move entries in draft state for this period.')) obj_move.button_validate(cr, uid, ids_move, context=context) diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po index f1c2e0adbbc..7f07538092d 100644 --- a/addons/account_analytic_analysis/i18n/pl.po +++ b/addons/account_analytic_analysis/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-11-15 13:00+0000\n" -"Last-Translator: Mirosław Bojanowicz \n" +"PO-Revision-Date: 2014-04-18 12:47+0000\n" +"Last-Translator: Dariusz Żbikowski (Krokus) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -26,7 +26,7 @@ msgstr "Brak zamówień do fakturowania, utwórz" #: code:addons/account_analytic_analysis/account_analytic_analysis.py:547 #, python-format msgid "Timesheets to Invoice of %s" -msgstr "Listy ewidencji czasu pracy do fakturowania za %s" +msgstr "Karty czasu pracy do fakturowania za %s" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -136,7 +136,7 @@ msgstr "Przypomnienie o kończącym się terminie umowy ${user.company_id.name}" #: code:addons/account_analytic_analysis/account_analytic_analysis.py:464 #, python-format msgid "Sales Order Lines of %s" -msgstr "Zlecenie sprzedaży %s" +msgstr "Pozycje zamówiena sprzedaży %s" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -158,7 +158,7 @@ msgstr "Konto analityczne" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Partner" -msgstr "Kontrahent" +msgstr "Partner" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -244,6 +244,8 @@ msgid "" "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " "'normal','template'])]}" msgstr "" +"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " +"'normal','template'])]}" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -299,6 +301,8 @@ msgid "" "{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " "('invoice_on_timesheets', '=', True)]}" msgstr "" +"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " +"('invoice_on_timesheets', '=', True)]}" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -748,7 +752,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: account_analytic_analysis #: field:sale.config.settings,group_template_required:0 diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po index 612951147d3..1d05b412d94 100644 --- a/addons/account_analytic_analysis/i18n/sv.po +++ b/addons/account_analytic_analysis/i18n/sv.po @@ -8,25 +8,25 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-27 16:40+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "No order to invoice, create" -msgstr "" +msgstr "Ingen order att fakturera, skapa en" #. module: account_analytic_analysis #: code:addons/account_analytic_analysis/account_analytic_analysis.py:547 #, python-format msgid "Timesheets to Invoice of %s" -msgstr "" +msgstr "Tidrapporter att fakturera %s" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -36,17 +36,17 @@ msgstr "Gruppera på..." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Template" -msgstr "" +msgstr "Mall" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "To Invoice" -msgstr "" +msgstr "Att fakturera" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Remaining" -msgstr "" +msgstr "Återstående" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 @@ -56,7 +56,7 @@ msgstr "Real Margin Rate (%)" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "End date passed or prepaid unit consumed" -msgstr "" +msgstr "Slutdatum passerat eller förbetalning upplupen" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 @@ -71,7 +71,7 @@ msgstr "Uninvoiced Amount" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "⇒ Invoice" -msgstr "" +msgstr "⇒ Faktura" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 @@ -86,7 +86,7 @@ msgstr "Date of Last Invoiced Cost" #. module: account_analytic_analysis #: help:account.analytic.account,fix_price_to_invoice:0 msgid "Sum of quotations for this contract." -msgstr "" +msgstr "Summan av offerter för detta avtal" #. module: account_analytic_analysis #: model:ir.actions.act_window,help:account_analytic_analysis.action_sales_order @@ -101,6 +101,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att skapa en offert som kan omvandlas till en " +"kundorder.\n" +"

\n" +" Använd kundorder även för att spåra allt som ska " +"faktureras\n" +" till fastpris på ett avtal.\n" +"

\n" +" " #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 @@ -110,28 +119,28 @@ msgstr "Total customer invoiced amount for this account." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Cancelled" -msgstr "" +msgstr "Avbruten" #. module: account_analytic_analysis #: help:account.analytic.account,timesheet_ca_invoiced:0 msgid "Sum of timesheet lines invoiced for this contract." -msgstr "" +msgstr "Summan av fakturerade tidrapportrader för detta avtal" #. module: account_analytic_analysis #: model:email.template,subject:account_analytic_analysis.account_analytic_cron_email_template msgid "Contract expiration reminder ${user.company_id.name}" -msgstr "" +msgstr "Påminnelse utgående avtal ${user.company_id.name}" #. module: account_analytic_analysis #: code:addons/account_analytic_analysis/account_analytic_analysis.py:464 #, python-format msgid "Sales Order Lines of %s" -msgstr "" +msgstr "Kundorderrad från %s" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "End date is in the next month" -msgstr "" +msgstr "Slutdatum är i nästa månad" #. module: account_analytic_analysis #: help:account.analytic.account,revenue_per_hour:0 @@ -148,7 +157,7 @@ msgstr "Analyskonto" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Partner" -msgstr "" +msgstr "Företag" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -173,6 +182,20 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att skapa ett nytt kontrakt.\n" +" \n" +" Här hittar du de avtal som skall förnyas på grund av att\n" +" slutdatum är nått eller att kontrakterade resurser är på " +"upphällningen.\n" +" \n" +" OpenERP sätter avtal automatiskt ställer automatiskt " +"kontrakt som skall förnyas inom en pågående\n" +" tillstånd. Efter negociation, bör försäljaren stänga eller " +"förnya\n" +" avvaktan kontrakt.\n" +" \n" +" " #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -182,27 +205,28 @@ msgstr "Slutdatum" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Account Manager" -msgstr "" +msgstr "Kundansvarig" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours_to_invoice:0 msgid "Computed using the formula: Maximum Time - Total Invoiced Time" msgstr "" +"Beräknas enligt följande formel: Maximum Time - totala fakturerade tid" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Expected" -msgstr "" +msgstr "Förväntad" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Closed contracts" -msgstr "" +msgstr "Stängda avtal" #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 msgid "Computed using the formula: Theoretical Revenue - Total Costs" -msgstr "" +msgstr "Beräknad med formeln: teoretisk intäkt - totalkostnad" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 @@ -223,16 +247,18 @@ msgid "" "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " "'normal','template'])]}" msgstr "" +"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " +"'normal','template'])]}" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Pricelist" -msgstr "" +msgstr "Prislista" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours:0 msgid "Computed using the formula: Maximum Time - Total Worked Time" -msgstr "" +msgstr "Beräknad med formeln: Största möjliga tid - upparbetad tid" #. module: account_analytic_analysis #: help:account.analytic.account,hours_quantity:0 @@ -246,12 +272,12 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Nothing to invoice, create" -msgstr "" +msgstr "Inget att fakturera, skapa" #. module: account_analytic_analysis #: model:res.groups,name:account_analytic_analysis.group_template_required msgid "Mandatory use of templates in contracts" -msgstr "" +msgstr "Obligatorisk användning av mallar i avtal" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_invoiced_date:0 @@ -265,7 +291,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 msgid "Total Worked Time" -msgstr "" +msgstr "Totalt arbetade timmar" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin:0 @@ -278,11 +304,13 @@ msgid "" "{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " "('invoice_on_timesheets', '=', True)]}" msgstr "" +"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " +"('invoice_on_timesheets', '=', True)]}" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts assigned to a customer." -msgstr "" +msgstr "Avtal knutna till en kund" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month @@ -292,7 +320,7 @@ msgstr "Hours summary by month" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Pending contracts" -msgstr "" +msgstr "Väntande avtal" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin_rate:0 @@ -302,7 +330,7 @@ msgstr "Computes using the formula: (Real Margin / Total Costs) * 100." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "or view" -msgstr "" +msgstr "eller visa" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -312,7 +340,7 @@ msgstr "Förälder" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Units Consumed" -msgstr "" +msgstr "Förbrukade enheter" #. module: account_analytic_analysis #: field:account.analytic.account,month_ids:0 @@ -324,22 +352,22 @@ msgstr "Månad" #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all msgid "Time & Materials to Invoice" -msgstr "" +msgstr "Tid och material att fakturera" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Start Date" -msgstr "" +msgstr "Startdatum" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Expiring soon" -msgstr "" +msgstr "Går snart ut" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Invoiced" -msgstr "" +msgstr "Fakturerad" #. module: account_analytic_analysis #: model:email.template,body_html:account_analytic_analysis.account_analytic_cron_email_template @@ -410,16 +438,83 @@ msgid "" "\n" " " msgstr "" +"\n" +"Hej ${object.name } ,\n" +"\n" +"% makro account_table(values) :\n" +"\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" < / tr >\n" +" % for partner , accounts in values :\n" +" % for account in accounts:\n" +" \n" +" \n" +" - - - - - - - - - @@ -215,6 +190,31 @@ + + + + + + + + + + + + + +
KundAvtalDatumförbetalda enheter< /th>\n" +" Avtal
${partner.name } < / td >\n" +" < a " +"href=\"${ctx[\"base_url\"]}/#action=${ctx[\"action_id\"]}&id=${account.id}&vi" +"ew_type=form\">${account.name} ${ account.date_start} till ${ account.date och " +"account.date or \" ? ? ' } < / td >\n" +" \n" +" % Om account.quantity_max = 0,0 :\n" +" ${ account.remaining_hours } / ${ account.quantity_max } " +"enheter\n" +" % endif\n" +" < / td >\n" +" ${ account.partner_id.phone or '' } , ${ " +"account.partner_id.email or '' } < / td >\n" +" < / tr >\n" +" % endfor\n" +" % endfor\n" +"< / table >\n" +"% endmacro\n" +"\n" +"% if \"new\" in ctx [ \" data\" ] :\n" +"

Följande avtal upphört att gälla : \n" +" ${ account_table ( ctx [ \" data\" ] [ \" new \" ] . iteritems ( ) ) }\n" +"% endif\n" +"\n" +"% if \"old\" in ctx [ \" data\" ] :\n" +"

Följande avslutade kontrakt fortfarande inte bearbetats : \n" +" ${ account_table ( ctx [ \" data\" ] [ \" old\" ] . iteritems ( ) ) }\n" +"% endif\n" +"\n" +"% if \"future\" in ctx[ \" data\" ] :\n" +"

Följande avtal löper ut om mindre än en månad : < / h2 >\n" +" ${ account_table ( ctx[ \" data\" ] [ \" future \" ] . iteritems ( ) ) " +"}\n" +"% endif\n" +"\n" +"

\n" +" Du kan kontrollera alla kontrakt som ska förnyas med hjälp av menyn :\n" +"< /p >\n" +"

    \n" +"
  • Försäljning / Fakturering / Avtal förnya < / li >\n" +"< /ul >\n" +"

    \n" +" Tack ,\n" +"< /p >\n" +"\n" +"

    \n"
+"-\n"
+"OpenERP Automatiskt e-postmeddelande\n"
+"< /pre >\n"
+"\n"
+"            "
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Tidrapporter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Closed"
-msgstr ""
+msgstr "Avslutad"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -438,7 +533,7 @@ msgstr "Förfallna kvantiteter"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -461,7 +556,7 @@ msgstr "Avtal"
 #: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Kundorder"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -488,7 +583,7 @@ msgstr "Användare"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Cancelled contracts"
-msgstr ""
+msgstr "Avbrutna avtal"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
@@ -503,6 +598,14 @@ msgid ""
 "                
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                     Klicka här för att skapa en mall för avtal.\n"
+"                 
    \n"
+"                     Mallar används för att föregå kontrakt / projekt som\n"
+"                     kan väljas av säljarna att snabbt konfigurera\n"
+"                     villkoren i kontraktet.\n"
+"                 
    \n"
+"            "
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -520,6 +623,8 @@ msgid ""
 "Allows you to set the template field as required when creating an analytic "
 "account or a contract."
 msgstr ""
+"Gör att du kan ställa in mallfält som krävs när man skapar ett objektkonto "
+"eller ett avtal."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -536,7 +641,7 @@ msgstr "Intäkter per tidsenhet (verklig)"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expired or consumed"
-msgstr ""
+msgstr "Utgången eller förbrukad"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
@@ -553,31 +658,42 @@ msgid ""
 "                
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                     Klicka för att skapa ett nytt avtal.\n"
+"                 
    \n"
+"                     Använd avtal för att följa uppgifter, frågor, "
+"tidrapporter och fakturering baserad på\n"
+"                     arbete, kostnader och / eller kundorder. OpenERP "
+"hanterar automatiskt \n"
+"                     varningarna för förnyelse av kontrakten till rätt "
+"försäljningsansvarig.\n"
+"                 
    \n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Totalt att fakturera"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Avtal inte knutet"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Customer Contracts"
-msgstr ""
+msgstr "Kundavtal"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Totalt fakturerat"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -587,7 +703,7 @@ msgstr "Computed using the formula: Max Invoice Price - Invoiced Amount."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress (open, draft)"
-msgstr ""
+msgstr "Aktuella avtal (öppna, förslag)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -597,7 +713,7 @@ msgstr "Last Invoice Date"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Units Remaining"
-msgstr ""
+msgstr "Kvarstående enheter"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -612,6 +728,13 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Här hittar du tidrapporter och inköp som du gjorde för\n"
+"                 avtal som kan vidarefakturerats till kunden. Om du vill\n"
+"                 att registrera nya aktiviteter för att fakturera, bör du "
+"använda tidrapportmenyn istället.\n"
+"               
    \n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -635,6 +758,9 @@ msgid ""
 "remaining subtotals which, in turn, are computed as the maximum between "
 "'(Estimation - Invoiced)' and 'To Invoice' amounts"
 msgstr ""
+"Förväntan av återstående intäkter för detta avtal. Beräknas som summan av "
+"återstående delsummor, som i sin tur beräknas som maximalt mellan "
+"\"(Uppskattning - Fakturerade)\" och \"att fakturera 'belopp"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
@@ -645,7 +771,7 @@ msgstr "Avtal att förnya"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summa av allt som går att fakturera på detta avtal"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -655,7 +781,7 @@ msgstr "Teoretisk marginal"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Totalt återstående"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -665,12 +791,12 @@ msgstr "Computed using the formula: Invoiced Amount - Total Costs."
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_est:0
 msgid "Estimation of Hours to Invoice"
-msgstr ""
+msgstr "Uppskattning av timmar att fakturera"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "Fast pris"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -685,22 +811,26 @@ msgid ""
 "                            defined on the product related (e.g timesheet \n"
 "                            products are defined on each employee)."
 msgstr ""
+"Vid vidarefakturering av kostnader, använder OpenERP den\n"
+"                             prislista som är knuten till avtalet och den "
+"relaterade produkten (t.ex. på tidrapport\n"
+"                             finns en produkt knuten till varje anställd)."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Obligatorisk användning av mallar"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Contract Template"
-msgstr ""
+msgstr "Avtalsmall"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -714,7 +844,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr ""
+msgstr "Total uppskattning"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -740,17 +870,17 @@ msgstr "Total Time"
 #: model:res.groups,comment:account_analytic_analysis.group_template_required
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
-msgstr ""
+msgstr "Fältet mall för objektkontot och avtal kommer bli obligatoriskt"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
 msgid "On Timesheets"
-msgstr ""
+msgstr "På tidrapporter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #~ msgid "Pending contracts to renew with your customer"
 #~ msgstr "Väntande avtal att förnya med dina kunder"
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 8af59455628..3c8d1af3937 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 15:11+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -27,12 +27,12 @@ msgstr "Objektregler"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "Gruppera"
+msgstr "Gruppera på..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Standard slutdatum för detta objektkonto"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -41,6 +41,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Välj en produkt som kommer att använda objektkonto som anges i mallen (t.ex. "
+"skapa nya kundfaktura eller försäljnings ordning om vi väljer denna produkt, "
+"kommer den automatiskt att ta detta som ett objektkonto)"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -65,12 +68,15 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Välj ett företag som kommer att använda objektkonto som anges i mallen "
+"(t.ex. skapa nya kundfaktura eller försäljnings ordning om vi väljer denna "
+"partner, kommer den automatiskt att ta detta som ett objektkonto)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -81,7 +87,7 @@ msgstr "Användare"
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr "Poster"
+msgstr "Transaktioner"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
@@ -98,13 +104,14 @@ msgstr "Standard objektkonto"
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr "Sekvens"
+msgstr "Nummerserie"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
 msgstr ""
+"Välj en användare som kommer att använda objektkontot som anges i mallen."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -118,22 +125,25 @@ msgid ""
 "default (e.g. create new customer invoice or Sales order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Välj ett bolag som kommer att använda objektkontot som anges i mallen (t.ex. "
+"skapa nya kundfaktura eller försäljnings ordning om vi väljer det här "
+"företaget, kommer den automatiskt att ta detta som ett objektkonto)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "Analys konto"
+msgstr "Objektkonto"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr "Objektdistribution"
+msgstr "Objektfördelning"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standard startdatum för detta objektkonto"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -144,7 +154,7 @@ msgstr "Konton"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr "Partner"
+msgstr "Företag"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 40484298f1b..2948ac1c19c 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -466,15 +466,10 @@ class account_bank_statement(osv.osv):
     _inherit = "account.bank.statement"
     _name = "account.bank.statement"
 
-    def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
-        account_move_line_pool = self.pool.get('account.move.line')
-        account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
-        st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context=context)
-        result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context)
-        move = st_line.move_ids and st_line.move_ids[0] or False
-        if move:
-            for line in move.line_id:
-                account_move_line_pool.write(cr, uid, [line.id], {'analytics_id':st_line.analytics_id.id}, context=context)
+    def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, context=None):
+        result = super(account_bank_statement,self)._prepare_bank_move_line(cr, uid, st_line, 
+            move_id, amount, company_currency_id, context=context)
+        result['analytics_id'] = st_line.analytics_id.id
         return result
 
     def button_confirm_bank(self, cr, uid, ids, context=None):
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index fc9c08d8f5e..9eb7c7677bb 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 12:06+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -49,7 +49,7 @@ msgstr "Kurs (%)"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Totalen borde vara mellan %s och %s"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -133,7 +133,7 @@ msgstr "Visa inte tomma rader"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "Kontot %s saknar objekttransaktioner"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -144,7 +144,7 @@ msgstr "Konto3 Id"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
@@ -283,7 +283,7 @@ msgstr "Kontoutdragsrad"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -299,7 +299,7 @@ msgstr "Skriv ut korsrefererande objekt"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Användarfel!"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -317,7 +317,7 @@ msgstr "Analysjournal"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "Vänligen ange namn och kod innan förlagan sparas"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -349,7 +349,7 @@ msgstr "Journal"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "En objektjournal måste definieras för '%s'-journalen"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -377,7 +377,7 @@ msgstr "Fakturarad"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Objektplan saknas"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -404,7 +404,7 @@ msgstr "Objektfördelning"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "En förlaga med detta namn och kod finns redan"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 4344f7e4c3a..a4d02655b94 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-03-07 06:40+0000\n"
-"Last-Translator: Ediz Duman \n"
+"PO-Revision-Date: 2014-03-30 10:17+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
 "Language-Team: OpenERP Türkiye Yerelleştirmesi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-08 06:53+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 "Language: tr\n"
 
 #. module: account_analytic_plans
@@ -382,7 +382,7 @@ msgstr "Hiç analitik plan tanımlanmamış."
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr "Banka Ekstresi"
+msgstr "Banka Hesap Özeti"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index f27d9b3ae72..b486ff71ad9 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -118,6 +118,8 @@ class account_invoice_line(osv.osv):
                             if a == line['account_id'] and i_line.product_id.id == line['product_id']:
                                 uom = i_line.product_id.uos_id or i_line.product_id.uom_id
                                 standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)
+                                if inv.currency_id.id != company_currency:
+                                    standard_price = self.pool.get('res.currency').compute(cr, uid, company_currency, inv.currency_id.id, standard_price, context={'date': inv.date_invoice})
                                 if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
                                     price_diff = i_line.price_unit - standard_price
                                     line.update({'price':standard_price * line['quantity']})
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 9200b81decf..806013e6a4c 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -330,7 +330,7 @@ class account_asset_asset(osv.osv):
             default = {}
         if context is None:
             context = {}
-        default.update({'depreciation_line_ids': [], 'state': 'draft'})
+        default.update({'depreciation_line_ids': [], 'account_move_line_ids': [], 'history_ids': [], 'state': 'draft'})
         return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
 
     def _compute_entries(self, cr, uid, ids, period_id, context=None):
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
index 4efc2652fba..b9e4c4392a7 100644
--- a/addons/account_asset/i18n/pl.po
+++ b/addons/account_asset/i18n/pl.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-17 09:28+0000\n"
-"Last-Translator: Mirosław Bojanowicz \n"
+"PO-Revision-Date: 2014-04-12 14:45+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr "Aktywa w wersjach roboczych i stanie otwartym"
+msgstr "Środki w stanie projekt lub otwartym"
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -67,7 +67,7 @@ msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
 "from the purchase date instead of the first January"
 msgstr ""
-"Wskazuje, że pierwszy wpis amortyzacji dla tego aktywu musi zostać wykonany "
+"Wskazuje, że pierwszy zapis amortyzacji dla tego środka musi zostać wykonany "
 "od daty nabycia zamiast od pierwszego stycznia"
 
 #. module: account_asset
@@ -99,7 +99,7 @@ msgstr "Uruchomione"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr "Ustaw jako wersję roboczą"
+msgstr "Ustaw na projekt"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -107,7 +107,7 @@ msgstr "Ustaw jako wersję roboczą"
 #: model:ir.model,name:account_asset.model_asset_asset_report
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
 msgid "Assets Analysis"
-msgstr "Analiza aktywów"
+msgstr "Analiza środków"
 
 #. module: account_asset
 #: field:asset.modify,name:0
@@ -118,7 +118,7 @@ msgstr "Przyczyna"
 #: field:account.asset.asset,method_progress_factor:0
 #: field:account.asset.category,method_progress_factor:0
 msgid "Degressive Factor"
-msgstr "Współczynnik malejący"
+msgstr "Współczynnik amortyzacji"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
@@ -138,7 +138,7 @@ msgstr "Zapisy"
 #: view:account.asset.asset:0
 #: field:account.asset.asset,depreciation_line_ids:0
 msgid "Depreciation Lines"
-msgstr "Wiersze amortyzacji"
+msgstr "Pozycje amortyzacji"
 
 #. module: account_asset
 #: help:account.asset.asset,salvage_value:0
@@ -161,12 +161,12 @@ msgstr "Data amortyzacji"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr "Błąd! Nie możesz utworzyć rekursywnych aktywów."
+msgstr "Błąd! Nie możesz utworzyć rekursywnych środków."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
 msgid "Posted Amount"
-msgstr "Wpisana kwota"
+msgstr "Zaksięgowana wartość"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -207,17 +207,17 @@ msgstr "Błąd!"
 #: view:asset.asset.report:0
 #: field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr "# wpisów amortyzacji"
+msgstr "# pozycji amortyzacji"
 
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr "Ilość miesięcy w okresie"
+msgstr "Liczba miesięcy w okresie"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr "Aktywa w wersji roboczej"
+msgstr "Projekty środków"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -235,13 +235,13 @@ msgstr "Odnośnik"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Account Asset"
-msgstr "Konto aktywów"
+msgstr "Konto środka"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
 #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
 msgid "Compute Assets"
-msgstr "Obliczanie  aktywów"
+msgstr "Obliczanie  amortyzacji"
 
 #. module: account_asset
 #: field:account.asset.category,method_period:0
@@ -260,7 +260,7 @@ msgstr "Projekt"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of asset purchase"
-msgstr "Data zakupu aktywu"
+msgstr "Data zakupu środka"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -272,7 +272,7 @@ msgstr "Zmiana czasu trwania"
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr "Ilość amortyzacji potrzebna do amortyzacji twojego aktywu"
+msgstr "Liczba amortyzacji potrzebna do amortyzacji twojego środka"
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -314,7 +314,7 @@ msgstr "Czas w miesiącach pomiędzy dwiema kolejnymi amortyzacjami"
 #: model:ir.actions.act_window,name:account_asset.action_asset_modify
 #: model:ir.model,name:account_asset.model_asset_modify
 msgid "Modify Asset"
-msgstr "Modyfikacja aktywu"
+msgstr "Modyfikacja środka"
 
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
@@ -332,12 +332,12 @@ msgstr "Kategoria środka"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr "Aktywa w stanie zamkniętym"
+msgstr "Środki w stanie zamkniętym"
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
 msgid "Parent Asset"
-msgstr "Aktywa macierzyste"
+msgstr "Środek nadrzędny"
 
 #. module: account_asset
 #: view:account.asset.history:0
@@ -348,7 +348,7 @@ msgstr "Historia środka"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Search Asset Category"
-msgstr "Szukanie kategorii aktywów"
+msgstr "Szukanie kategorii środków"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -368,14 +368,14 @@ msgstr "Panel amortyzacji"
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
-msgstr "Nieopublikowana ilość"
+msgstr "Wartość niezaksięgowana"
 
 #. module: account_asset
 #: field:account.asset.asset,method_time:0
 #: field:account.asset.category,method_time:0
 #: field:account.asset.history,method_time:0
 msgid "Time Method"
-msgstr "Metoda czasowa"
+msgstr "Metoda czasu"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
@@ -415,7 +415,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr "Aktywa w stanie aktywnym"
+msgstr "Środki w stanie aktywnym"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -447,12 +447,12 @@ msgstr "Partner"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Posted depreciation lines"
-msgstr "Opublikowane pozycje amortyzacji"
+msgstr "Zaksięgowane pozycje amortyzacji"
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr "Aktywa pochodne"
+msgstr "Środki podrzędne"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -498,7 +498,7 @@ msgstr "Aktywny"
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr "Stan aktywa"
+msgstr "Stan środka"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
@@ -514,7 +514,7 @@ msgstr "Historia"
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute Asset"
-msgstr "Oblicz aktywa"
+msgstr "Oblicz środek"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index fd44381b69a..1cd86b2f5a4 100644
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-09 08:52+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-10 06:46+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -148,7 +148,7 @@ msgstr "Belopp som enligt plan inte kan avskrivas"
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
 msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "Tiden mellan två avskivningar, i månader"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
@@ -160,7 +160,7 @@ msgstr "Avskrivningsdatutm"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Fel ! Rekursiva tillgångar kan inte skapas."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -200,7 +200,7 @@ msgstr "Avskrivningsverifikat"
 #: code:addons/account_asset/account_asset.py:82
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -211,7 +211,7 @@ msgstr "# avskrivningsrader"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Antal månader i en period"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -271,12 +271,12 @@ msgstr "Ändra varaktighet"
 #: help:account.asset.category,method_number:0
 #: help:account.asset.history,method_number:0
 msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "Antal avskrivningar för att anse tillgången helt avskriven"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Objektinformation"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -300,7 +300,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Nästa avskrivningsperiod"
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -351,7 +351,7 @@ msgstr "Sök tillgångskategori"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "months"
-msgstr ""
+msgstr "månader"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
@@ -379,7 +379,7 @@ msgstr "Tidmetoden"
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -440,12 +440,17 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
+"När en inventarie har skapats, är statusen \"Utkast\".\n"
+"Om inventarien är bekräftad, går status i \"Aktiv\" och avskrivningslraderna "
+"kan postas i redovisningen.\n"
+"Du kan stänga manuellt en inventarie när avskrivningen är över. Om den sista "
+"raden i avskrivning postas, går tillgången automatiskt i denna status."
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -492,7 +497,7 @@ msgstr "Beräkna"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "Inventariehistorik"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
@@ -571,7 +576,7 @@ msgstr "Transaktioner"
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Inventariers livslängd att ändra"
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_date:0
@@ -605,6 +610,7 @@ msgstr "Aktuellt"
 #, python-format
 msgid "You cannot delete an asset that contains posted depreciation lines."
 msgstr ""
+"Du kan inte ta bort en inventarie som innehåller bokförda avskrivningsrader."
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -614,12 +620,12 @@ msgstr "Avskrivningsmetod"
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Current Depreciation"
-msgstr ""
+msgstr "Aktuell avskrivningsgrad"
 
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Inventarienamn"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -659,6 +665,9 @@ msgid ""
 "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
 "  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
 msgstr ""
+"Välj vilken metod som ska användas för att beräkna det avskrivningsrader.\n"
+"   * Linjär: Beräknat på grundval av: Bruttovärde / Antal avskrivningar\n"
+"   * Degressiv: Beräknat på grundval av: restvärde * avkrivningsfaktor"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
@@ -679,11 +688,19 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
    \n"
+"             Ur denna rapport kan du få en överblick på alla avskrivningar. "
+"Den\n"
+"             verktygsökning kan också användas för att anpassa dina "
+"inventarierapporter och\n"
+"             så, matcha denna analys till dina behov;\n"
+"           \n"
+"        "
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "Bruttovärde"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
@@ -731,12 +748,12 @@ msgstr "Skapade tillgångsändringar"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Add an internal note here..."
-msgstr ""
+msgstr "Lägg till en intern notering här..."
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index 439f5592fbd..f6776733213 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-30 11:55+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:57+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line.global,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Upphovsman till förmånstagarinformation"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -59,7 +59,7 @@ msgstr "Avbryt valda utdragsrader"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "Värdedatum"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -104,7 +104,7 @@ msgstr "Batchbetalningsinformation"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -113,11 +113,13 @@ msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
 msgstr ""
+"Radering ej tillåten. Gå till det tillhörande kontoutdraget för att ta bort "
+"och / eller modifiera kontoutdragsraden."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -224,7 +226,7 @@ msgstr "Manuell"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "Banktransaktion"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -330,7 +332,7 @@ msgstr "Bankutdragsrad"
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index a88c468fff1..daec4ea0a2f 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -164,7 +164,7 @@ class crossovered_budget_lines(osv.osv):
                     elapsed = strToDate(date_to) - strToDate(date_to)
 
                 if total.days:
-                    theo_amt = float(elapsed.days / float(total.days)) * line.planned_amount
+                    theo_amt = float((elapsed.days + 1) / float(total.days + 1)) * line.planned_amount
                 else:
                     theo_amt = line.planned_amount
 
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 08bf459b6e7..82f184be2d3 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-25 15:28+0000\n"
-"Last-Translator: Ralf Hilgenstock \n"
+"PO-Revision-Date: 2014-04-05 21:37+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-26 05:15+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-06 06:52+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -147,6 +147,24 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"    Klicken um neues Budget festzusetzen.\n"
+"
    \n"
+"    Ein Budget ist eine Vorhersage über erwartete Einnahmen und/ \n"
+"    oder Ausgaben des Unternehmens in einem zukünftigen \n"
+"    Zeitraum. Ein Budget wird für bestimmte Finanzkonten oder \n"
+"    Kostenstellen festgelegt.\n"
+"    (Kostenstellen können Projekte, Abteilungen, Warengruppen, etc. \n"
+"    repräsentieren.)\n"
+"
    \n"
+"    Durch das Nachverfolgen Ihres Geldes, ist eine übermäßige\n"
+"    Belastung unwahrscheinlicher und die Erreichung Ihrer\n"
+"    finanziellen Ziele wahrscheinlicher. Legen Sie Ihre Budgets \n"
+"    durch Abschätzung der Erlöse je Kostenstelle fest und\n"
+"    überwachen Sie die Entwicklung an Hand der Ist-Zahlen\n"
+"    der entsprechenden Periode.\n"
+"
    \n"
+"            "
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index ac7a0235857..f8b36f30d9e 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-15 12:13+0000\n"
-"Last-Translator: Mirosław Bojanowicz \n"
+"PO-Revision-Date: 2014-04-12 14:47+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -153,7 +153,7 @@ msgstr ""
 "                Budżet jest przewidywanymi przychodami i wydatkami firmy\n"
 "                przewidywanymi w okresie czasu w przyszłości. Budżet jest "
 "definiowany na\n"
-"                pewnych kontachfinansowych i/lub analitycznych (które mogą "
+"                pewnych kontach finansowych i/lub analitycznych (które mogą "
 "reprezentować\n"
 "                projekt, wydział, kategorię produktów, itp.)\n"
 "              
    \n"
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index 82f62b2e9fe..b0f78e66566 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-19 00:15+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-27 12:17+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -147,6 +147,27 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att skapa en ny budget.\n"
+"               \n"
+"                 En budget är en prognos av företagets förväntade intäkter "
+"och / eller \n"
+"                kostnader för en framtida period. En budget är definierad på "
+"vissa\n"
+"                 finansiella konton och / eller objektkonton (som kan vara\n"
+"                 projekt, avdelningar, produktkategorier, etc.)\n"
+"               \n"
+"                 Genom att hålla reda på var dina pengar går, så vet du vid "
+"varje tillfälle hur mycket \n"
+"                 du kan spendera, och vara mer benägen att möta dina "
+"ekonomiska\n"
+"                 mål. Skapa en budget genom att specificera den förväntade "
+"intäkten per\n"
+"                 objektkonto och följa dess utveckling baserad på det "
+"verkliga utfallet\n"
+"                 under den perioden.\n"
+"               \n"
+"            "
 
 #. module: account_budget
 #: report:account.budget:0
@@ -266,7 +287,7 @@ msgstr "Att godkänna budgetar"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Varaktighet"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -364,12 +385,12 @@ msgstr "Teoretiskt belopp"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Cancel Budget"
-msgstr ""
+msgstr "Avbryt budget"
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_cancel/i18n/sv.po b/addons/account_cancel/i18n/sv.po
index dd5efb025f8..12df7ac7d01 100644
--- a/addons/account_cancel/i18n/sv.po
+++ b/addons/account_cancel/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 12:42+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel Invoice"
-msgstr ""
+msgstr "Annullera faktura"
 
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
diff --git a/addons/account_check_writing/i18n/sv.po b/addons/account_check_writing/i18n/sv.po
index cba37bc7e40..8afe2438fd7 100644
--- a/addons/account_check_writing/i18n/sv.po
+++ b/addons/account_check_writing/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 21:12+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -112,7 +112,7 @@ msgstr ""
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
 msgid "Allow Check Writing"
-msgstr ""
+msgstr "Tillåt checkutgivning"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -124,7 +124,7 @@ msgstr "Betalning"
 #. module: account_check_writing
 #: field:account.journal,use_preprint_check:0
 msgid "Use Preprinted Check"
-msgstr ""
+msgstr "Använd förtryckta checker"
 
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 7398a3c4334..a32ede49919 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-25 15:54+0000\n"
+"PO-Revision-Date: 2014-04-05 21:40+0000\n"
 "Last-Translator: Ralf Hilgenstock \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-26 05:15+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -901,7 +901,7 @@ msgstr "Letzte Mahnung"
 #. module: account_followup
 #: view:account_followup.sending.results:0
 msgid "Download Letters"
-msgstr "Herunterladen Abschreiben"
+msgstr "Schreiben herunterladen"
 
 #. module: account_followup
 #: field:account_followup.print,company_id:0
@@ -986,7 +986,7 @@ msgstr "E-Mail senden"
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr "Punkte"
+msgstr "Kredit"
 
 #. module: account_followup
 #: field:res.partner,payment_amount_overdue:0
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index 10c22770c1b..957ecfad6d5 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-17 11:10+0000\n"
-"Last-Translator: Mirosław Bojanowicz \n"
+"PO-Revision-Date: 2014-04-18 13:10+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -258,7 +258,7 @@ msgstr "Kontrahent"
 #. module: account_followup
 #: field:account_followup.print,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "Treść email"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -427,7 +427,7 @@ msgstr ""
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Due Days"
-msgstr ""
+msgstr "Dni zwłoki"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -443,7 +443,7 @@ msgstr "Ostatni monit o płatność"
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup
 msgid "Reconcile Invoices & Payments"
-msgstr ""
+msgstr "Uzgadnianie Faktur i Płatności"
 
 #. module: account_followup
 #: model:ir.ui.menu,name:account_followup.account_followup_s
@@ -453,7 +453,7 @@ msgstr "Wykonaj manualnie monit o płatność"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Sp."
 
 #. module: account_followup
 #: field:account_followup.print,email_conf:0
@@ -528,6 +528,7 @@ msgstr "Monitowanie płatności"
 #, python-format
 msgid "Email not sent because of email address of partner not filled in"
 msgstr ""
+"Email nie został wysłany ponieważ adres email partnera nie został wypełniony"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -540,11 +541,13 @@ msgid ""
 "Optionally you can assign a user to this field, which will make him "
 "responsible for the action."
 msgstr ""
+"Opcjonalnie możesz przypisać użytkownika do tego pola, który stanie się "
+"odpowiedzialny za tę akcję."
 
 #. module: account_followup
 #: view:res.partner:0
 msgid "Partners with Overdue Credits"
-msgstr ""
+msgstr "Partnerzy z przeterminowanymi płatnościami"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_sending_results
@@ -562,7 +565,7 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:172
 #, python-format
 msgid " manual action(s) assigned:"
-msgstr ""
+msgstr " ręczna akcja przypisana do:"
 
 #. module: account_followup
 #: view:res.partner:0
@@ -589,13 +592,13 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "Account Move line"
-msgstr ""
+msgstr "Pozycja zapisu"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:237
 #, python-format
 msgid "Send Letters and Emails: Actions Summary"
-msgstr ""
+msgstr "Listy i Email: Podsumowanie akcji"
 
 #. module: account_followup
 #: view:account_followup.print:0
@@ -625,7 +628,7 @@ msgstr "Analiza monitów o płatność"
 #. module: account_followup
 #: view:res.partner:0
 msgid "Action to be taken e.g. Give a phonecall, Check if it's paid, ..."
-msgstr ""
+msgstr "Akcja do podjęcia np. zadzwoń, sprawdź czy zapłacono, ..."
 
 #. module: account_followup
 #: help:res.partner,payment_next_action_date:0
@@ -828,7 +831,7 @@ msgstr "Kwota przeterminowana"
 #: code:addons/account_followup/account_followup.py:263
 #, python-format
 msgid "Lit."
-msgstr ""
+msgstr "Sp."
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -968,7 +971,7 @@ msgstr "Maksymalny poziom monitu"
 #: code:addons/account_followup/wizard/account_followup_print.py:171
 #, python-format
 msgid " had unknown email address(es)"
-msgstr ""
+msgstr " posiada nieznany adres email"
 
 #. module: account_followup
 #: help:account_followup.print,test_print:0
@@ -1003,7 +1006,7 @@ msgstr "Działanie monitowania płatności"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Załącz pozycje dziennika oznaczone jako sporne"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -1051,7 +1054,7 @@ msgstr "Zapisy partnera"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "e.g. Call the customer, check if it's paid, ..."
-msgstr ""
+msgstr "np. Zadzwoń do klienta, sprawdż czy zapłacono, ..."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -1250,3 +1253,6 @@ msgstr ""
 #: field:res.partner,payment_note:0
 msgid "Customer Payment Promise"
 msgstr "Obietnica płatności klienta"
+
+#~ msgid "Responsible"
+#~ msgstr "Odpowiedzialny"
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index 288845f9481..b18e2e82aef 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-20 17:26+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-27 12:20+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -28,7 +28,7 @@ msgstr "${user.company_id.name}-betalningspåminnelse"
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id:0
 msgid "The maximum follow-up level"
-msgstr ""
+msgstr "Den högsta uppföljningsnivån"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -44,12 +44,12 @@ msgstr "Uppföljning"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
 
 #. module: account_followup
 #: field:res.partner,payment_next_action_date:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Datum för nästa åtgärd"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -60,12 +60,12 @@ msgstr "Manuell åtgärd"
 #. module: account_followup
 #: field:account_followup.sending.results,needprinting:0
 msgid "Needs Printing"
-msgstr ""
+msgstr "Behöver skrivas ut"
 
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_note:0
 msgid "Action To Do"
-msgstr ""
+msgstr "Åtgärd att utföra"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -106,7 +106,7 @@ msgstr "Uppföljningssteg"
 #: code:addons/account_followup/account_followup.py:261
 #, python-format
 msgid "Due Date"
-msgstr ""
+msgstr "Förfallodatum"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -119,7 +119,7 @@ msgstr "Skicka uppföljningar"
 #: code:addons/account_followup/report/account_followup_print.py:86
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -138,7 +138,7 @@ msgstr ""
 #. module: account_followup
 #: view:res.partner:0
 msgid "No Responsible"
-msgstr ""
+msgstr "Inte ansvarig"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -205,7 +205,7 @@ msgstr ""
 #: code:addons/account_followup/account_followup.py:260
 #, python-format
 msgid "Reference"
-msgstr ""
+msgstr "Referens"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -230,7 +230,7 @@ msgstr ": Partnernamn"
 #. module: account_followup
 #: field:account_followup.followup.line,manual_action_responsible_id:0
 msgid "Assign a Responsible"
-msgstr ""
+msgstr "Anslut en ansvarig"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index 79ec3aa35f2..03864ac637d 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-25 16:16+0000\n"
-"Last-Translator: Ralf Hilgenstock \n"
+"PO-Revision-Date: 2014-04-21 16:47+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-26 05:15+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -87,13 +87,13 @@ msgstr "Rechnungswesen / Zahlungen"
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr "Frei"
+msgstr "Kostenlos"
 
 #. module: account_payment
 #: view:payment.order.create:0
 #: field:payment.order.create,entries:0
 msgid "Entries"
-msgstr "Buchungen nach Journal"
+msgstr "Buchungen"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -149,7 +149,7 @@ msgstr "Gesamt (in eigener Währung)"
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr "Abgebrochen"
+msgstr "Storniert"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
@@ -295,7 +295,7 @@ msgstr "Konto Zahlungsempfänger"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr "Zahlungsaufträge suchen"
+msgstr "Zahlungsanweisungen durchsuchen"
 
 #. module: account_payment
 #: field:payment.line,create_date:0
@@ -305,7 +305,7 @@ msgstr "Erzeugt"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr "Wähle Rechnungen"
+msgstr "Rechnungen zur Zahlung wählen"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -320,7 +320,7 @@ msgstr "Zahlungsvorschlag verbuchen"
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr "Betreffzeile Empfänger"
+msgstr "Kommunikationsart"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
@@ -516,7 +516,7 @@ msgstr "Ihre Referenz"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Payment order"
-msgstr "Zahlungsvorschlag"
+msgstr "Zahlungsanweisung"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -563,7 +563,7 @@ msgstr "Information"
 #: model:ir.model,name:account_payment.model_payment_order
 #: view:payment.order:0
 msgid "Payment Order"
-msgstr "Zahlungsvorschlag"
+msgstr "Zahlungsanweisung"
 
 #. module: account_payment
 #: help:payment.line,amount:0
@@ -627,7 +627,7 @@ msgstr "Zahlungsverkehr"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr "Zahlungsvorschlag"
+msgstr "Zahlungsanweisung / Zahlung"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 274f41ea092..083779d3e7b 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-16 13:58+0000\n"
-"Last-Translator: Stefan Rijnhart (Therp) \n"
+"PO-Revision-Date: 2014-04-18 08:49+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n"
 "Language-Team: Dutch \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -122,7 +122,7 @@ msgid ""
 "You cannot cancel an invoice which has already been imported in a payment "
 "order. Remove it from the following payment order : %s."
 msgstr ""
-"Het si niet mogelijk een factuur te annuleren, welke al is geïmporteerd in "
+"Het is niet mogelijk een factuur te annuleren, welke al is geïmporteerd in "
 "een betaalopdracht. Verwijder de factuur van de volgende betaalopdracht: %s"
 
 #. module: account_payment
@@ -483,7 +483,7 @@ msgstr "Betaling vullen"
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
-msgstr "Te betalen bedrag"
+msgstr "Bedrag te betalen"
 
 #. module: account_payment
 #: field:payment.line,amount:0
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index e59b2e56d25..6679c80caef 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-20 18:05+0000\n"
-"Last-Translator: Mirosław Bojanowicz \n"
+"PO-Revision-Date: 2014-04-12 14:49+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -681,7 +681,7 @@ msgstr "Suma"
 #: code:addons/account_payment/wizard/account_payment_order.py:112
 #, python-format
 msgid "Entry Lines"
-msgstr "Wiersze wpisów"
+msgstr "Pozycje zapisu"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index e7254eae119..b983cb3165c 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-01 06:36+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -29,6 +29,14 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att skapa en betalningsorder.\n"
+"               \n"
+"                 En betalningsorder är en begäran om utbetalning från ditt "
+"företag att betala en\n"
+"                 leverantörsfaktura eller en kundåterbetalning.\n"
+"               \n"
+"            "
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -115,13 +123,15 @@ msgid ""
 "You cannot cancel an invoice which has already been imported in a payment "
 "order. Remove it from the following payment order : %s."
 msgstr ""
+"Du kan inte avbryta en faktura som redan har importerats i en "
+"betalningsorder. Ta bort den från följande betalningsorder: %s."
 
 #. module: account_payment
 #: code:addons/account_payment/account_invoice.py:43
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -186,6 +196,9 @@ msgid ""
 " Once the bank is confirmed the status is set to 'Confirmed'.\n"
 " Then the order is paid the status is 'Done'."
 msgstr ""
+"När en beställning görs statusen är \"Utkast\".\n"
+"  När banken bekräftas status är satt till \"Bekräftad\".\n"
+"  Då ordern är betald sätts status till \"Klar\"."
 
 #. module: account_payment
 #: view:payment.order:0
@@ -211,7 +224,7 @@ msgstr "OCR"
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import Payment Lines"
-msgstr ""
+msgstr "Importera betalningsrader"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -253,7 +266,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Registeringsdatum"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
@@ -360,7 +373,7 @@ msgstr "Kontoutdrag hämta"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "Det finns inget företag definierat på verifikatraden."
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -392,7 +405,7 @@ msgstr "Preliminär"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -439,7 +452,7 @@ msgstr "Sök"
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarig"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -454,7 +467,7 @@ msgstr "Total:"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution Date"
-msgstr ""
+msgstr "Genomförandedatum"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -571,7 +584,7 @@ msgstr "Meddelande Rad 2"
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planerat datum"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -657,7 +670,7 @@ msgstr "Order"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Cancel Payments"
-msgstr ""
+msgstr "Avbryt betalning"
 
 #. module: account_payment
 #: field:payment.order,total:0
@@ -668,7 +681,7 @@ msgstr "Total"
 #: code:addons/account_payment/wizard/account_payment_order.py:112
 #, python-format
 msgid "Entry Lines"
-msgstr ""
+msgstr "Verifikatrader"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -679,19 +692,19 @@ msgstr "Skapa betalning"
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
 msgid "The amount which should be paid at the current date. "
-msgstr ""
+msgstr "Belopp att erlägga vid angivet datum. "
 
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred Date"
-msgstr ""
+msgstr "Föredraget datum"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: view:account.payment.populate.statement:0
 #: view:payment.order.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
diff --git a/addons/account_report_company/account_report_company.py b/addons/account_report_company/account_report_company.py
index 6247ca26806..6915657ba84 100644
--- a/addons/account_report_company/account_report_company.py
+++ b/addons/account_report_company/account_report_company.py
@@ -40,7 +40,7 @@ class res_partner(osv.Model):
 
     _columns = {
         # extra field to allow ORDER BY to match visible names
-        'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
+        'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers, select=1),
     }
 
 class account_invoice(osv.Model):
diff --git a/addons/account_report_company/i18n/sv.po b/addons/account_report_company/i18n/sv.po
new file mode 100644
index 00000000000..fab9602a1b4
--- /dev/null
+++ b/addons/account_report_company/i18n/sv.po
@@ -0,0 +1,64 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-03-31 16:28+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: account_report_company
+#: field:res.partner,display_name:0
+msgid "Name"
+msgstr "Namn"
+
+#. module: account_report_company
+#: field:account.invoice,commercial_partner_id:0
+#: help:account.invoice.report,commercial_partner_id:0
+msgid "Commercial Entity"
+msgstr "Kommersiell entitet"
+
+#. module: account_report_company
+#: field:account.invoice.report,commercial_partner_id:0
+msgid "Partner Company"
+msgstr "Närliggande bolag"
+
+#. module: account_report_company
+#: model:ir.model,name:account_report_company.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_report_company
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: model:ir.model,name:account_report_company.model_res_partner
+msgid "Partner"
+msgstr "Företag"
+
+#. module: account_report_company
+#: model:ir.model,name:account_report_company.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr "Fakturastatistik"
+
+#. module: account_report_company
+#: view:res.partner:0
+msgid "True"
+msgstr "Sant"
+
+#. module: account_report_company
+#: help:account.invoice,commercial_partner_id:0
+msgid ""
+"The commercial entity that will be used on Journal Entries for this invoice"
+msgstr ""
+"Den kommersiella entiteten som kommer användas för journalrader på denna "
+"faktura"
diff --git a/addons/account_test/i18n/sv.po b/addons/account_test/i18n/sv.po
new file mode 100644
index 00000000000..73e4768fdf4
--- /dev/null
+++ b/addons/account_test/i18n/sv.po
@@ -0,0 +1,266 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-03-31 21:13+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid ""
+"Code should always set a variable named `result` with the result of your "
+"test, that can be a list or\n"
+"a dictionary. If `result` is an empty list, it means that the test was "
+"succesful. Otherwise it will\n"
+"try to translate and print what is inside `result`.\n"
+"\n"
+"If the result of your test is a dictionary, you can set a variable named "
+"`column_order` to choose in\n"
+"what order you want to print `result`'s content.\n"
+"\n"
+"Should you need them, you can also use the following variables into your "
+"code:\n"
+"    * cr: cursor to the database\n"
+"    * uid: ID of the current user\n"
+"\n"
+"In any ways, the code must be legal python statements with correct "
+"indentation (if needed).\n"
+"\n"
+"Example: \n"
+"    sql = '''SELECT id, name, ref, date\n"
+"             FROM account_move_line \n"
+"             WHERE account_id IN (SELECT id FROM account_account WHERE type "
+"= 'view')\n"
+"          '''\n"
+"    cr.execute(sql)\n"
+"    result = cr.dictfetchall()"
+msgstr ""
+"Kod ska alltid ställa en variabel med namnet `resultat` med resultatet av "
+"ditt test, kan det vara en lista eller\n"
+"en ordbok. Om `resultat` är en tom lista, betyder det att testet var lyckat. "
+"Annars kommer\n"
+"försöka översätta och skriva ut vad som finns i `resultat`.\n"
+"\n"
+"Om resultatet av testet är en ordbok kan du ställa in en variabel med namnet "
+"`column_order` för att välja in\n"
+"vilken ordning du vill skriva ut `resultat` s innehåll.\n"
+"\n"
+"Om du behöver dem, kan du även använda följande variabler i koden:\n"
+"     * Cr: markören till databasen\n"
+"     * Uid: ID för den aktuella användaren\n"
+"\n"
+"På något sätt måste koden vara lagliga python uttalanden med rätt indrag (om "
+"det behövs).\n"
+"\n"
+"Exempel:\n"
+"     sql ='' 'SELECT id, namn, ref, datum\n"
+"              FRÅN account_move_line\n"
+"              VAR konto-IN (SELECT id FROM account_account WHERE typ = "
+"\"Visa\")\n"
+"           '' '\n"
+"     cr.execute (SQL)\n"
+"     resultat = cr.dictfetchall ()"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_02
+msgid "Test 2: Opening a fiscal year"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05
+msgid ""
+"Check that reconciled invoice for Sales/Purchases has reconciled entries for "
+"Payable and Receivable Accounts"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_03
+msgid ""
+"Check if movement lines are balanced and have the same date and period"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr "Testnamn"
+
+#. module: account_test
+#: report:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06
+msgid "Check that paid/reconciled invoices are not in 'Open' state"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05_2
+msgid ""
+"Check that reconciled account moves, that define Payable and Receivable "
+"accounts, are belonging to reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Tests"
+msgstr "Tester"
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Description"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06_1
+msgid "Check that there's no move for any account with « View » account type"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_08
+msgid "Test 9 : Accounts and partners on account moves"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,name:account_test.action_accounting_assert
+#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+#: model:ir.ui.menu,name:account_test.menu_action_license
+msgid "Accounting Tests"
+msgstr ""
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:74
+#, python-format
+msgid "The test was passed successfully"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6 : Invoices status"
+msgstr ""
+
+#. module: account_test
+#: model:ir.model,name:account_test.model_accounting_assert_test
+msgid "accounting.assert.test"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05
+msgid ""
+"Test 5.1 : Payable and Receivable accountant lines of reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,code_exec:0
+msgid "Python code"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_07
+msgid ""
+"Check on bank statement that the Closing Balance = Starting Balance + sum of "
+"statement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_07
+msgid "Test 8 : Closing balance on bank statements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_03
+msgid "Test 3: Movement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05_2
+msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Expression"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_02
+msgid ""
+"Check if the balance of the new opened fiscal year matches with last year's "
+"balance"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,help:account_test.action_accounting_assert
+msgid ""
+"
    \n"
+"                Click to create Accounting Test.\n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_08
+msgid "Check that general accounts and partners on account moves are active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06_1
+msgid "Test 7: « View  » account type"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code Help"
+msgstr ""
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index f58c640b11c..ce080d9e446 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -741,13 +741,17 @@ class account_voucher(osv.osv):
 
         total_credit = 0.0
         total_debit = 0.0
-        account_type = 'receivable'
+        account_type = None
+        if context.get('account_id'):
+            account_type = self.pool['account.account'].browse(cr, uid, context['account_id'], context=context).type
         if ttype == 'payment':
-            account_type = 'payable'
+            if not account_type:
+                account_type = 'payable'
             total_debit = price or 0.0
         else:
             total_credit = price or 0.0
-            account_type = 'receivable'
+            if not account_type:
+                account_type = 'receivable'
 
         if not context.get('move_line_ids', False):
             ids = move_line_pool.search(cr, uid, [('state','=','valid'), ('account_id.type', '=', account_type), ('reconcile_id', '=', False), ('partner_id', '=', partner_id)], context=context)
@@ -788,6 +792,7 @@ class account_voucher(osv.osv):
                 total_credit += line.credit and line.amount_currency or 0.0
                 total_debit += line.debit and line.amount_currency or 0.0
 
+        remaining_amount = price
         #voucher line creation
         for line in account_move_lines:
 
@@ -808,13 +813,13 @@ class account_voucher(osv.osv):
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
                 'amount_original': amount_original,
-                'amount': (line.id in move_lines_found) and min(abs(price), amount_unreconciled) or 0.0,
+                'amount': (line.id in move_lines_found) and min(abs(remaining_amount), amount_unreconciled) or 0.0,
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled': amount_unreconciled,
                 'currency_id': line_currency_id,
             }
-            price -= rs['amount']
+            remaining_amount -= rs['amount']
             #in case a corresponding move_line hasn't been found, we now try to assign the voucher amount
             #on existing invoices: we split voucher amount by most old first, but only for lines in the same currency
             if not move_lines_found:
@@ -836,9 +841,9 @@ class account_voucher(osv.osv):
             else:
                 default['value']['line_dr_ids'].append(rs)
 
-            if ttype == 'payment' and len(default['value']['line_cr_ids']) > 0:
+            if len(default['value']['line_cr_ids']) > 0:
                 default['value']['pre_line'] = 1
-            elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0:
+            elif 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, ttype)
         return default
@@ -947,19 +952,17 @@ class account_voucher(osv.osv):
     def cancel_voucher(self, cr, uid, ids, context=None):
         reconcile_pool = self.pool.get('account.move.reconcile')
         move_pool = self.pool.get('account.move')
-
+        move_line_pool = self.pool.get('account.move.line')
         for voucher in self.browse(cr, uid, ids, context=context):
             # refresh to make sure you don't unlink an already removed move
             voucher.refresh()
-            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]
-
-            reconcile_pool.unlink(cr, uid, recs)
-
+                    move_lines = [move_line.id for move_line in line.reconcile_id.line_id]
+                    move_lines.remove(line.id)
+                    reconcile_pool.unlink(cr, uid, [line.reconcile_id.id])
+                    if len(move_lines) >= 2:
+                        move_line_pool.reconcile_partial(cr, uid, move_lines, 'auto',context=context)
             if voucher.move_id:
                 move_pool.button_cancel(cr, uid, [voucher.move_id.id])
                 move_pool.unlink(cr, uid, [voucher.move_id.id])
@@ -1679,7 +1682,7 @@ class account_bank_statement_line(osv.osv):
     def _check_amount(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.voucher_id:
-                diff = abs(obj.amount) - obj.voucher_id.amount
+                diff = abs(obj.amount) - abs(obj.voucher_id.amount)
                 if not self.pool.get('res.currency').is_zero(cr, uid, obj.statement_id.currency, diff):
                     return False
         return True
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 41d3c6fc1f6..b7ea4b8fc71 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -213,10 +213,10 @@
             
             
                 
-                    
+                    
                 
                 
-                    
+                    
                 
                 
                     onchange_amount(amount)
@@ -230,7 +230,7 @@
             
             
                 
-                    
+                    
                 
             
         
@@ -241,7 +241,7 @@
             
             
                 
-                    
+                    
                 
             
         
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index a0450200c49..d95bc7ad97b 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-27 06:29+0000\n"
-"Last-Translator: Ralf Hilgenstock \n"
+"PO-Revision-Date: 2014-04-05 21:45+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 07:02+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -123,7 +123,9 @@ msgstr "Zuordnung"
 msgid ""
 "This sentence helps you to know how to specify the payment rate by giving "
 "you the direct effect it has"
-msgstr "Dieser Satz hilft dabei, die spezifische Payment Rate festzulegen."
+msgstr ""
+"Dieser Satz hilft dabei, die richtige Zahlweise auszuwählen, indem die "
+"Auswirkung direkt dargestellt wird."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 858cefd2703..3ae8d14aeb6 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-02 13:38+0000\n"
-"Last-Translator: hiro TAKADA \n"
+"PO-Revision-Date: 2014-04-21 13:29+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-03 05:55+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -615,7 +615,7 @@ msgstr ""
 #: field:account.config.settings,expense_currency_exchange_account_id:0
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "為替差損勘定"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1203,7 +1203,7 @@ msgstr "年"
 #: field:account.config.settings,income_currency_exchange_account_id:0
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Gain Exchange Rate Account"
-msgstr ""
+msgstr "為替差益勘定"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 6c6c258875c..fa570835485 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-20 18:05+0000\n"
-"Last-Translator: Mirosław Bojanowicz \n"
+"PO-Revision-Date: 2014-04-12 10:11+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -161,7 +161,7 @@ msgstr "Zatwierdź"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr "Płatności od dostawców"
+msgstr "Płatności dla dostawców"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index 01abe4323ba..730e4771df4 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-29 14:57+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-30 06:15+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Avstämning"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:417
@@ -66,7 +66,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "(Uppdatera)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -93,7 +93,7 @@ msgstr "mars"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -103,7 +103,7 @@ msgstr "Betala faktura"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "Är du säker på att du vill avbryta detta kvitto?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -131,7 +131,7 @@ msgstr ""
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -173,6 +173,13 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att registrera ett inköpskvitto.\n"
+"               
    \n"
+"                 När inköpskvitto bekräftas, kan du registrera\n"
+"                 leverantörsbetalning i samband med detta kvitto.\n"
+"               
    \n"
+"            "
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -222,7 +229,7 @@ msgstr "Anteckningar"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
@@ -240,7 +247,7 @@ msgstr "Journalpost"
 #: code:addons/account_voucher/account_voucher.py:1073
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -255,7 +262,7 @@ msgstr "Betalningsalternativ"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. 003/10"
-msgstr ""
+msgstr "e.g. 003/10"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -291,7 +298,7 @@ msgstr ""
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -314,7 +321,7 @@ msgstr "Skatt"
 #: code:addons/account_voucher/account_voucher.py:971
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ogiltig åtgärd"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
@@ -332,6 +339,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -346,7 +355,7 @@ msgstr "Betalningsinformation"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(uppdatering)"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -364,7 +373,7 @@ msgstr "Importera fakturor"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "e.g. Invoice SAJ/0042"
-msgstr ""
+msgstr "e.g. Invoice SAJ/0042"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1208
@@ -425,7 +434,7 @@ msgstr "Leverantörsverifikat"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index b71e42add0b..cdef3cf6c9d 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -40,6 +40,8 @@
     import netsvc
     vals = {}
     journal_id = self.default_get(cr, uid, ['journal_id']).get('journal_id',None)
+    voucher = self.recompute_voucher_lines(cr, uid, [], ref("base.res_partner_19"), journal_id, 450.0, ref('base.EUR'), 'receipt', False)
+    assert (voucher['value'].get('writeoff_amount') == 0.0), "Writeoff amount calculated by recompute_voucher_lines() is not 0.0"
     res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), journal_id, 0.0, 1, ttype='receipt', date=False)
     vals = {
         'account_id': ref('account.cash'),
@@ -60,6 +62,7 @@
     vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
     id = self.create(cr, uid, vals)
     voucher_id = self.browse(cr, uid, id)
+    assert (voucher_id.writeoff_amount == 0.0), "Writeoff amount is not 0.0"
     assert (voucher_id.state=='draft'), "Voucher is not in draft state"
     wf_service = netsvc.LocalService("workflow")
     wf_service.trg_validate(uid, 'account.voucher', voucher_id.id, 'proforma_voucher', cr)
diff --git a/addons/analytic/i18n/sv.po b/addons/analytic/i18n/sv.po
index 1a447d5f88d..d3c2880740b 100644
--- a/addons/analytic/i18n/sv.po
+++ b/addons/analytic/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-01 06:23+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -25,18 +25,18 @@ msgstr "Underliggande konton"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:229
 #, python-format
 msgid "Contract: "
-msgstr ""
+msgstr "Avtal: "
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_pending
 msgid "Contract pending"
-msgstr ""
+msgstr "Vilande avtal"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -47,7 +47,7 @@ msgstr "Mall"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,date:0
 msgid "End Date"
-msgstr ""
+msgstr "Slutdatum"
 
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
@@ -72,16 +72,24 @@ msgid ""
 "the\n"
 "                                        customer."
 msgstr ""
+"När slutdatum för avtalet passerats \n"
+"                                         eller det maximala antalet "
+"tjänsteenheter \n"
+"                                         enheter (t.ex. supportavtal) "
+"förbrukats, aviseras kundansvarig \n"
+"                                         via e-post för att förnya "
+"kontraktet med\n"
+"                                         kunden."
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Contract or Project"
-msgstr ""
+msgstr "Avtal eller projekt"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account/Contract Name"
-msgstr ""
+msgstr "Konto/avtalsnamn"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -91,7 +99,7 @@ msgstr "Ekonomichef"
 #. module: analytic
 #: field:account.analytic.account,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -101,7 +109,7 @@ msgstr "Stängd"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_pending
 msgid "Contract to Renew"
-msgstr ""
+msgstr "Avtal att förnya"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -111,18 +119,18 @@ msgstr "Ny"
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Projektledare"
 
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:271
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
@@ -139,17 +147,17 @@ msgstr "Beskrivning"
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Quick account creation disallowed."
-msgstr ""
+msgstr "Snabbskapande av konto icke tillåtet"
 
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva objektkonton."
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
@@ -160,7 +168,7 @@ msgstr "Företag"
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Renewal"
-msgstr ""
+msgstr "Förnya"
 
 #. module: analytic
 #: help:account.analytic.account,message_summary:0
@@ -168,11 +176,13 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: analytic
 #: help:account.analytic.account,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -180,6 +190,8 @@ msgid ""
 "Sets the higher limit of time to work on the contract, based on the "
 "timesheet. (for instance, number of hours in a limited support contract.)"
 msgstr ""
+"Anger den högre gränsen för arbetstid på avtalet,  baserat på tidrapporten. "
+"(till exempel antal timmar i ett supportavtal med timbank.)"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:160
@@ -201,7 +213,7 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
@@ -221,12 +233,12 @@ msgstr "Datum"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_closed
 msgid "Contract Finished"
-msgstr ""
+msgstr "Avtal avslutat"
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: analytic
 #: help:account.analytic.line,amount:0
@@ -240,7 +252,7 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Kund"
 
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
@@ -250,38 +262,38 @@ msgstr "Kontohieraki"
 #. module: analytic
 #: field:account.analytic.account,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: analytic
 #: help:account.analytic.account,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan inte skapa objektrader för ett rubrikkonto."
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Contract Information"
-msgstr ""
+msgstr "Avtalsinformation"
 
 #. module: analytic
 #: field:account.analytic.account,template_id:0
 #: selection:account.analytic.account,type:0
 msgid "Template of Contract"
-msgstr ""
+msgstr "Avtalsmall"
 
 #. module: analytic
 #: field:account.analytic.account,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Prepaid Service Units"
-msgstr ""
+msgstr "Förbetald tjänsteenhet"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -291,7 +303,7 @@ msgstr "Kredit"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_opened
 msgid "Contract Opened"
-msgstr ""
+msgstr "Avtal öppnat"
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -305,6 +317,14 @@ msgid ""
 "The special type 'Template of Contract' allows you to define a template with "
 "default data that you can reuse easily."
 msgstr ""
+"Om du väljer visa-Typ, betyder det att du inte kommer att kunna göra "
+"verifikat med det kontot.\n"
+"Typen \"objektkonto\" står för vanliga konton som du bara vill använda i "
+"redovisningen.\n"
+"Om du väljer avtal eller projekt, ger det dig möjlighet att hantera "
+"giltigheten och faktureringsalternativ för detta konto.\n"
+"Den speciella typen \"Avtalsmall\" kan du definiera en mall med "
+"standarduppgifter som är enkla att återanvända."
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -314,7 +334,7 @@ msgstr "Avbruten"
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Analytic View"
-msgstr ""
+msgstr "Objektvisning"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -324,12 +344,12 @@ msgstr "Balans"
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "Fullständigt namn"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "To Renew"
-msgstr ""
+msgstr "Att förnya"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -340,18 +360,18 @@ msgstr "Antal"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Referens"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_closed
 msgid "Contract closed"
-msgstr ""
+msgstr "Avtal stängt"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
@@ -379,23 +399,23 @@ msgstr "Valuta"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_opened
 msgid "Contract opened"
-msgstr ""
+msgstr "Avtal öppnat"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Type of Account"
-msgstr ""
+msgstr "Typ av konto"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 7e7ac23f821..7e856e9eabf 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-30 03:47+0000\n"
+"Last-Translator: jeffery chen fan \n"
 "Language-Team: Chinese (Simplified) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -31,12 +31,12 @@ msgstr "进行中"
 #: code:addons/analytic/analytic.py:229
 #, python-format
 msgid "Contract: "
-msgstr ""
+msgstr "合约： "
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_pending
 msgid "Contract pending"
-msgstr ""
+msgstr "合同待定中"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -76,12 +76,12 @@ msgstr ""
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Contract or Project"
-msgstr ""
+msgstr "合同或者项目"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account/Contract Name"
-msgstr ""
+msgstr "客户/合约的名称"
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -101,7 +101,7 @@ msgstr "已关闭"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_pending
 msgid "Contract to Renew"
-msgstr ""
+msgstr "需续签的合约"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -139,7 +139,7 @@ msgstr "描述"
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Quick account creation disallowed."
-msgstr ""
+msgstr "不允许快速客户创建"
 
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
@@ -160,19 +160,19 @@ msgstr "公司"
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Renewal"
-msgstr ""
+msgstr "续约"
 
 #. module: analytic
 #: help:account.analytic.account,message_summary:0
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存聊天摘要（消息数，...）。本摘要是直接使用HTML格式，以便插入到看板视图。"
 
 #. module: analytic
 #: help:account.analytic.account,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -218,12 +218,12 @@ msgstr "日期"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_closed
 msgid "Contract Finished"
-msgstr ""
+msgstr "完成的合约"
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "条款和条件"
 
 #. module: analytic
 #: help:account.analytic.line,amount:0
@@ -235,7 +235,7 @@ msgstr "计算公式是数量乘以产品成本价。币别是公司本位币。
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "客户"
 
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
@@ -245,38 +245,38 @@ msgstr "树"
 #. module: analytic
 #: field:account.analytic.account,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: analytic
 #: help:account.analytic.account,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史记录"
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能在视图类型的科目上创建解析行"
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Contract Information"
-msgstr ""
+msgstr "合约信息"
 
 #. module: analytic
 #: field:account.analytic.account,template_id:0
 #: selection:account.analytic.account,type:0
 msgid "Template of Contract"
-msgstr ""
+msgstr "合约模板"
 
 #. module: analytic
 #: field:account.analytic.account,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Prepaid Service Units"
-msgstr ""
+msgstr "预付的服务单元"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -286,7 +286,7 @@ msgstr "贷方"
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_opened
 msgid "Contract Opened"
-msgstr ""
+msgstr "进行中的合约"
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -309,7 +309,7 @@ msgstr "已取消"
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Analytic View"
-msgstr ""
+msgstr "解析视图"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -319,12 +319,12 @@ msgstr "差额"
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Name"
-msgstr ""
+msgstr "完整姓名"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "To Renew"
-msgstr ""
+msgstr "要续签的"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -335,23 +335,23 @@ msgstr "数量"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Reference"
-msgstr ""
+msgstr "参考"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:160
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_closed
 msgid "Contract closed"
-msgstr ""
+msgstr "关闭的合约"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "成本会计"
+msgstr "辅助核算"
 
 #. module: analytic
 #: field:account.analytic.line,amount:0
@@ -374,23 +374,23 @@ msgstr "货币"
 #. module: analytic
 #: model:mail.message.subtype,description:analytic.mt_account_opened
 msgid "Contract opened"
-msgstr ""
+msgstr "合约已开启"
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:262
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Type of Account"
-msgstr ""
+msgstr "科目的类型"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
diff --git a/addons/analytic_contract_hr_expense/i18n/de.po b/addons/analytic_contract_hr_expense/i18n/de.po
index f53eca6e932..b16dee1b812 100644
--- a/addons/analytic_contract_hr_expense/i18n/de.po
+++ b/addons/analytic_contract_hr_expense/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-26 16:25+0000\n"
+"PO-Revision-Date: 2014-04-05 21:49+0000\n"
 "Last-Translator: Ralf Hilgenstock \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-27 05:45+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -63,7 +63,7 @@ msgstr "Spesen Abrechnung zu %s"
 #: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:136
 #, python-format
 msgid "Expenses of %s"
-msgstr "Spesen zu %s"
+msgstr "Spesen von %s"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
diff --git a/addons/analytic_contract_hr_expense/i18n/sv.po b/addons/analytic_contract_hr_expense/i18n/sv.po
new file mode 100644
index 00000000000..cb81ff2961a
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/sv.po
@@ -0,0 +1,95 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-03-31 21:26+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "eller visa"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid ""
+"{'required': "
+"['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
+msgstr ""
+"{'required': "
+"['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Inget att fakturera, skapa"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "okänd"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "utlägg"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Objektkonto"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:144
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Utlägg att fakturera av %s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:136
+#, python-format
+msgid "Expenses of %s"
+msgstr "Utlägg av %s"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Expenses and Timesheet Invoicing Ratio"
+msgstr "Andel utlägg och tidrapport på faktura"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid ""
+"{'invisible': "
+"[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
+msgstr ""
+"{'invisible': "
+"[('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Uppskattning av utlägg att fakturera"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Debitera utläggen"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Faktura"
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 2671fc92581..5a17ac91e53 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -26,6 +26,7 @@ import openerp.addons.decimal_precision as dp
 class analytic_user_funct_grid(osv.osv):
     _name="analytic.user.funct.grid"
     _description= "Price per User"
+    _rec_name="user_id"
     _columns={
         'user_id': fields.many2one("res.users", "User", required=True,),
         'product_id': fields.many2one("product.product", "Service", required=True,),
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index e0c6936c940..a91348289fd 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-04 17:23+0000\n"
+"Last-Translator: Davor Bojkić \n"
 "Language-Team: Croatian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Stavka analitike"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Usluga"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -40,30 +40,30 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "Cijena po satu za ovog korisnika"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Analitički Konto"
+msgstr "Konto analitike"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:106
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Greška!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Podaci računa"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Jedinica mjere"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -95,7 +95,7 @@ msgstr "nije definiran konto troška za ovaj proizvod: \"%s\" (id:%d)"
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Stavka evidencije rada"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 3f7b0b01bc0..77936f98e6c 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:35+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Objektrad"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -30,7 +30,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Tjänst"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -40,7 +40,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Pris"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
@@ -58,12 +58,12 @@ msgstr "Objektkonto"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Fakturainformation"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index 907f5e7635f..3c397844331 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-30 12:29+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -62,7 +62,7 @@ msgstr ""
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -216,7 +216,7 @@ msgstr ""
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "Granska"
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
@@ -388,7 +388,7 @@ msgstr "Loggrad"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
diff --git a/addons/auth_ldap/i18n/sv.po b/addons/auth_ldap/i18n/sv.po
index c086ccc8774..9bd5d5c7454 100644
--- a/addons/auth_ldap/i18n/sv.po
+++ b/addons/auth_ldap/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 12:32+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
 msgid "Template User"
-msgstr ""
+msgstr "Mallanvändare"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -29,6 +29,9 @@ msgid ""
 "option requires a server with STARTTLS enabled, otherwise all authentication "
 "attempts will fail."
 msgstr ""
+"Begär säker TLS / SSL-kryptering vid anslutning till LDAP-servern. Det här "
+"alternativet kräver en server med STARTTLS aktiverad, annars kommer alla "
+"autentiseringsförsök att misslyckas."
 
 #. module: auth_ldap
 #: view:res.company:0
@@ -146,7 +149,7 @@ msgstr ""
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_filter:0
diff --git a/addons/auth_oauth/i18n/sv.po b/addons/auth_oauth/i18n/sv.po
index f4b73d21a74..c5040692bbe 100644
--- a/addons/auth_oauth/i18n/sv.po
+++ b/addons/auth_oauth/i18n/sv.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-19 00:21+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-30 12:20+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:01+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-31 06:39+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,validation_endpoint:0
 msgid "Validation URL"
-msgstr ""
+msgstr "Gransknings-URL"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,auth_endpoint:0
 msgid "Authentication URL"
-msgstr ""
+msgstr "URL för idkontroll"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_base_config_settings
@@ -40,7 +40,7 @@ msgstr "Leverantörsnamn"
 #. module: auth_oauth
 #: field:auth.oauth.provider,scope:0
 msgid "Scope"
-msgstr ""
+msgstr "Spelrum"
 
 #. module: auth_oauth
 #: field:res.users,oauth_provider_id:0
@@ -55,7 +55,7 @@ msgstr "CSS-klass"
 #. module: auth_oauth
 #: field:auth.oauth.provider,body:0
 msgid "Body"
-msgstr ""
+msgstr "Brödtext"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_users
@@ -70,7 +70,7 @@ msgstr "okänd"
 #. module: auth_oauth
 #: field:res.users,oauth_access_token:0
 msgid "OAuth Access Token"
-msgstr ""
+msgstr "OAuth åtkomstpollett"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,client_id:0
@@ -102,12 +102,12 @@ msgstr "Tillåt användare att logga in med hjälp av Facebook"
 #. module: auth_oauth
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID måste vara unikt per utgivare"
 
 #. module: auth_oauth
 #: help:res.users,oauth_uid:0
 msgid "Oauth Provider user_id"
-msgstr ""
+msgstr "Oauth utgivare-user_id"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,data_endpoint:0
@@ -117,7 +117,7 @@ msgstr "Data-URL"
 #. module: auth_oauth
 #: view:auth.oauth.provider:0
 msgid "arch"
-msgstr ""
+msgstr "Arkitektur"
 
 #. module: auth_oauth
 #: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
@@ -127,9 +127,9 @@ msgstr "Leverantörer"
 #. module: auth_oauth
 #: field:base.config.settings,auth_oauth_google_enabled:0
 msgid "Allow users to sign in with Google"
-msgstr ""
+msgstr "Tillåt användare logga in med Google"
 
 #. module: auth_oauth
 #: field:auth.oauth.provider,enabled:0
 msgid "Allowed"
-msgstr ""
+msgstr "Tillåten"
diff --git a/addons/auth_signup/i18n/ja.po b/addons/auth_signup/i18n/ja.po
new file mode 100644
index 00000000000..fdf7fa20969
--- /dev/null
+++ b/addons/auth_signup/i18n/ja.po
@@ -0,0 +1,320 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-04-21 11:33+0000\n"
+"Last-Translator: Yoshi Tashiro \n"
+"Language-Team: Japanese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-22 08:24+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"A password reset has been requested for this user. An email containing the "
+"following link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Confirm Password"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an invitation email"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Activated"
+msgstr "有効"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:266
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
+#, python-format
+msgid "Reset password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send reset password link by email"
+msgstr "パスワードリセットのリンクをEメール送信"
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"
    A password reset was requested for the OpenERP account linked to this "
+"email.
    \n"
+"\n"
+"
    You may change your password by following this link.
    \n"
+"\n"
+"
    Note: If you do not expect this, you can safely ignore this email.
    "
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"An invitation email containing the following subscription link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Never Connected"
+msgstr "接続履歴なし"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.set_password_email
+msgid ""
+"\n"
+"                \n"
+"                    
    \n"
+"                        ${object.name},\n"
+"                    
    \n"
+"                    
    \n"
+"                        You have been invited to connect to "
+"\"${object.company_id.name}\" in order to get access to your documents in "
+"OpenERP.\n"
+"                    
    \n"
+"                    
    \n"
+"                        To accept the invitation, click on the following "
+"link:\n"
+"                    
    \n"
+"                    \n"
+"                    
    \n"
+"                        Thanks,\n"
+"                    
    \n"
+"                    
    \n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"                    
    \n"
+"                \n"
+"            "
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:270
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:177
+#, python-format
+msgid "An email has been sent with credentials to reset your password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.set_password_email
+msgid "${object.company_id.name} invitation to connect on OpenERP"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
+#, python-format
+msgid "Sign Up"
+msgstr ""
diff --git a/addons/auth_signup/i18n/sv.po b/addons/auth_signup/i18n/sv.po
new file mode 100644
index 00000000000..0ed094c5fc1
--- /dev/null
+++ b/addons/auth_signup/i18n/sv.po
@@ -0,0 +1,320 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-03-27 12:30+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"A password reset has been requested for this user. An email containing the "
+"following link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Confirm Password"
+msgstr "Bekräfta lösenord"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an invitation email"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Activated"
+msgstr "Aktiverad"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:266
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:31
+#, python-format
+msgid "Reset password"
+msgstr "Återställ lösenord"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send reset password link by email"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"
    A password reset was requested for the OpenERP account linked to this "
+"email.
    \n"
+"\n"
+"
    You may change your password by following this link.
    \n"
+"\n"
+"
    Note: If you do not expect this, you can safely ignore this email.
    "
+msgstr ""
+
+#. module: auth_signup
+#: view:res.users:0
+msgid ""
+"An invitation email containing the following subscription link has been sent:"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Never Connected"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.set_password_email
+msgid ""
+"\n"
+"                \n"
+"                    
    \n"
+"                        ${object.name},\n"
+"                    
    \n"
+"                    
    \n"
+"                        You have been invited to connect to "
+"\"${object.company_id.name}\" in order to get access to your documents in "
+"OpenERP.\n"
+"                    
    \n"
+"                    
    \n"
+"                        To accept the invitation, click on the following "
+"link:\n"
+"                    
    \n"
+"                    \n"
+"                    
    \n"
+"                        Thanks,\n"
+"                    
    \n"
+"                    
    \n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+"                    
    \n"
+"                \n"
+"            "
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:270
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:177
+#, python-format
+msgid "An email has been sent with credentials to reset your password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#: code:addons/auth_signup/static/src/js/auth_signup.js:173
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:97
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.set_password_email
+msgid "${object.company_id.name} invitation to connect on OpenERP"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:30
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:29
+#, python-format
+msgid "Sign Up"
+msgstr ""
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 31b1cff4192..2a618a249c3 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-17 02:37+0000\n"
-"Last-Translator: jackjc \n"
+"PO-Revision-Date: 2014-04-16 05:21+0000\n"
+"Last-Translator: 盈通 ccdos \n"
 "Language-Team: Chinese (Simplified) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-18 05:40+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-17 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -32,14 +32,14 @@ msgstr "注册令牌（Token）类型"
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
-msgstr "允许外部用户登录"
+msgstr "允许外部用户注册"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
 #, python-format
 msgid "Confirm Password"
-msgstr "口令确认"
+msgstr "确认密码"
 
 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index 668f6a30f41..7303c4aa9cd 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-27 06:42+0000\n"
-"Last-Translator: Ralf Hilgenstock \n"
+"PO-Revision-Date: 2014-04-11 12:57+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-28 07:02+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-12 09:42+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
@@ -39,6 +39,9 @@ msgid ""
 "When should the condition be triggered. If present, will be checked by the "
 "scheduler. If empty, will be checked at creation and update."
 msgstr ""
+"Unter welcher Bedingung soll die Regel ausgelöst werden? Wenn eine Bedingung "
+"vorhanden, wird die Regel vom Scheduler ausgelöst, anderenfalls nur bei "
+"Anlage und bei Aktualisierung."
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index a3546bc3847..ffd016d3815 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:21+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:02+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Pågår"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Åtgärdsregler"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -60,12 +60,12 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,act_followers:0
 msgid "Add Followers"
-msgstr ""
+msgstr "Lägg till följare"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_user_id:0
 msgid "Set Responsible"
-msgstr ""
+msgstr "Ange ansvarig"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
@@ -78,22 +78,22 @@ msgstr ""
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
 msgid "base.action.rule.lead.test"
-msgstr ""
+msgstr "base.action.rule.lead.test"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Stängd"
 
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range:0
 msgid "Delay after trigger date"
-msgstr ""
+msgstr "Ledtid efter utlösningsdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -103,12 +103,12 @@ msgstr "Villkor"
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Väntar"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: base_action_rule
 #: field:base.action.rule,filter_pre_id:0
@@ -118,7 +118,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Action Rule"
-msgstr ""
+msgstr "Åtgärdsregel"
 
 #. module: base_action_rule
 #: help:base.action.rule,filter_id:0
@@ -213,17 +213,17 @@ msgstr "Dagar"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Timer"
-msgstr ""
+msgstr "Tidtagare"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_range_type:0
 msgid "Delay type"
-msgstr ""
+msgstr "Ledtidstyp"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Server actions to run"
-msgstr ""
+msgstr "Serveråtgärder att köra"
 
 #. module: base_action_rule
 #: help:base.action.rule,active:0
@@ -233,12 +233,12 @@ msgstr ""
 #. module: base_action_rule
 #: selection:base.action.rule.lead.test,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: base_action_rule
 #: field:base.action.rule,model:0
 msgid "Model"
-msgstr ""
+msgstr "Modell"
 
 #. module: base_action_rule
 #: field:base.action.rule,last_run:0
@@ -253,7 +253,7 @@ msgstr "Minuter"
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modell för relaterade dokument"
 
 #. module: base_action_rule
 #: help:base.action.rule,filter_pre_id:0
@@ -269,7 +269,7 @@ msgstr "Sekvens"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Actions"
-msgstr ""
+msgstr "Åtgärder"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
@@ -296,7 +296,7 @@ msgstr "Skapat datum"
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Senaste åtgärd"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,partner_id:0
@@ -306,15 +306,15 @@ msgstr "Företag"
 #. module: base_action_rule
 #: field:base.action.rule,trg_date_id:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Utlösningsdatum"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 #: field:base.action.rule,server_action_ids:0
 msgid "Server Actions"
-msgstr ""
+msgstr "Serveråtgärder"
 
 #. module: base_action_rule
 #: field:base.action.rule.lead.test,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Ämne"
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 44c598f5ef6..0f7ef0c45b0 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1015,15 +1015,20 @@ class calendar_event(osv.osv):
                 result[event] = ""
         return result
 
+    # hook method to fix the wrong signature
+    def _set_rulestring(self, cr, uid, ids, field_name, field_value, args, context=None):
+        return self._rrule_write(self, cr, uid, ids, field_name, field_value, args, context=context)
+
     def _rrule_write(self, obj, cr, uid, ids, field_name, field_value, args, context=None):
+        if not isinstance(ids, list):
+            ids = [ids]
         data = self._get_empty_rrule_data()
         if field_value:
             data['recurrency'] = True
             for event in self.browse(cr, uid, ids, context=context):
-                rdate = rule_date or event.date
-                update_data = self._parse_rrule(field_value, dict(data), rdate)
+                update_data = self._parse_rrule(field_value, dict(data), event.date)
                 data.update(update_data)
-                super(calendar_event, obj).write(cr, uid, ids, data, context=context)
+                super(calendar_event, self).write(cr, uid, ids, data, context=context)
         return True
 
     _columns = {
@@ -1051,7 +1056,7 @@ defines the list of date/time exceptions for a recurring calendar component."),
         'exrule': fields.char('Exception Rule', size=352, help="Defines a \
 rule or repeating pattern of time to exclude from the recurring rule."),
         'rrule': fields.function(_get_rulestring, type='char', size=124, \
-                    fnct_inv=_rrule_write, store=True, string='Recurrent Rule'),
+                    fnct_inv=_set_rulestring, store=True, string='Recurrent Rule'),
         'rrule_type': fields.selection([
             ('daily', 'Day(s)'),
             ('weekly', 'Week(s)'),
@@ -1320,7 +1325,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
 
         def get_end_date(data):
             if data.get('end_date'):
-                data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959Z'
+                data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959'
 
             return (data.get('end_type') == 'count' and (';COUNT=' + str(data.get('count'))) or '') +\
                              ((data.get('end_date_new') and data.get('end_type') == 'end_date' and (';UNTIL=' + data.get('end_date_new'))) or '')
@@ -1375,7 +1380,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         #repeat monthly by nweekday ((weekday, weeknumber), )
         if r._bynweekday:
             data['week_list'] = day_list[r._bynweekday[0][0]].upper()
-            data['byday'] = r._bynweekday[0][1]
+            data['byday'] = str(r._bynweekday[0][1])
             data['select1'] = 'day'
             data['rrule_type'] = 'monthly'
 
@@ -1502,7 +1507,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         # set end_date for calendar searching
         if vals.get('recurrency', True) and vals.get('end_type', 'count') in ('count', unicode('count')) and \
                 (vals.get('rrule_type') or vals.get('count') or vals.get('date') or vals.get('date_deadline')):
-            for data in self.read(cr, uid, ids, ['date', 'date_deadline', 'recurrency', 'rrule_type', 'count', 'end_type'], context=context):
+            for data in self.read(cr, uid, ids, ['end_date', 'date_deadline', 'recurrency', 'rrule_type', 'count', 'end_type'], context=context):
                 end_date = self._set_recurrency_end_date(data, context=context)
                 super(calendar_event, self).write(cr, uid, [data['id']], {'end_date': end_date}, context=context)
 
@@ -1625,21 +1630,23 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         return res
 
     def _set_recurrency_end_date(self, data, context=None):
+        if not data.get('recurrency'):
+            return False
+
+        end_type = data.get('end_type')
         end_date = data.get('end_date')
-        rel_date = False
-        if data.get('recurrency') and data.get('end_type') in ('count', unicode('count')):
-            data_date_deadline = datetime.strptime(data.get('date_deadline'), '%Y-%m-%d %H:%M:%S')
-            if data.get('rrule_type') in ('daily', unicode('count')):
-                rel_date = relativedelta(days=data.get('count')+1)
-            elif data.get('rrule_type') in ('weekly', unicode('weekly')):
-                rel_date = relativedelta(days=(data.get('count')+1)*7)
-            elif data.get('rrule_type') in ('monthly', unicode('monthly')):
-                rel_date = relativedelta(months=data.get('count')+1)
-            elif data.get('rrule_type') in ('yearly', unicode('yearly')):
-                rel_date = relativedelta(years=data.get('count')+1)
-            end_date = data_date_deadline
-            if rel_date:
-                end_date += rel_date
+
+        if end_type == 'count' and all(data.get(key) for key in ['count', 'rrule_type', 'date_deadline']):
+            count = data['count'] + 1
+            delay, mult = {
+                'daily': ('days', 1),
+                'weekly': ('days', 7),
+                'monthly': ('months', 1),
+                'yearly': ('years', 1),
+            }[data['rrule_type']]
+
+            deadline = datetime.strptime(data['date_deadline'], tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            return deadline + relativedelta(**{delay: count * mult})
         return end_date
 
     def create(self, cr, uid, vals, context=None):
@@ -1649,9 +1656,12 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
-        vals['end_date'] = self._set_recurrency_end_date(vals, context=context)
         res = super(calendar_event, self).create(cr, uid, vals, context)
 
+        data = self.read(cr, uid, [res], ['end_date', 'date_deadline', 'recurrency', 'rrule_type', 'count', 'end_type'], context=context)[0]
+        end_date = self._set_recurrency_end_date(data, context=context)
+        self.write(cr, uid, [res], {'end_date': end_date}, context=context)
+
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
         self.create_attendees(cr, uid, [res], context)
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index 72e8e7c6c0c..f6e1f26c5e7 100644
--- a/addons/base_calendar/i18n/sv.po
+++ b/addons/base_calendar/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-08 15:23+0000\n"
+"PO-Revision-Date: 2014-03-27 15:19+0000\n"
 "Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:02+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -354,6 +354,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:399
@@ -524,7 +526,7 @@ msgstr "Evenemangsalarminformation"
 #: code:addons/base_calendar/base_calendar.py:1017
 #, python-format
 msgid "Count cannot be negative or 0."
-msgstr ""
+msgstr "Kan inte vara negativ eller 0."
 
 #. module: base_calendar
 #: field:crm.meeting,create_date:0
@@ -565,7 +567,7 @@ msgstr "Caldav URL"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "Inbjudningsguide"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -748,7 +750,7 @@ msgstr "Avslaget"
 #: code:addons/base_calendar/base_calendar.py:1462
 #, python-format
 msgid "Group by date is not supported, use the calendar view instead."
-msgstr ""
+msgstr "Gruppering efter datum stöds inte,  använd kalendervyn i stället."
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -905,7 +907,7 @@ msgstr "Måndag"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet4
 msgid "Open Discussion"
-msgstr ""
+msgstr "Öppen diskussion"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
@@ -940,7 +942,7 @@ msgstr "Den"
 #. module: base_calendar
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Avtalsdatum"
 
 #. module: base_calendar
 #: field:calendar.attendee,delegated_from:0
@@ -1009,7 +1011,7 @@ msgstr "Osäker"
 #: constraint:calendar.todo:0
 #: constraint:crm.meeting:0
 msgid "Error ! End date cannot be set before start date."
-msgstr ""
+msgstr "Fel ! Slutdatum kan inte sättas före startdatum."
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
@@ -1185,6 +1187,14 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
    \n"
+"             Klicka för att schemalägga ett nytt möte.\n"
+"           
    \n"
+"             Kalendern delas mellan anställda och helt integrerad med\n"
+"             andra applikationer såsom personal semester eller affärs\n"
+"             möjligheter.\n"
+"           
    \n"
+"        "
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1369,6 +1379,13 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att ställa in ett nytt larm typ.\n"
+"               
    \n"
+"                 Du kan definiera en anpassad typ av alarm som kan vara\n"
+"                 tilldelats kalenderhändelser eller möten.\n"
+"               
    \n"
+"            "
 
 #. module: base_calendar
 #: selection:crm.meeting,state:0
@@ -1425,7 +1442,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_message
 msgid "Message"
-msgstr ""
+msgstr "Meddelande"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_alarm_id:0
@@ -1450,7 +1467,7 @@ msgstr "april"
 #: code:addons/base_calendar/crm_meeting.py:106
 #, python-format
 msgid "Email addresses not found"
-msgstr ""
+msgstr "E-postadress saknas"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1468,7 +1485,7 @@ msgstr "Veckodag"
 #: code:addons/base_calendar/base_calendar.py:1015
 #, python-format
 msgid "Interval cannot be negative."
-msgstr ""
+msgstr "Intervallet kan inte vara negativt."
 
 #. module: base_calendar
 #: field:calendar.event,byday:0
@@ -1481,7 +1498,7 @@ msgstr "Per dag"
 #: code:addons/base_calendar/base_calendar.py:441
 #, python-format
 msgid "First you have to specify the date of the invitation."
-msgstr ""
+msgstr "Först måste du ange dagen för inbjudan."
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
@@ -1564,7 +1581,7 @@ msgstr "lördag"
 #: field:calendar.todo,interval:0
 #: field:crm.meeting,interval:0
 msgid "Repeat Every"
-msgstr ""
+msgstr "Repetera varje"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml
index 7afd2e49551..c280bfe298a 100644
--- a/addons/base_calendar/test/base_calendar_test.yml
+++ b/addons/base_calendar/test/base_calendar_test.yml
@@ -52,3 +52,20 @@
 -
     !python {model: calendar.event}: |
      self.write(cr, uid, [ref("calendar_event_alldaytestevent0")], {'alarm_id': ref("res_alarm_daybeforeeventstarts0")})
+-
+  I create a recuring rule for my event
+-
+  !record {model: crm.meeting, id: crm_meeting_sprintreview1}:
+    name: Begin of month meeting
+    date: !eval time.strftime('%Y-%m-%d 12:00:00')
+    recurrency: true
+    rrule: FREQ=MONTHLY;INTERVAL=1;COUNT=12;BYDAY=1MO
+-
+  I check that the attributes are set correctly
+-
+  !assert {model: crm.meeting, id: crm_meeting_sprintreview1}:
+    - rrule_type == 'monthly'
+    - count == 12
+    - select1 == 'day'
+    - byday == '1'
+    - week_list == 'MO'
diff --git a/addons/base_gengo/i18n/sv.po b/addons/base_gengo/i18n/sv.po
new file mode 100644
index 00000000000..29aece5d58b
--- /dev/null
+++ b/addons/base_gengo/i18n/sv.po
@@ -0,0 +1,269 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-03-31 16:36+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "Kommentarer"
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add Gengo login Public Key..."
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr "base.gengo.translations"
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Comments & Activity..."
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add Gengo login Private Key..."
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add your comments here for translator...."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr ""
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr ""
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index 51848b56908..5c2bad22322 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 21:15+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -86,4 +86,4 @@ msgstr "IBAN är felaktig, den måste inledas med landskod"
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr "IBAN konto"
+msgstr "IBAN-konto"
diff --git a/addons/base_import/i18n/sv.po b/addons/base_import/i18n/sv.po
new file mode 100644
index 00000000000..6c552ba669d
--- /dev/null
+++ b/addons/base_import/i18n/sv.po
@@ -0,0 +1,1193 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-03-31 16:37+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:451
+#, python-format
+msgid "Get all possible values"
+msgstr "Hämta samtliga värden"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+"                        with the \"External ID\" column to define the "
+"External \n"
+"                        ID of each record you import. Then, you will be able "
+"\n"
+"                        to make a reference to that record with columns like "
+"\n"
+"                        \"Field/External ID\". The following two CSV files "
+"give \n"
+"                        you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+"                        application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:331
+#, python-format
+msgid "Relation Fields"
+msgstr "Relationsfält"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+"                        record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/Database ID: You should rarely use this \n"
+"                        notation. It's mostly used by developers as it's "
+"main \n"
+"                        advantage is to never have conflicts (you may have \n"
+"                        several records with the same name, but they always "
+"\n"
+"                        have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+"                        Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+"                        (select 'company_'||id as \"External "
+"ID\",company_name \n"
+"                        as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+"                        '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/External ID: Use External ID when you import "
+"\n"
+"                        data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+"                        has a tabulation as separator, OpenERP will not \n"
+"                        detect the separations. You will need to change the "
+"\n"
+"                        file format options in your spreadsheet application. "
+"\n"
+"                        See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+"                        the easiest way when your data come from CSV files \n"
+"                        that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+"                        External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+"                        reference the country of a contact, OpenERP proposes "
+"\n"
+"                        you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+"                        saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+"                        are working for the Bigees company (company_1) and \n"
+"                        Eric is working for the Organi company. The relation "
+"\n"
+"                        between persons and companies is done using the \n"
+"                        External ID of the companies. We had to prefix the \n"
+"                        \"External ID\" by the name of the table to avoid a "
+"\n"
+"                        conflict of ID between persons and companies "
+"(person_1 \n"
+"                        and company_1 who shared the same ID 1 in the "
+"orignial \n"
+"                        database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+"                        'person_'||id as \"External ID\",person_name as \n"
+"                        \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+"                         as \"Related Company/External ID\" from persons) TO "
+"\n"
+"                        '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+"                        Company,Related Company/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:174
+#, python-format
+msgid "Semicolon"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+"                        with the child name \"Sellable\" (ie. \"Misc. \n"
+"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
+"                        your validation is halted but you may still import \n"
+"                        your data. However, we recommend you do not import "
+"the \n"
+"                        data because they will all be linked to the first \n"
+"                        'Sellable' category found in the Product Category "
+"list \n"
+"                        (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+"                        one of the duplicates' values or your product "
+"category \n"
+"                        hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+"                        companies, we will use the following SQL command in "
+"\n"
+"                        PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+"                        you to modify only the encoding when saving \n"
+"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
+"                        list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:175
+#, python-format
+msgid "Tab"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+"                        import if you need to re-import modified data\n"
+"                        later, it's thus good practice to specify it\n"
+"                        whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+"            can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+"                        ID: 21"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+"                the column names, OpenERP can try auto-detecting the\n"
+"                field corresponding to the column. This makes imports\n"
+"                simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+"            usually an incorrect file encoding."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+"                        applications, your computer's regional settings will "
+"\n"
+"                        be applied for the separator and delimiter. \n"
+"                        We suggest you use OpenOffice or LibreOffice Calc \n"
+"                        as they will allow you to modify all three options \n"
+"                        (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+"                        settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+"                        referenced in another application (or the .XML file "
+"\n"
+"                        that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Customers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+"                        object. For example, the country of a contact is a \n"
+"                        link to a record of the 'Country' object. When you \n"
+"                        want to import such fields, OpenERP will have to \n"
+"                        recreate links between the different records. \n"
+"                        To help you import such fields, OpenERP provides 3 \n"
+"                        mechanisms. You must use one and only one mechanism "
+"\n"
+"                        per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+"                        spacing. For example, if you want you customer to be "
+"\n"
+"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
+"                        then you will encode it as follow \"Manufacturer,\n"
+"                        Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+"                file contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:438
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:248
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+"                        orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+"                        displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+"                        with two tables you want to import: companies and \n"
+"                        persons. Each person belong to one company, so you \n"
+"                        will have to recreate the link between a person and "
+"\n"
+"                        the company he work for. (If you want to test this \n"
+"                        example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:427
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+"                        you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+"                        The \"External ID\" of a record is the unique "
+"identifier \n"
+"                        of this record in another application. This "
+"\"External \n"
+"                        ID\" must be unique accoss all the records of all \n"
+"                        objects, so it's a good practice to prefix this \n"
+"                        \"External ID\" with the name of the application or "
+"\n"
+"                        table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+"                        \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sales Order)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:404
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+"                        configuration of product categories, we recommend "
+"you \n"
+"                        use make use of the external ID for this field \n"
+"                        'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:421
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+"                        (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+"                        customers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+"                        you will have to recreate relations between records "
+"\n"
+"                        belonging to different tables. (e.g. if you import \n"
+"                        companies and persons, you will have to recreate the "
+"\n"
+"                        link between each person and the company they work \n"
+"                        for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+"                        one of these 3 ways to reference records in "
+"relations. \n"
+"                        Here is when you should use one or the other, \n"
+"                        according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+"                        OpenERP will assign the default value for every non "
+"\n"
+"                        defined fields. But if you\n"
+"                        set fields with empty values in your CSV file, "
+"OpenERP \n"
+"                        will set the EMPTY value in the field, instead of \n"
+"                        assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+"                        specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:176
+#, python-format
+msgid "Space"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+"                        allows you to use the Import/Export tool of OpenERP "
+"to \n"
+"                        modify a batch of records in your favorite "
+"spreadsheet \n"
+"                        application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+"                        import an other record that links to the first\n"
+"                        one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+"                        column \"External ID\" or \"Database ID\", records "
+"that \n"
+"                        have already been imported will be modified instead "
+"of \n"
+"                        being created. This is very usefull as it allows you "
+"\n"
+"                        to import several times the same CSV file while "
+"having \n"
+"                        made some changes in between two imports. OpenERP "
+"will \n"
+"                        take care of creating or modifying each record \n"
+"                        depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:330
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+"                        different records, you should use the unique\n"
+"                        identifier from the original application and\n"
+"                        map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+"                        order lines; for each order line, you need to "
+"reserve \n"
+"                        a specific row in the CSV file. The first order line "
+"\n"
+"                        will be imported on the same row as the information "
+"\n"
+"                        relative to order. Any additional lines will need an "
+"\n"
+"                        addtional row that does not have any information in "
+"\n"
+"                        the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:173
+#: code:addons/base_import/static/src/js/import.js:184
+#, python-format
+msgid "Comma"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+"                        OpenERP without any modifications. After having \n"
+"                        imported these two CSV files, you will have 4 "
+"contacts \n"
+"                        and 3 companies. (the firsts two contacts are linked "
+"\n"
+"                        to the first company). You must first import the \n"
+"                        companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+"                        field separators and quotation marks as text \n"
+"                        delimiters. If your csv file does not have these \n"
+"                        settings, you can modify the File Format Options \n"
+"                        (displayed under the Browse CSV file bar after you \n"
+"                        select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:423
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+"                        purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+"                        file of some quotations you can import, based on "
+"demo \n"
+"                        data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 996dbf7964d..637bac01720 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -11,6 +11,7 @@ except ImportError:
 import psycopg2
 
 from openerp.osv import orm, fields
+from openerp.osv.orm import BaseModel
 from openerp.tools.translate import _
 
 FIELDS_RECURSION_LIMIT = 2
@@ -316,8 +317,12 @@ class ir_import(orm.TransientModel):
             }]
 
         _logger.info('importing %d rows...', len(data))
-        import_result = self.pool[record.res_model].load(
-            cr, uid, import_fields, data, context=context)
+        # DO NOT FORWARD PORT, already fixed in trunk
+        # hack to avoid to call the load method from ir_translation (name clash)
+        if record.res_model == 'ir.translation':
+            import_result = BaseModel.load(self.pool['ir.translation'], cr, uid, import_fields, data, context=context)
+        else:
+            import_result = self.pool[record.res_model].load(cr, uid, import_fields, data, context=context)
         _logger.info('done')
 
         # If transaction aborted, RELEASE SAVEPOINT is going to raise
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index bd46774c3c3..a7bb7d9636f 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-30 14:52+0000\n"
-"Last-Translator: Anders Eriksson, Mobila System \n"
+"PO-Revision-Date: 2014-03-27 14:59+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-31 05:26+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -42,6 +42,7 @@ msgstr "base.config.settings"
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Använd externa identitetsleverantörer, logga in med google, facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -55,6 +56,15 @@ msgid ""
 "OpenERP using specific\n"
 "                            plugins for your preferred email application."
 msgstr ""
+"OpenERP gör det möjligt att automatiskt skapa kundämnen (eller andra "
+"dokument)\n"
+"                             från inkommande e-post. Du kan automatiskt "
+"synkronisera e-post med OpenERP\n"
+"                             med vanliga POP / IMAP-konton, med hjälp av ett "
+"e-integrationsprogram för din\n"
+"                             e-postserver, eller genom att manuellt spara e-"
+"post till OpenERP via specifika\n"
+"                             plugins för ditt favorit-e-postprogram."
 
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
@@ -179,7 +189,7 @@ msgstr "Hyresgästen"
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Dela eller bädda in godtycklig OpenERP-vy."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -202,6 +212,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Arbeta i flera företagsmiljöer, med lämplig tillgång säkerhet mellan "
+"företagen.\n"
+"                 Detta installerar modulen multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -210,6 +223,10 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Den offentliga Portalen är tillgänglig endast om du är i en endatabas läge. "
+"Du kan\n"
+"                                     starta OpenERP Server med det "
+"alternativet"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -242,6 +259,13 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"När du skickar ett dokument till en kund\n"
+"                                     (citat, faktura), kommer kunden att få\n"
+"                                     möjlighet att registrera sig på "
+"webbplatsen för att få alla sina dokument,\n"
+"                                     Läs ditt företag nyheter, följa sitt "
+"projekt,\n"
+"                                     etc."
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -270,6 +294,13 @@ msgid ""
 "                Partner from the selected emails.\n"
 "                This installs the module plugin_thunderbird."
 msgstr ""
+"Insticksprogrammet låter dig arkivera e-post och bilagor till det valda\n"
+"                 OpenERP-objektet. Du kan välja ett företag, eller ett "
+"kundämne och\n"
+"                 bifoga den markerade posten som en. EML-fil i\n"
+"                 en bilaga. Du kan skapa dokument för CRM kundämnen,\n"
+"                 företag från de valda e-post.\n"
+"                 Detta installerar modulen plugin_thunderbird."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -298,6 +329,12 @@ msgid ""
 "                email into an OpenERP mail message with attachments.\n"
 "                This installs the module plugin_outlook."
 msgstr ""
+"I Outlook plugin låter dig välja ett objekt som du vill lägga till\n"
+"                 till din e-post och bilagor från MS Outlook. Du kan välja "
+"ett företag,\n"
+"                 eller en kundämnet och arkivera en vald\n"
+"                 e-post till en OpenERP-meddelande med bilagor.\n"
+"                 Detta installerar modulen plugin_outlook."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -316,6 +353,9 @@ msgid ""
 "                                    Once activated, the login page will be "
 "replaced by the public website."
 msgstr ""
+"att göra så.\n"
+"                                     När aktiverad, kommer inloggningssidan "
+"ersättas av den publika webbplatsen."
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index 53fe15ac4f9..f4cfab6791d 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:42+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "Check Validity"
-msgstr ""
+msgstr "Kontrollera giltighet"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:152
@@ -46,12 +46,12 @@ msgstr "Bolag"
 #: code:addons/base_vat/base_vat.py:113
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "e.g. BE0477472701"
-msgstr ""
+msgstr "e.g. SE5577472701"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index 67e929b7b27..1c7e2d50429 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/i18n/sv.po
@@ -8,58 +8,58 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 12:29+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
 #: model:ir.ui.menu,name:board.menu_board_create
 msgid "Create Board"
-msgstr ""
+msgstr "Skapa en anslagstavla"
 
 #. module: board
 #: view:board.create:0
 msgid "Create"
-msgstr ""
+msgstr "Skapa"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:4
 #, python-format
 msgid "Reset Layout.."
-msgstr ""
+msgstr "Återställ layouten"
 
 #. module: board
 #: view:board.create:0
 msgid "Create New Dashboard"
-msgstr ""
+msgstr "Skapa ny anslagstavla"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:40
 #, python-format
 msgid "Choose dashboard layout"
-msgstr ""
+msgstr "Välj anslagstavellayout"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:70
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "Lägg till"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/js/dashboard.js:139
 #, python-format
 msgid "Are you sure you want to remove this item ?"
-msgstr ""
+msgstr "Är du säker på att du vill radera?"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -71,31 +71,31 @@ msgstr "Bräde"
 #: model:ir.actions.act_window,name:board.open_board_my_dash_action
 #: model:ir.ui.menu,name:board.menu_board_my_dash
 msgid "My Dashboard"
-msgstr ""
+msgstr "Min anslagstavla"
 
 #. module: board
 #: field:board.create,name:0
 msgid "Board Name"
-msgstr ""
+msgstr "Tavelnamn"
 
 #. module: board
 #: model:ir.model,name:board.model_board_create
 msgid "Board Creation"
-msgstr ""
+msgstr "Anslagstavelbyggande"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:67
 #, python-format
 msgid "Add to Dashboard"
-msgstr ""
+msgstr "Lägg till anslagstavlan"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:28
 #, python-format
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: board
 #: model:ir.actions.act_window,help:board.open_board_my_dash_action
@@ -115,13 +115,28 @@ msgid ""
 "              \n"
 "            "
 msgstr ""
+"
    \n"
+"                   
    \n"
+"                      Din personliga anslagstavla är tom. \n"
+"                   \n"
+"                     För att lägga till din första rapport i denna tavla, gå "
+"till någon\n"
+"                     meny, växla till lista eller graf visa och klicka  "
+"\"Lägg till\n"
+"                     anslagstavlan \" i de utökade sökmöjligheter.\n"
+"                   \n"
+"                     Du kan välja och gruppera data innan du sätter in i\n"
+"                     instrumentpanel med sökalternativen.\n"
+"                   \n"
+"               \n"
+"            "
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:6
 #, python-format
 msgid "Reset"
-msgstr ""
+msgstr "Återställ"
 
 #. module: board
 #: field:board.create,menu_parent_id:0
@@ -133,21 +148,21 @@ msgstr "Parent Menu"
 #: code:addons/board/static/src/xml/board.xml:8
 #, python-format
 msgid "Change Layout.."
-msgstr ""
+msgstr "Ändra layout..."
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/js/dashboard.js:93
 #, python-format
 msgid "Edit Layout"
-msgstr ""
+msgstr "Ändra layout"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:10
 #, python-format
 msgid "Change Layout"
-msgstr ""
+msgstr "Ändra layout"
 
 #. module: board
 #: view:board.create:0
@@ -157,11 +172,11 @@ msgstr "Cancel"
 #. module: board
 #: view:board.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:69
 #, python-format
 msgid "Title of new dashboard item"
-msgstr ""
+msgstr "Titel på anslagstavlan"
diff --git a/addons/claim_from_delivery/i18n/sv.po b/addons/claim_from_delivery/i18n/sv.po
index 35b0d046741..a5ed52231cb 100644
--- a/addons/claim_from_delivery/i18n/sv.po
+++ b/addons/claim_from_delivery/i18n/sv.po
@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:43+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
 msgid "Claims"
-msgstr ""
+msgstr "Reklamationer"
 
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Leveransorder"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim From Delivery"
-msgstr ""
+msgstr "Reklamationer från leveransen"
diff --git a/addons/contacts/i18n/sv.po b/addons/contacts/i18n/sv.po
index 4c135cee29e..6f089cd27f5 100644
--- a/addons/contacts/i18n/sv.po
+++ b/addons/contacts/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-17 23:49+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-19 07:46+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
@@ -29,6 +29,15 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
    \n"
+"             Klicka för att lägga till en kontakt i adressboken.\n"
+"           \n"
+"             OpenERP hjälper dig att enkelt spåra alla aktiviteter "
+"relaterade till\n"
+"             en kund, diskussioner, historia av affärsmöjligheter,\n"
+"             dokument, etc.\n"
+"           \n"
+"        "
 
 #. module: contacts
 #: model:ir.actions.act_window,name:contacts.action_contacts
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index bd3c6f33f4e..6c4ef607c0d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -264,10 +264,10 @@ class crm_lead(base_stage, format_address, osv.osv):
         'opt_out': fields.boolean('Opt-Out', oldname='optout',
             help="If opt-out is checked, this contact has refused to receive emails for mass mailing and marketing campaign. "
                     "Filter 'Available for Mass Mailing' allows users to filter the leads when performing mass mailing."),
-        'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"),
+        'type': fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', select=True, help="Type is used to separate Leads and Opportunities"),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange',
+        'stage_id': fields.many2one('crm.case.stage', 'Stage', track_visibility='onchange', select=True,
                         domain="['&', '&', ('fold', '=', False), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson', select=True, track_visibility='onchange'),
         'referred': fields.char('Referred By', size=64),
@@ -277,7 +277,7 @@ class crm_lead(base_stage, format_address, osv.osv):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
+                selection=crm.AVAILABLE_STATES, string="Status", readonly=True, select=True,
                 help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is  set to \'Pending\'.'),
 
         # Only used for type opportunity
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 7c087ebd5a8..e0311d1db40 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -328,7 +328,7 @@
                     
                     
                     
-                    
+                    
                     
                     
                     
@@ -546,7 +546,7 @@
                     
                     
                     
-                    
+                    
                     
                     
                     
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 2d456cc053a..21e18d8affc 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -186,7 +186,7 @@
                
                
-               
+               
                
                
                
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index 3ce11ae6881..72be2db66ec 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2014-02-05 16:34+0000\n"
-"Last-Translator: Alejandro Santana \n"
+"PO-Revision-Date: 2014-03-25 12:07+0000\n"
+"Last-Translator: Jean Ventura \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-06 06:24+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1725,7 +1725,7 @@ msgstr "Mes de la llamada"
 #. module: crm
 #: view:crm.lead:0
 msgid "Describe the lead..."
-msgstr "Describa a la iniciativa..."
+msgstr "Describa la iniciativa..."
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:292
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index 629e5b211fc..fd311454d94 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2014-03-05 21:13+0000\n"
+"PO-Revision-Date: 2014-04-01 14:20+0000\n"
 "Last-Translator: hiro TAKADA \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 06:14+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1218,7 +1218,7 @@ msgstr "この項目をチェックした場合、この段階が各営業チー
 msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
-msgstr ""
+msgstr "このフィールドは商談とリードの区別、あるいは両方を指定するために使用します。"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_create
@@ -1344,7 +1344,7 @@ msgstr "コード"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "特徴"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1423,7 +1423,7 @@ msgstr ""
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "ステージの順位に使用します。 低いほど良好です。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1626,7 +1626,7 @@ msgstr ""
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
 msgid "Manage Customer Claims"
-msgstr ""
+msgstr "顧客クレーム管理"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -2227,7 +2227,7 @@ msgstr ""
 msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
-msgstr ""
+msgstr "ステータスバーやかんばんビューで表示すべきレコードが存在しない場合、このステージは表示されません。"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
@@ -2298,7 +2298,7 @@ msgstr ""
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "アフターサービス"
 
 #. module: crm
 #: field:crm.case.section,message_ids:0
@@ -2716,7 +2716,7 @@ msgstr "番地"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "ヘルプデスクおよびサポート管理"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index 7113b501a85..382d65aa2b3 100644
--- a/addons/crm/i18n/sl.po
+++ b/addons/crm/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2014-02-03 10:25+0000\n"
+"PO-Revision-Date: 2014-03-14 14:54+0000\n"
 "Last-Translator: Darja Zorman \n"
 "Language-Team: Slovenian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-04 06:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -233,7 +233,7 @@ msgstr "Telefonski klic"
 #. module: crm
 #: field:crm.lead,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Opt-Out"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1629,7 +1629,7 @@ msgstr "Visoka"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Spremeni v poslovnega partnerja"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
@@ -2471,7 +2471,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Fold by Default"
-msgstr ""
+msgstr "Prizeto stanje - Zaprto"
 
 #. module: crm
 #: field:crm.case.stage,state:0
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 1f9ce104aa1..c2c52b3ab0d 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-02 14:14+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-08 05:39+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-04-03 06:01+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -28,6 +28,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Här kan du konfigurera din inkommande e-postserver, och skapa kundämnen från "
+"inkommande e-post."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:897
@@ -55,6 +57,11 @@ msgid ""
 "Description: [[object.description]]\n"
 "            "
 msgstr ""
+"Varning obearbetade inkommande kundämnen är mer än 5 dagar gamla. \n"
+"Namn: [[object.name]] \n"
+"ID: [[object.id]] \n"
+"Beskrivning: [[object.description]]\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
@@ -65,7 +72,7 @@ msgstr "Action"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
 msgid "Set team to Sales Department"
-msgstr ""
+msgstr "Ställ in säljlaget till försäljningsavdelningen"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -76,7 +83,7 @@ msgstr "Välj affärsmöjligheter"
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Hantera insamlingar"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -87,7 +94,7 @@ msgstr "Stängledtid"
 #. module: crm
 #: view:crm.lead:0
 msgid "Available for mass mailing"
-msgstr ""
+msgstr "Tillgänglig för mass-e-post"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -101,7 +108,7 @@ msgstr "Stegnamn"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -118,18 +125,18 @@ msgstr "Dag"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Bolagsnamn"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Utbildning"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Försäljningsetiketter"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -139,7 +146,7 @@ msgstr "Förv stängning"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Cancel Call"
-msgstr ""
+msgstr "Avbryt samtal"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -155,7 +162,7 @@ msgstr "Rule Name"
 #: code:addons/crm/crm_phonecall.py:282
 #, python-format
 msgid "It's only possible to convert one phonecall at a time."
-msgstr ""
+msgstr "Det är endast möjligt att konvertera ett samtal åt gången"
 
 #. module: crm
 #: view:crm.case.resource.type:0
@@ -185,6 +192,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:637
@@ -231,17 +240,17 @@ msgstr "Undantagen"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities that are assigned to me"
-msgstr ""
+msgstr "Affärsmöjligheter knutna till mig"
 
 #. module: crm
 #: field:res.partner,meeting_count:0
 msgid "# Meetings"
-msgstr ""
+msgstr "# Möten"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Påminnelse till användare"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -251,12 +260,12 @@ msgstr "Villkor"
 #. module: crm
 #: view:crm.lead:0
 msgid "Assigned to My Team(s)"
-msgstr ""
+msgstr "Tilldelat till mina lag"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge opportunities"
-msgstr ""
+msgstr "Slå samman affärsmöjligheter"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -327,6 +336,17 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                 Klicka för att definiera en ny kundsegmentering. \n"
+"               
     \n"
+"                 Skapa specifika kategorier som du kan koppla till din \n"
+"                 kontakter för att bättre hantera dina interaktioner med "
+"dem. \n"
+"                 Segmenteringsverktyget kan tilldela kategorier för "
+"kontakter \n"
+"                 enligt kriterier du anger. \n"
+"               
    \n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -339,7 +359,7 @@ msgstr "Kontakt"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the salesman with the team leader."
-msgstr ""
+msgstr "Vid eskalering till detta säljlag, åsidosätts gruppledaren."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -379,12 +399,26 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                 Klicka för att skapa en affärsmöjlighet knuten till denna "
+"kund. \n"
+"               
     \n"
+"                 Använd affärsmöjligheter för övervaka på "
+"marknadsföringsprocess, följ \n"
+"                 upp potentiella affärer och bättre prognostisera dina "
+"framtida intäkter. \n"
+"               
     \n"
+"                 Du kommer att kunna planera möten och telefonsamtal från \n"
+"                 möjligheter, omvandla dem till citat, bifoga relaterade \n"
+"                 dokument, spåra alla diskussioner och mycket mer. \n"
+"               
    \n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 #: view:crm.lead:0
 msgid "Dead"
-msgstr ""
+msgstr "Död"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -392,7 +426,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: crm
 #: field:crm.segmentation.line,segmentation_id:0
@@ -405,7 +439,7 @@ msgstr "Segmentation"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Länka till en befintlig kund"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -463,6 +497,16 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                 Klicka för att definiera ett nytt säljlag. \n"
+"               
     \n"
+"                 Använd säljlag för att organisera dina olika säljare eller "
+"\n"
+"                 avdelningar i separata grupper. Varje lag kommer att arbeta "
+"i \n"
+"                 sin egen lista av möjligheter. \n"
+"               \n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -486,7 +530,7 @@ msgstr "Skapa affärstillfälle"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: crm
 #: view:crm.lead:0
@@ -501,7 +545,7 @@ msgstr "Epost-korrespondens"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Steg ändrat"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -524,7 +568,7 @@ msgstr "Planned Revenue"
 #: code:addons/crm/crm_lead.py:1004
 #, python-format
 msgid "Customer Email"
-msgstr ""
+msgstr "Kund-e-postmeddelande"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -552,6 +596,9 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"Statusen är satt till \"Att göra\", när ett ärende skapas. Om ärendet pågår "
+"är status inställd på \"Öppen\". När samtalet är över, är status satt till "
+"\"Hållet\". Om samtalet behöver göras då status är inställd på 'Ej Hållet \"."
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
@@ -563,7 +610,7 @@ msgstr "Summering"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Sammanfoga"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -581,6 +628,8 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Påminnelse på kundämne: [[object.id ]] [[object.partner_id and 'of ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:759
@@ -624,6 +673,14 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
     \n"
+"             Klicka för att lägga till en ny kategori. \n"
+"           
     \n"
+"             Skapa specifika telefonsamtalskategorier för att bättre "
+"definiera vilken typ av \n"
+"             samtal som systemet spårar. \n"
+"           
    \n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -671,12 +728,12 @@ msgstr "Företagssegmentering"
 #: code:addons/crm/crm_lead.py:1064
 #, python-format
 msgid "Logged a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "Loggade ett samtal för  %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -696,12 +753,12 @@ msgstr "The name of the segmentation."
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "Kundämnen från USA"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
-msgstr ""
+msgstr "Sannolikheten för avslut skall vara mellan 0% och 100%!"
 
 #. module: crm
 #: view:crm.lead:0
@@ -735,12 +792,12 @@ msgstr "TV"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Konvertera till affärsmöjlighet"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -750,7 +807,7 @@ msgstr "Stop Process"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -762,6 +819,8 @@ msgstr "Sök telefonsamtal"
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Kundämnen / Affärsmöjligheter som är tilldelade ett av de säljlag jag "
+"hanterar"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -787,12 +846,12 @@ msgstr "Från %s: %s"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Konvertera till affärsmöjlighet"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that did not ask not to be included in mass mailing campaigns"
-msgstr ""
+msgstr "Kundämnen som inte avböjt att ingå i massutskickskampanjer"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -801,7 +860,7 @@ msgstr ""
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -820,6 +879,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Länk mellan etapperna och säljlag. När den är inställd, begränsas aktuell "
+"etapp till det valda säljlaget."
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -858,7 +919,7 @@ msgstr "Företagskategori"
 #. module: crm
 #: field:crm.lead,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Avslutsratio (%)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -873,7 +934,7 @@ msgstr "Utgående"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads that are assigned to me"
-msgstr ""
+msgstr "Kundämnen tilldelade till mig"
 
 #. module: crm
 #: view:crm.lead:0
@@ -893,7 +954,7 @@ msgstr "Märk förlorad"
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "Kundämnen i utkast"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -905,14 +966,14 @@ msgstr "mars"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "Skicka e-post"
 
 #. module: crm
 #: help:crm.case.section,message_unread:0
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -922,7 +983,7 @@ msgstr "Dagar för att öppna"
 #. module: crm
 #: view:crm.lead:0
 msgid "ZIP"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: crm
 #: field:crm.lead,mobile:0
@@ -959,7 +1020,7 @@ msgstr "Nästa åtgärd"
 #: code:addons/crm/crm_lead.py:777
 #, python-format
 msgid "Partner set to %s."
-msgstr ""
+msgstr "Företag inställd på %s."
 
 #. module: crm
 #: selection:crm.lead.report,state:0
@@ -1052,7 +1113,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:712
 #, python-format
 msgid "Lead converted into an Opportunity"
-msgstr ""
+msgstr "Kundämne konverterad till affärsmöjlighet"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1067,7 +1128,7 @@ msgstr "År för samtal"
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Leads"
-msgstr ""
+msgstr "Öppna kundämnen"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1081,7 +1142,7 @@ msgstr "Steg"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "Telefonsamtal tilldelade till mig"
 
 #. module: crm
 #: field:crm.lead,user_login:0
@@ -1091,7 +1152,7 @@ msgstr "Användarinloggning"
 #. module: crm
 #: view:crm.lead:0
 msgid "No salesperson"
-msgstr ""
+msgstr "Ingen säljare"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1118,22 +1179,22 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Ta bort"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Affärsmöjlighet skapad"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Description..."
-msgstr ""
+msgstr "Beskrivning..."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1157,6 +1218,20 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
     \n"
+"           Klicka för att skapa en ny affärsmöjlighet. \n"
+"           
     \n"
+"           OpenERP hjälper dig övervaka din marknadsföringsprocess för att "
+"följa \n"
+"           upp potentiella affärer och bättre prognostisera dina framtida "
+"intäkter. \n"
+"           
     \n"
+"           Du kommer att kunna planera möten och telefonsamtal från \n"
+"           affärsmöjligheter, omvandla dem till offerter, bifoga relaterade "
+"\n"
+"           dokument, spåra alla diskussioner och mycket mer. \n"
+"           
    \n"
+"        "
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1175,12 +1250,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "Betalningsmoder"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1231,7 +1306,7 @@ msgstr ""
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Lead Created"
-msgstr ""
+msgstr "Kundämne skapat"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1269,7 +1344,7 @@ msgstr "okänd"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,date:0
@@ -1282,7 +1357,7 @@ msgstr "Datum"
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Nätsupport"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1318,7 +1393,7 @@ msgstr "Marknadsavdelning"
 #: code:addons/crm/crm_lead.py:582
 #, python-format
 msgid "Merged lead"
-msgstr ""
+msgstr "Sammanfoga kundämnen"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1342,7 +1417,7 @@ msgstr "Sammanslagna affärsmöjligheter"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Konsulting"
 
 #. module: crm
 #: field:crm.case.section,code:0
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 7a12678be34..380a50f7d54 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2013-11-24 21:03+0000\n"
-"Last-Translator: Ediz Duman \n"
+"PO-Revision-Date: 2014-04-09 20:13+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
 "Language-Team: OpenERP Turkish Translation <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-08 05:39+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-04-10 06:46+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 "Language: tr\n"
 
 #. module: crm
@@ -738,7 +738,7 @@ msgstr "İş Ortağı Bölümlendirme"
 #: code:addons/crm/crm_lead.py:1064
 #, python-format
 msgid "Logged a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "Çağrı yapılan %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
@@ -3124,7 +3124,7 @@ msgstr "Öneren"
 #: code:addons/crm/crm_lead.py:1066
 #, python-format
 msgid "Scheduled a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "Çağrı planlanan %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index d104e92fc1c..12eeae4a090 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2014-01-07 16:56+0000\n"
-"PO-Revision-Date: 2013-11-13 09:09+0000\n"
-"Last-Translator: openerp-china.black-jack \n"
+"PO-Revision-Date: 2014-03-25 09:57+0000\n"
+"Last-Translator: 盈通 ccdos \n"
 "Language-Team: Chinese (Simplified) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-08 05:40+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -712,7 +712,7 @@ msgstr "合作伙伴细分"
 #: code:addons/crm/crm_lead.py:1064
 #, python-format
 msgid "Logged a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "登记电话：%(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
@@ -3040,7 +3040,7 @@ msgstr "参考来自"
 #: code:addons/crm/crm_lead.py:1066
 #, python-format
 msgid "Scheduled a call for %(date)s. %(description)s"
-msgstr ""
+msgstr "预定打电话： %(date)s. %(description)s"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index 8db11c3914a..2e24c346a5d 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-08 11:21+0000\n"
+"PO-Revision-Date: 2014-03-28 12:26+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) \n"
 "Language-Team: Dutch \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:05+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-29 07:30+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -383,7 +383,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr "Regelen"
+msgstr "Oplossen"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
@@ -884,7 +884,7 @@ msgstr "Mijn klacht(en)"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr "Geregeld"
+msgstr "Opgelost"
 
 #. module: crm_claim
 #: help:crm.claim,message_ids:0
diff --git a/addons/crm_claim/i18n/sl.po b/addons/crm_claim/i18n/sl.po
index 5f87a08b228..005048d1e89 100644
--- a/addons/crm_claim/i18n/sl.po
+++ b/addons/crm_claim/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-09 10:57+0000\n"
+"PO-Revision-Date: 2014-03-14 14:55+0000\n"
 "Last-Translator: Darja Zorman \n"
 "Language-Team: Slovenian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:05+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -354,7 +354,7 @@ msgstr "Datumi"
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "Destination email for email gateway."
-msgstr ""
+msgstr "Namembno el.sporočilo za email vozlišče (gateway)"
 
 #. module: crm_claim
 #: code:addons/crm_claim/crm_claim.py:194
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index 1203a9d5d4d..e0a8d3f0537 100644
--- a/addons/crm_claim/i18n/sv.po
+++ b/addons/crm_claim/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 19:48+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:05+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -23,6 +23,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Denna etapp är inte synlig, t.ex. i statusfältet eller Kanbanvyn, i de fall "
+"etappen saknar poster."
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -38,7 +40,7 @@ msgstr "Gruppera på..."
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr "Ansvariga"
+msgstr "Ansvarsområden"
 
 #. module: crm_claim
 #: help:sale.config.settings,fetchmail_claim:0
@@ -46,16 +48,18 @@ msgid ""
 "Allows you to configure your incoming mail server, and create claims from "
 "incoming emails."
 msgstr ""
+"Här kan du konfigurera din inkommande e-postserver, och skapar reklamationer "
+"från inkommande e-post."
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_stage
 msgid "Claim stages"
-msgstr ""
+msgstr "Reklamationsetapper"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
@@ -65,7 +69,7 @@ msgstr "Stängledtid"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -77,7 +81,7 @@ msgstr "Lösning"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
@@ -91,6 +95,16 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att skapa en reklamationskategori.\n"
+"               
    \n"
+"                 Skapa reklamationskategorier för att bättre hantera och "
+"klassificera dina\n"
+"                 reklamationer. Några exempel på reklamationer kan vara: "
+"förebyggande åtgärder,\n"
+"                 korrigerande åtgärder.\n"
+"               
    \n"
+"            "
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -100,12 +114,12 @@ msgstr "#Reklamationer"
 #. module: crm_claim
 #: field:crm.claim.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Etappnamn"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -149,7 +163,7 @@ msgstr "preventiv"
 #. module: crm_claim
 #: help:crm.claim,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
@@ -159,7 +173,7 @@ msgstr "Stängningsdatum"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falskt"
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
@@ -169,7 +183,7 @@ msgstr "Referens"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Date of claim"
-msgstr "Reklamationens datum"
+msgstr "Reklamationsdatum"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -182,6 +196,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -235,12 +251,12 @@ msgstr "Prioritet"
 #. module: crm_claim
 #: field:crm.claim.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Göm i vyn när tom"
 
 #. module: crm_claim
 #: field:crm.claim,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -254,7 +270,7 @@ msgstr "Nya"
 #. module: crm_claim
 #: field:crm.claim.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "Sektioner"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -290,7 +306,7 @@ msgstr "Reklamationsrubrik"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim3
 msgid "Rejected"
-msgstr ""
+msgstr "Nekad"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
@@ -300,7 +316,7 @@ msgstr "Nästa datum för åtgärd"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -320,7 +336,7 @@ msgstr "Juli"
 #: view:crm.claim.stage:0
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr "Reklamationsstatus"
+msgstr "Reklamationsetapper"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
@@ -343,13 +359,13 @@ msgstr "Datum"
 #. module: crm_claim
 #: help:crm.claim,email_from:0
 msgid "Destination email for email gateway."
-msgstr ""
+msgstr "Destinationsmottagare för e-postbryggan"
 
 #. module: crm_claim
 #: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Inget ämne"
 
 #. module: crm_claim
 #: help:crm.claim.stage,state:0
@@ -359,16 +375,20 @@ msgid ""
 "is related to the status 'Close', when your document reaches this stage, it "
 "will be automatically have the 'closed' status."
 msgstr ""
+"Den relaterade statusen för etappen. Statusen för ditt dokument kommer att "
+"ändras automatiskt med avseende på en ny etapp. Till exempel, om en etapp är "
+"relaterad till statusen \"Stäng\", när dokumentet når denna etapp, kommer "
+"den att automatiskt att ha status som den \"stängda\"."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr ""
+msgstr "Klara upp"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
 msgid "Stages"
-msgstr ""
+msgstr "Etapper"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
@@ -389,7 +409,7 @@ msgstr "CRM Reklamationsrapport"
 #. module: crm_claim
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
@@ -435,6 +455,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Om du markerar detta fält kommer detta skede föreslås som standard på varje "
+"säljlag. Befintliga lag kommer inte att få denna status."
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
@@ -491,7 +513,7 @@ msgstr "Stängd"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reject"
-msgstr ""
+msgstr "Neka"
 
 #. module: crm_claim
 #: view:res.partner:0
@@ -501,7 +523,7 @@ msgstr "Företagsreklamation"
 #. module: crm_claim
 #: view:crm.claim.stage:0
 msgid "Claim Stage"
-msgstr ""
+msgstr "Reklamationsetapp"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -519,7 +541,7 @@ msgstr "Väntande"
 #: field:crm.claim.report,state:0
 #: field:crm.claim.stage,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -535,7 +557,7 @@ msgstr "Normal"
 #. module: crm_claim
 #: help:crm.claim.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Används för att sortera etapper. Lägre är bättre."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -555,7 +577,7 @@ msgstr "Telefon"
 #. module: crm_claim
 #: field:crm.claim,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
@@ -577,6 +599,16 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att sätta upp en ny etapp i behandlingen av "
+"reklamationer.\n"
+"               
    \n"
+"                 Du kan skapa reklamationsetapp för att kategorisera status "
+"för varje\n"
+"                 reklamation in i systemet. Etapperna definiera alla steg\n"
+"                 som krävs för att lösa en reklamation.\n"
+"               
    \n"
+"            "
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -587,6 +619,9 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"Statusen är satt till \"Utkast\", när ett ärende skapas. Om ärendet pågår är "
+"status inställd på \"Öppna\". När fallet är över, sätts status till "
+"\"Klar\". Om ärendet måste granskas är status \"Väntar\"."
 
 #. module: crm_claim
 #: field:crm.claim,active:0
@@ -614,6 +649,7 @@ msgid ""
 "Responsible sales team. Define Responsible user and Email account for mail "
 "gateway."
 msgstr ""
+"Ansvarigt säljlag. Definiera ansvarig användare och e-postkonto för bryggan."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -634,7 +670,7 @@ msgstr "Reklamationsdatum"
 #. module: crm_claim
 #: field:crm.claim,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -644,7 +680,7 @@ msgstr "Reklamationskategorier"
 #. module: crm_claim
 #: field:crm.claim.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Gemensamt med alla lag"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -683,7 +719,7 @@ msgstr "Reklamation"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Mitt bolag"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -779,7 +815,7 @@ msgstr "Åtgärder för att lösa ärendet"
 #. module: crm_claim
 #: field:crm.claim.stage,case_refused:0
 msgid "Refused stage"
-msgstr ""
+msgstr "Etapp avslag"
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
@@ -808,6 +844,14 @@ msgid ""
 "            
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Registrera och spåra dina kunders reklamationer. "
+"Reklamationer kan kopplas till en försäljningsorder eller en batch. Du kan "
+"skicka e-post med bifogade filer och behålla hela historien för en "
+"reklamation (e-post skickas, ingripande typ osv). Reklamationer kan "
+"automatiskt kopplas till en e-postadress med hjälp av e-postbryggan.\n"
+"             
    \n"
+"            "
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -833,22 +877,22 @@ msgstr "Mina ärenden"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr ""
+msgstr "Utredd"
 
 #. module: crm_claim
 #: help:crm.claim,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: crm_claim
 #: field:sale.config.settings,fetchmail_claim:0
 msgid "Create claims from incoming mails"
-msgstr ""
+msgstr "Reklamationer skapas från inkommande e-post"
 
 #. module: crm_claim
 #: field:crm.claim.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -883,11 +927,13 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Länk mellan etapperna och säljlag. När den är inställd, begränsas aktuell "
+"etapp till det valda säljlaget."
 
 #. module: crm_claim
 #: help:crm.claim.stage,case_refused:0
 msgid "Refused stages are specific stages for done."
-msgstr ""
+msgstr "Avslagsetappen är specifik för klar"
 
 #~ msgid ""
 #~ "Record and track your customers' claims. Claims may be linked to a sales "
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index d833e7bbcf6..404e84f4629 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -64,7 +64,7 @@
                                 
                                 
                                     
-                                    
+                                    
                                     
                                 
                             
diff --git a/addons/crm_helpdesk/i18n/sv.po b/addons/crm_helpdesk/i18n/sv.po
index a32cfbc4424..a8376040de1 100644
--- a/addons/crm_helpdesk/i18n/sv.po
+++ b/addons/crm_helpdesk/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-19 00:22+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-04-01 06:39+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -36,7 +36,7 @@ msgstr "Gruppera på..."
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_from:0
 msgid "Destination email for email gateway"
-msgstr ""
+msgstr "Mottagande e-postadress i E-postbryggan"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -46,7 +46,7 @@ msgstr "Mars"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -63,7 +63,7 @@ msgstr "Övervakarens e-post"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -106,7 +106,7 @@ msgstr "Avbruten"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
@@ -136,6 +136,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -275,7 +277,7 @@ msgstr "Ingen rubrik"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Cancel Case"
-msgstr ""
+msgstr "Avsluta ärendet"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -283,6 +285,8 @@ msgid ""
 "Helpdesk requests that are assigned to me or to one of the sale teams I "
 "manage"
 msgstr ""
+"Kundtjänst-förfrågningar som tilldelats mig eller till någon av de "
+"försäljningsteam jag hanterar"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -297,7 +301,7 @@ msgstr "Alla väntande kundjtänstärenden"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Close Case"
-msgstr ""
+msgstr "Stäng ärendet"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -410,7 +414,7 @@ msgstr "Väntande"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -455,6 +459,19 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att skapa en ny begäran.\n"
+"               \n"
+"                 Helpdesk och support gör att du kan spåra dina insatser.\n"
+"               \n"
+"                 Använd OpenERP Frågor system för att hantera ditt stöd\n"
+"                 aktiviteter. Frågor som kan anslutas till den e-gateway: "
+"new\n"
+"                 e-post kan skapa problem, får var och en av dem "
+"automatiskt\n"
+"                 historia av samtalet med kunden.\n"
+"               \n"
+"            "
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0
@@ -497,6 +514,7 @@ msgid ""
 "Responsible sales team. Define Responsible user and Email account for mail "
 "gateway."
 msgstr ""
+"Ansvarigt säljlag. Definiera ansvarig användare och e-postkonto för bryggan."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -511,7 +529,7 @@ msgstr "Januari"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -527,7 +545,7 @@ msgstr "Övrigt"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Company"
-msgstr ""
+msgstr "olagMitt b"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -662,11 +680,15 @@ msgid ""
 "        \n"
 "If the case needs to be reviewed then the status is set to 'Pending'."
 msgstr ""
+"Statusen är satt till \"Utkast\", när ett ärende skapas.\n"
+"Om ärendet pågår status är inställd på \"Öppna\".\n"
+"När fallet är över, är det status till \"Klar\".\n"
+"Om ärendet måste ses över så att status är \"Väntar\"."
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
@@ -708,7 +730,7 @@ msgstr "Senaste åtgärd"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Assigned to Me or My Sales Team(s)"
-msgstr ""
+msgstr "Anslut mig till mitt/mina säljlag"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,duration:0
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index d560c343edc..bb004ea6e63 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_partner_assign/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-03-07 08:38+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:26+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -25,7 +25,7 @@ msgstr "Ledtid till avslut"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Författare"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -53,7 +53,7 @@ msgstr "Gruppera på..."
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Rensa HTML-innehållet automatiskt"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -68,7 +68,7 @@ msgstr "Geoplacering"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Blockerad"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -81,6 +81,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"E-postadress till avsändaren. Det här fältet är satt när inget matchande "
+"företag hittas för inkommande e-post."
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -111,7 +113,7 @@ msgstr "Företag"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
-msgstr ""
+msgstr "Aviseringar"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@@ -123,7 +125,7 @@ msgstr "Företagsdatum"
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -170,12 +172,12 @@ msgstr "Geografisk tilldelning"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-postredigeringsguide"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Omsättning"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@@ -199,13 +201,13 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Systemavisering"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
 #, python-format
 msgid "Lead forward"
-msgstr ""
+msgstr "Vidarebefordra kundämne"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,probability:0
@@ -271,7 +273,7 @@ msgstr "Typ"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
-msgstr ""
+msgstr "E-Post"
 
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
@@ -286,7 +288,7 @@ msgstr "Lägsta"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
@@ -311,12 +313,12 @@ msgstr "Skapad datum"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
-msgstr ""
+msgstr "res.partner.activation"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Överliggande meddelande"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
@@ -346,7 +348,7 @@ msgstr "Juli"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Review"
-msgstr ""
+msgstr "Granskningsdatum"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -358,12 +360,12 @@ msgstr "Läge"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Att läsa"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@@ -423,7 +425,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@@ -467,7 +469,7 @@ msgstr "Öppningsdatum"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Undermeddelanden"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
@@ -483,17 +485,17 @@ msgstr "Ämne"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Innehåll"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Röster"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -658,12 +660,12 @@ msgstr "Planerade intäkter"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Partner Review"
-msgstr ""
+msgstr "Företagsgranskning"
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,period_id:0
 msgid "Invoice Period"
-msgstr ""
+msgstr "Faktureringsperiod"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_grade
@@ -724,7 +726,7 @@ msgstr "Öppen"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
-msgstr ""
+msgstr "Undertyp"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -739,12 +741,12 @@ msgstr "Aktuellt"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Kundämnen/affärsmöjligheter"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Aviserade företag"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -775,7 +777,7 @@ msgstr "Förväntad intäkt"
 #: field:res.partner,activation:0
 #: view:res.partner.activation:0
 msgid "Activation"
-msgstr ""
+msgstr "Aktivering"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -874,12 +876,12 @@ msgstr "CRM kundämnesrapport"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Författarläge"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modell för relaterade dokument"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
@@ -911,7 +913,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Inledande meddelande i tråd."
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index 3c6a082ee13..3f02cf80bc8 100644
--- a/addons/crm_profiling/i18n/sv.po
+++ b/addons/crm_profiling/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:51+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -26,7 +26,7 @@ msgstr "Frågelista"
 #: view:crm_profiling.question:0
 #: field:crm_profiling.question,answers_ids:0
 msgid "Avalaible Answers"
-msgstr ""
+msgstr "Tillgängliga svar"
 
 #. module: crm_profiling
 #: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
@@ -151,7 +151,7 @@ msgstr "Använd profileringsreglerna"
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You cannot create recursive profiles."
-msgstr ""
+msgstr "Fel ! Du kan inte skapa rekursiva profiler."
 
 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
@@ -200,4 +200,4 @@ msgstr "Spara data"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "or"
-msgstr ""
+msgstr "eller"
diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml
index 0b3de338808..0d1fd30fc5f 100644
--- a/addons/crm_todo/crm_todo_view.xml
+++ b/addons/crm_todo/crm_todo_view.xml
@@ -42,6 +42,17 @@
         
     
 
+    
+        project.task.form.crm
+        project.task
+        20
+        
+        
+            
+                
+            
+        
+    
 
     
         My Tasks
diff --git a/addons/crm_todo/i18n/sv.po b/addons/crm_todo/i18n/sv.po
index 37be50e77e6..fd01cb5f1d2 100644
--- a/addons/crm_todo/i18n/sv.po
+++ b/addons/crm_todo/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:51+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -30,7 +30,7 @@ msgstr "Tidsram"
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "Lead"
-msgstr ""
+msgstr "Kundämne"
 
 #. module: crm_todo
 #: view:crm.lead:0
@@ -67,7 +67,7 @@ msgstr "Avbryt"
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Kundämnen/affärsmöjligheter"
 
 #. module: crm_todo
 #: field:project.task,lead_id:0
diff --git a/addons/decimal_precision/i18n/sv.po b/addons/decimal_precision/i18n/sv.po
index 2646ec57d76..016840c0891 100644
--- a/addons/decimal_precision/i18n/sv.po
+++ b/addons/decimal_precision/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 20:55+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:06+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -26,7 +26,7 @@ msgstr "Siffror"
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
 #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
 msgid "Decimal Accuracy"
-msgstr "Decimal pression"
+msgstr "Decimalprecision"
 
 #. module: decimal_precision
 #: field:decimal.precision,name:0
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index 9defc222407..853ebfbfd4b 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-23 06:40+0000\n"
+"Last-Translator: Pedro Manuel Baeza \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-24 06:32+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -86,7 +86,7 @@ msgstr "Empresa que realiza el servicio de entrega."
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr "Orden entrega"
+msgstr "Albarán de salida"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
@@ -152,7 +152,7 @@ msgstr ""
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr "Orden entrega :"
+msgstr "Albarán de salida :"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -249,7 +249,7 @@ msgid ""
 "based on delivery order(s)."
 msgstr ""
 "Si no se 'Añade en presupuesto', el precio exacto se calculará cuando "
-"facture a partir de albaran(es)."
+"facture a partir de albarán(es)."
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -463,7 +463,7 @@ msgstr ""
 "
    \n"
 "Estos método permiten calcular automáticamente el precio del envío de "
 "acuerdo a su configuración: sobre el pedido de venta (basado en el "
-"presupuesto) o sobre la factura (basado en las órdenes de entrega).\n"
+"presupuesto) o sobre la factura (basado en los albaranes de salida).\n"
 "
    \n"
 "            "
 
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 363685d1707..b13330edfe7 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-05-21 16:09+0000\n"
-"Last-Translator: Florian Hatat \n"
+"PO-Revision-Date: 2014-03-17 13:18+0000\n"
+"Last-Translator: WANTELLET Sylvain \n"
 "Language-Team: French \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-18 06:21+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -619,7 +619,7 @@ msgstr "Prix de vente"
 #. module: delivery
 #: view:stock.picking.out:0
 msgid "Print Delivery Order"
-msgstr "Imprimer le bordereau de livraison"
+msgstr "Imprimer le bon de livraison"
 
 #. module: delivery
 #: view:delivery.grid:0
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index 2ff99b8a1b3..36bc1f25b67 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-03 10:23+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-04 07:07+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -30,7 +30,7 @@ msgstr "Leverans per post"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid " in Function of "
-msgstr ""
+msgstr " är en funktion av "
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -52,7 +52,7 @@ msgstr "Leveransmatrisrad"
 #: field:stock.move,weight_uom_id:0
 #: field:stock.picking,weight_uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -71,7 +71,7 @@ msgstr "Volym"
 #. module: delivery
 #: view:delivery.carrier:0
 msgid "Zip"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -93,6 +93,8 @@ msgstr "Utgående Leverans"
 #, python-format
 msgid "No line matched this product or order in the chosen delivery grid."
 msgstr ""
+"Ingen rad matchade denna produkt eller order inom det valda "
+"leveranskombinationen."
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
@@ -132,6 +134,19 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att skapa en leveransprislista för en viss "
+"region.\n"
+"               
    \n"
+"                 Med leveransprislistan kan du beräkna kostnaden och\n"
+"                 försäljningspriset för leveransen baserat på produkternas "
+"vikt\n"
+"                 och andra kriterier. Du kan definiera flera prislistor\n"
+"                 för varje leveransmetod: per land eller ett område i ett "
+"visst\n"
+"                 land som definieras av ett postnummerområde.\n"
+"               
    \n"
+"            "
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -151,7 +166,7 @@ msgstr "Mängd"
 #. module: delivery
 #: view:sale.order:0
 msgid "Add in Quote"
-msgstr ""
+msgstr "Lägg till på offert"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -204,7 +219,7 @@ msgstr "Matrisdefinition"
 #: code:addons/delivery/stock.py:90
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -224,7 +239,7 @@ msgstr "Kundorder"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Utgående Leveranser"
 
 #. module: delivery
 #: view:sale.order:0
@@ -232,6 +247,8 @@ msgid ""
 "If you don't 'Add in Quote', the exact price will be computed when invoicing "
 "based on delivery order(s)."
 msgstr ""
+"Om du inte \"Lägg i offert\", kommer det exakta priset beräknas vid "
+"fakturering baserad på leveransordern."
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -276,7 +293,7 @@ msgstr "Beloppsgräns för fri frakt i företagets valuta"
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
 msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+msgstr "Fritt vid ordertotal över"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
@@ -432,6 +449,21 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att definiera en ny leveransmetod.\n"
+"               
    \n"
+"                 Varje transportör (t.ex. UPS) kan ha flera leveransmetoder "
+"(t.ex.\n"
+"                 UPS Express, UPS Standard) med en uppsättning av "
+"prissättningsregler knuten\n"
+"                 till varje metod.\n"
+"               
    \n"
+"                 Dessa metoder gör det möjligt att automatiskt beräkna "
+"leveranspriset\n"
+"                 enligt dina inställningar; på kundordern (baserat på\n"
+"                 offert) eller faktura (baserat på leveransorder).\n"
+"               
    \n"
+"            "
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -465,7 +497,7 @@ msgstr "Fritt om det överstiger %.2f"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Inkommande leveranser"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -475,7 +507,7 @@ msgstr "<="
 #. module: delivery
 #: help:stock.picking,weight_uom_id:0
 msgid "Unit of measurement for Weight"
-msgstr ""
+msgstr "Viktsenhet"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -550,7 +582,7 @@ msgstr "Speditör"
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
 msgid "Delivery Methods"
-msgstr ""
+msgstr "Leveransmetoder"
 
 #. module: delivery
 #: code:addons/delivery/sale.py:57
@@ -577,7 +609,7 @@ msgstr "Försäljningspris"
 #. module: delivery
 #: view:stock.picking.out:0
 msgid "Print Delivery Order"
-msgstr ""
+msgstr "Skriv ut leveransorder"
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -589,7 +621,7 @@ msgstr "Tillstånd"
 #: help:stock.move,weight_uom_id:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
-msgstr ""
+msgstr "Enhet är måttenheten för vikt"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index 5bb98ab85fc..0a90370e382 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:53+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -50,7 +50,7 @@ msgstr "Gruppera på..."
 #. module: document
 #: view:ir.attachment:0
 msgid "Modification"
-msgstr ""
+msgstr "Ändring"
 
 #. module: document
 #: view:document.directory:0
@@ -92,7 +92,7 @@ msgstr "Directory Content"
 #. module: document
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mina dokument"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -257,7 +257,7 @@ msgstr ""
 #: code:addons/document/document.py:310
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -367,7 +367,7 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "på"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -426,7 +426,7 @@ msgstr "Statisk"
 #. module: document
 #: field:report.document.user,user:0
 msgid "unknown"
-msgstr ""
+msgstr "okänd"
 
 #. module: document
 #: view:document.directory:0
@@ -503,7 +503,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:6
 #, python-format
 msgid "Attachment(s)"
-msgstr ""
+msgstr "Bilaga(or)"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -591,7 +591,7 @@ msgstr "Katalognamnet måste vara unikt !"
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachments"
-msgstr ""
+msgstr "Bilagor"
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -747,7 +747,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:17
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. module: document
 #: field:document.directory.content,sequence:0
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index 4fb04446c30..dc2e1d31358 100644
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 12:39+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -45,7 +45,7 @@ msgstr ""
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
 
 #. module: document_ftp
 #: model:ir.actions.act_url,name:document_ftp.action_document_browse
@@ -55,7 +55,7 @@ msgstr "Bläddra bland filer"
 #. module: document_ftp
 #: help:knowledge.config.settings,document_ftp_url:0
 msgid "Click the url to browse the documents"
-msgstr ""
+msgstr "Klicka på url-en för att bläddra bland dokumenten"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -70,7 +70,7 @@ msgstr "FTP-serverkonfiguration"
 #. module: document_ftp
 #: field:knowledge.config.settings,document_ftp_url:0
 msgid "Browse Documents"
-msgstr ""
+msgstr "Dokumentbläddring"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
@@ -98,7 +98,7 @@ msgstr "Adress"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
@@ -118,7 +118,7 @@ msgstr "Dokumentbläddring"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
diff --git a/addons/document_page/i18n/sv.po b/addons/document_page/i18n/sv.po
index 9afe539e62e..a16fd2c7806 100644
--- a/addons/document_page/i18n/sv.po
+++ b/addons/document_page/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 21:19+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -23,13 +23,13 @@ msgstr ""
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: document_page
 #: view:document.page:0
 #: field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Senaste författare"
 
 #. module: document_page
 #: view:document.page:0
@@ -46,12 +46,12 @@ msgstr "Meny"
 #: view:document.page:0
 #: model:ir.model,name:document_page.model_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Dokumentsida"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_related_page_history
 msgid "Page History"
-msgstr ""
+msgstr "Sidhistorik"
 
 #. module: document_page
 #: view:document.page:0
@@ -64,12 +64,12 @@ msgstr "Innehåll"
 #. module: document_page
 #: view:document.page:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: document_page
 #: view:document.page:0
 msgid "Template"
-msgstr ""
+msgstr "Mall"
 
 #. module: document_page
 #: view:document.page:0
@@ -85,32 +85,32 @@ msgstr "Rubrik"
 #. module: document_page
 #: model:ir.model,name:document_page.model_document_page_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Skapa guide-meny"
 
 #. module: document_page
 #: field:document.page,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,create_uid:0
 msgid "Modified By"
-msgstr ""
+msgstr "Ändrad av"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Page type"
-msgstr ""
+msgstr "Sidtyp"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -121,7 +121,7 @@ msgstr "Menyinformation"
 #: view:document.page.history:0
 #: model:ir.model,name:document_page.model_document_page_history
 msgid "Document Page History"
-msgstr ""
+msgstr "Dokumentets sidhistorik"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_page_history
@@ -144,7 +144,7 @@ msgstr "Datum"
 #: 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 ""
+msgstr "Skillnad"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_page
@@ -156,12 +156,12 @@ msgstr "Sidor"
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_category
 msgid "Categories"
-msgstr ""
+msgstr "Kategorier"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -202,7 +202,7 @@ msgstr ""
 #. module: document_page
 #: view:document.page.history:0
 msgid "Document History"
-msgstr ""
+msgstr "Dokumenthistorik"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
@@ -212,12 +212,12 @@ msgstr "Menynamn"
 #. module: document_page
 #: field:document.page.history,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Sida"
 
 #. module: document_page
 #: field:document.page,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Historia"
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
@@ -227,6 +227,10 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                Klicka för att skapa en ny webbsida.\n"
+"              
    \n"
+"            "
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -238,14 +242,14 @@ msgstr "Skapa meny"
 #. module: document_page
 #: field:document.page,display_content:0
 msgid "Displayed Content"
-msgstr ""
+msgstr "Visa innehåll"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -261,9 +265,9 @@ msgstr "Skillnad"
 #. module: document_page
 #: view:document.page:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumenttyp"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Underordnade"
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index cd23b91aa7c..3fbb4d5f63d 100644
--- a/addons/document_webdav/i18n/sv.po
+++ b/addons/document_webdav/i18n/sv.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 15:06+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
 #: field:document.webdav.file.property,create_date:0
 msgid "Date Created"
-msgstr "Skapad datum"
+msgstr "Registreringsdatum"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
@@ -31,7 +31,7 @@ msgstr "Dokument"
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Document property"
-msgstr ""
+msgstr "Dokumentattribut"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -61,7 +61,7 @@ msgstr "document.webdav.file.property"
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr "Gruppera"
+msgstr "Gruppera på..."
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -122,7 +122,7 @@ msgstr "Värde"
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr "Katalog"
+msgstr "Mapp"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_uid:0
@@ -150,7 +150,7 @@ msgstr "Författare"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "Dokumentattribut"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 1ee89eb04c3..fbe53fa4efe 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -93,6 +93,8 @@ class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
         self.client_address = client_address
         self.server = server
         self.setup()
+        if hasattr(self, '_init_buffer'):
+            self._init_buffer()
 
     def get_userinfo(self, user, pw):
         return False
diff --git a/addons/edi/i18n/sv.po b/addons/edi/i18n/sv.po
index 5f6982a2fbf..f3533c11379 100644
--- a/addons/edi/i18n/sv.po
+++ b/addons/edi/i18n/sv.po
@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:16+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Orsak:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "Dokumentet har blivit korrekt importerat!"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Ursäkta, dokumentet kunde inte importeras."
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_company
@@ -53,13 +53,13 @@ msgstr "Valuta"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Dokumentimport avisering"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Saknad applikation"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -87,4 +87,4 @@ msgstr "Företag"
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI-undersystem"
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 8890226f28b..30417acb70a 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -305,7 +305,7 @@ class email_template(osv.osv):
                           is taken from template definition)
            :returns: a dict containing all relevant fields for creating a new
                      mail.mail entry, with one extra key ``attachments``, in the
-                     format expected by :py:meth:`mail_thread.message_post`.
+                     format [(report_name, data)] where data is base64 encoded.
         """
         if context is None:
             context = {}
@@ -340,6 +340,7 @@ class email_template(osv.osv):
                 ctx['lang'] = self.render_template(cr, uid, template.lang, template.model, res_id, context)
             service = netsvc.LocalService(report_service)
             (result, format) = service.create(cr, uid, [res_id], {'model': template.model}, ctx)
+            # TODO in trunk, change return format to binary to match message_post expected format
             result = base64.b64encode(result)
             if not report_name:
                 report_name = report_service
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 68a052c34b0..d774f5d0f27 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2014-01-25 17:53+0000\n"
-"Last-Translator: Ralf Hilgenstock \n"
+"PO-Revision-Date: 2014-04-05 22:03+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-26 05:15+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-06 06:53+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -494,7 +494,7 @@ msgstr ""
 #. module: email_template
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Lieferanten"
 
 #. module: email_template
 #: field:email.template,user_signature:0
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 73804617e12..4e0154d2e94 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 16:56+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -38,7 +38,7 @@ msgstr "Sidorutans knapp för att öppna sidorutans åtgärder"
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Hoppa av"
 
 #. module: email_template
 #: view:email.template:0
@@ -95,7 +95,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Preview"
-msgstr ""
+msgstr "Förhandsvisa"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -112,13 +112,13 @@ msgstr ""
 #: field:email.template,body_html:0
 #: field:email_template.preview,body_html:0
 msgid "Body"
-msgstr ""
+msgstr "Brödtext"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:247
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: email_template
 #: field:mail.compose.message,template_id:0
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index d6d04c8d328..89ad5bb3bdd 100644
--- a/addons/event/i18n/sv.po
+++ b/addons/event/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-17 23:45+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-04-09 09:57+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-10 06:46+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: event
 #: view:event.event:0
@@ -31,7 +31,7 @@ msgstr "Antal deltagare"
 #. module: event
 #: field:event.event,register_attended:0
 msgid "# of Participations"
-msgstr ""
+msgstr "# deltagare"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
@@ -57,6 +57,9 @@ msgid ""
 "enough registrations you are not able to confirm your event. (put 0 to "
 "ignore this rule )"
 msgstr ""
+"Du kan för varje händelse definierar en lägsta registreringsnivå. Om du inte "
+"tillräckligt med registreringar du inte kunna bekräfta ditt evenemang. "
+"(sätta 0 för att ignorera denna regel)"
 
 #. module: event
 #: field:event.registration,date_open:0
@@ -107,7 +110,7 @@ msgstr ""
 #. module: event
 #: field:event.type,default_registration_max:0
 msgid "Default Maximum Registration"
-msgstr ""
+msgstr "Största antal registrerade som standard"
 
 #. module: event
 #: view:report.event.registration:0
@@ -148,7 +151,7 @@ msgstr "Bekräftade evenemang"
 #. module: event
 #: view:event.event:0
 msgid "ZIP"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: event
 #: view:report.event.registration:0
@@ -220,7 +223,7 @@ msgstr "Inställd"
 #. module: event
 #: view:event.event:0
 msgid "ticket"
-msgstr ""
+msgstr "biljett"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -231,7 +234,7 @@ msgstr "Verdis opera"
 #: help:event.event,message_unread:0
 #: help:event.registration,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: event
 #: view:report.event.registration:0
@@ -242,17 +245,17 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "tickets"
-msgstr ""
+msgstr "biljetter"
 
 #. module: event
 #: view:event.event:0
 msgid "Street..."
-msgstr ""
+msgstr "Gata..."
 
 #. module: event
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falskt"
 
 #. module: event
 #: field:event.registration,event_end_date:0
@@ -266,6 +269,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: event
 #: view:report.event.registration:0
diff --git a/addons/event_moodle/i18n/sv.po b/addons/event_moodle/i18n/sv.po
new file mode 100644
index 00000000000..7035fd2bd8f
--- /dev/null
+++ b/addons/event_moodle/i18n/sv.po
@@ -0,0 +1,185 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-03-31 20:53+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with username and password"
+msgstr ""
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_moodle_config_wiz
+msgid "event.moodle.config.wiz"
+msgstr "event.moodle.config.wiz"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,server_moodle:0
+msgid ""
+"URL where you have your moodle server. For exemple: 'http://127.0.0.1' or "
+"'http://localhost'"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.registration,moodle_user_password:0
+msgid "Password for Moodle User"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_password:0
+msgid "Moodle Password"
+msgstr "Moodle lösenord"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Your email '%s' is wrong."
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Connection with a Token"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"The easiest way to connect OpenERP with a moodle server is to create a "
+"'token' in Moodle. It will be used to authenticate OpenERP as a trustable "
+"application."
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,url:0
+msgid "URL to Moodle Server"
+msgstr "URL till Moodleserver"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,url:0
+msgid "The url that will be used for the connection with moodle in xml-rpc"
+msgstr ""
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_registration
+msgid "Event Registration"
+msgstr "Evenemangsregistrering"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid ""
+"Another approach is to create a user for OpenERP in Moodle. If you do so, "
+"make sure that this user has appropriate access rights."
+msgstr ""
+
+#. module: event_moodle
+#: field:event.registration,moodle_uid:0
+msgid "Moodle User ID"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,server_moodle:0
+msgid "Moodle Server"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.event,moodle_id:0
+msgid "Moodle ID"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Server"
+msgstr "Server"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#: code:addons/event_moodle/event_moodle.py:105
+#: code:addons/event_moodle/event_moodle.py:137
+#, python-format
+msgid "Error!"
+msgstr "Fel!"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:105
+#, python-format
+msgid "You must configure your moodle connection."
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_username:0
+#: field:event.registration,moodle_username:0
+msgid "Moodle Username"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+#: model:ir.actions.act_window,name:event_moodle.configure_moodle
+msgid "Configure Moodle"
+msgstr ""
+
+#. module: event_moodle
+#: field:event.moodle.config.wiz,moodle_token:0
+msgid "Moodle Token"
+msgstr "Moodle-token"
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_username:0
+msgid ""
+"You can also connect with your username that you define when you create a "
+"token"
+msgstr ""
+
+#. module: event_moodle
+#: help:event.event,moodle_id:0
+msgid "The identifier of this event in Moodle"
+msgstr ""
+
+#. module: event_moodle
+#: help:event.moodle.config.wiz,moodle_token:0
+msgid "Put your token that you created in your moodle server"
+msgstr ""
+
+#. module: event_moodle
+#: model:ir.ui.menu,name:event_moodle.wizard_moodle
+msgid "Moodle Configuration"
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "or"
+msgstr "eller"
+
+#. module: event_moodle
+#: code:addons/event_moodle/event_moodle.py:57
+#, python-format
+msgid "First configure your moodle connection."
+msgstr ""
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Apply"
+msgstr "Verkställ"
+
+#. module: event_moodle
+#: view:event.moodle.config.wiz:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: event_moodle
+#: model:ir.model,name:event_moodle.model_event_event
+msgid "Event"
+msgstr "Händelse"
diff --git a/addons/event_sale/i18n/sv.po b/addons/event_sale/i18n/sv.po
new file mode 100644
index 00000000000..bcaf87f3948
--- /dev/null
+++ b/addons/event_sale/i18n/sv.po
@@ -0,0 +1,90 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-03-31 20:57+0000\n"
+"Last-Translator: Anders Wallenquist \n"
+"Language-Team: Swedish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "Produkt"
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sales order line."
+msgstr ""
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr ""
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Select event types so when we use this product in sales order lines, it will "
+"filter events of this type only."
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "Evenemangstyp"
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr "event_ok"
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr "Evenemangstyp"
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr ""
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr "Händelse"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Orderrad"
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index faaf391a2a7..81d66294521 100644
--- a/addons/fetchmail/i18n/sv.po
+++ b/addons/fetchmail/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-27 12:42+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:09+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -70,7 +70,7 @@ msgstr ""
 #. module: fetchmail
 #: view:base.config.settings:0
 msgid "Configure the incoming email gateway"
-msgstr ""
+msgstr "Konfigurera den inkomande e-postbryggan"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -101,7 +101,7 @@ msgstr "Lokal server"
 #. module: fetchmail
 #: field:fetchmail.server,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -121,7 +121,7 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_config_settings
 msgid "fetchmail.config.settings"
-msgstr ""
+msgstr "fetchmail.config.settings"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
@@ -150,7 +150,7 @@ msgstr "Behåll original"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Avancerade alternativ"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -196,6 +196,8 @@ msgid ""
 "Here is what we got instead:\n"
 " %s."
 msgstr ""
+"Detta fick vi istället:\n"
+" %s"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -240,7 +242,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Utgående e-post"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
diff --git a/addons/fleet/i18n/sv.po b/addons/fleet/i18n/sv.po
index 14c66351e82..2883735942c 100644
--- a/addons/fleet/i18n/sv.po
+++ b/addons/fleet/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-17 23:59+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-27 13:28+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:09+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -30,7 +30,7 @@ msgstr "Kompakt"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_1
 msgid "A/C Compressor Replacement"
-msgstr ""
+msgstr "Byte av komfortkyla"
 
 #. module: fleet
 #: help:fleet.vehicle,vin_sn:0
@@ -42,7 +42,7 @@ msgstr ""
 #: view:fleet.vehicle.log.contract:0
 #: view:fleet.vehicle.log.services:0
 msgid "Service"
-msgstr ""
+msgstr "Service"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
@@ -58,12 +58,12 @@ msgstr "Okänt"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_20
 msgid "Engine/Drive Belt(s) Replacement"
-msgstr ""
+msgstr "Kamremsbyte"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Vehicle costs"
-msgstr ""
+msgstr "Fordonskostnad"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -74,7 +74,7 @@ msgstr "Diesel"
 #: code:addons/fleet/fleet.py:421
 #, python-format
 msgid "License Plate: from '%s' to '%s'"
-msgstr ""
+msgstr "Registreringsskylt från '%s' till '%s'"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_38
@@ -90,7 +90,7 @@ msgstr "Gruppera efter..."
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_32
 msgid "Oil Pump Replacement"
-msgstr ""
+msgstr "Byte oljepump"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_18
@@ -142,7 +142,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,liter:0
 msgid "Liter"
-msgstr ""
+msgstr "Liter"
 
 #. module: fleet
 #: model:ir.actions.client,name:fleet.action_fleet_menu
@@ -152,22 +152,22 @@ msgstr ""
 #. module: fleet
 #: view:board.board:0
 msgid "Fuel Costs"
-msgstr ""
+msgstr "Bränslekostnader"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_9
 msgid "Battery Inspection"
-msgstr ""
+msgstr "Batteriinspektion"
 
 #. module: fleet
 #: field:fleet.vehicle,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bolag"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Fakturadatum"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
@@ -209,7 +209,7 @@ msgstr ""
 #: view:fleet.vehicle:0
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Services"
-msgstr ""
+msgstr "Servicetillfällen"
 
 #. module: fleet
 #: help:fleet.vehicle,odometer:0
@@ -222,7 +222,7 @@ msgstr ""
 #: view:fleet.vehicle.log.contract:0
 #: field:fleet.vehicle.log.contract,notes:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Villkor"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
@@ -238,7 +238,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Total kostnad"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
@@ -255,7 +255,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Terminate Contract"
-msgstr ""
+msgstr "Avsluta avtal"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,parent_id:0
diff --git a/addons/google_base_account/i18n/sv.po b/addons/google_base_account/i18n/sv.po
index 3027e546f0c..be0a6c077df 100644
--- a/addons/google_base_account/i18n/sv.po
+++ b/addons/google_base_account/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 21:21+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:09+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -36,12 +36,12 @@ msgstr "Google kontaktimportfel!"
 #. module: google_base_account
 #: model:ir.model,name:google_base_account.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: google_base_account
 #: view:google.login:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: google_base_account
 #: view:google.login:0
@@ -57,7 +57,7 @@ msgstr "Google-lösenord"
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: google_base_account
 #: view:res.users:0
@@ -67,7 +67,7 @@ msgstr "Google-konto"
 #. module: google_base_account
 #: view:res.users:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Synkronisering"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
@@ -78,7 +78,7 @@ msgstr ""
 #. module: google_base_account
 #: view:google.login:0
 msgid "e.g. user@gmail.com"
-msgstr ""
+msgstr "e.g. user@gmail.com"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
@@ -98,7 +98,7 @@ msgstr "Google-kontakt"
 #. module: google_base_account
 #: view:google.login:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: google_base_account
 #: field:google.login,user:0
diff --git a/addons/google_docs/i18n/hi.po b/addons/google_docs/i18n/hi.po
new file mode 100644
index 00000000000..7b7f84e728b
--- /dev/null
+++ b/addons/google_docs/i18n/hi.po
@@ -0,0 +1,188 @@
+# Hindi translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-03-18 11:17+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Hindi \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-03-19 06:29+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:167
+#, python-format
+msgid "Key Error!"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a presentation (slide show) document with url like "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, the ID is `presentation:123456789`"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a text document with url like "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
+"`document:123456789`"
+msgstr ""
+
+#. module: google_docs
+#: field:google.docs.config,gdocs_resource_id:0
+msgid "Google Resource ID to Use as Template"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a drawing document with url like "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
+"`drawings:123456789`"
+msgstr ""
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/xml/gdocs.xml:6
+#, python-format
+msgid "Add Google Doc..."
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"This is the id of the template document, on google side. You can find it "
+"thanks to its URL:"
+msgstr ""
+
+#. module: google_docs
+#: model:ir.model,name:google_docs.model_google_docs_config
+msgid "Google Docs templates config"
+msgstr ""
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/js/gdocs.js:25
+#, python-format
+msgid ""
+"The user google credentials are not set yet. Contact your administrator for "
+"help."
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid ""
+"for a spreadsheet document with url like "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"the ID is `spreadsheet:123456789`"
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:129
+#, python-format
+msgid ""
+"Your resource id is not correct. You can find the id in the google docs URL."
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:153
+#, python-format
+msgid "Creating google docs may only be done by one at a time."
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:83
+#: code:addons/google_docs/google_docs.py:129
+#: code:addons/google_docs/google_docs.py:153
+#, python-format
+msgid "Google Docs Error!"
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:83
+#, python-format
+msgid "Check your google configuration in Users/Users/Synchronization tab."
+msgstr ""
+
+#. module: google_docs
+#: model:ir.ui.menu,name:google_docs.menu_gdocs_config
+msgid "Google Docs configuration"
+msgstr ""
+
+#. module: google_docs
+#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config
+#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config
+msgid "Models configuration"
+msgstr ""
+
+#. module: google_docs
+#: field:google.docs.config,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: google_docs
+#. openerp-web
+#: code:addons/google_docs/static/src/js/gdocs.js:28
+#, python-format
+msgid "User Google credentials are not yet set."
+msgstr ""
+
+#. module: google_docs
+#: code:addons/google_docs/google_docs.py:167
+#, python-format
+msgid "Your Google Doc Name Pattern's key does not found in object."
+msgstr ""
+
+#. module: google_docs
+#: help:google.docs.config,name_template:0
+msgid ""
+"Choose how the new google docs will be named, on google side. Eg. "
+"gdoc_%(field_name)s"
+msgstr ""
+
+#. module: google_docs
+#: view:google.docs.config:0
+msgid "Google Docs Configuration"
+msgstr ""
+
+#. module: google_docs
+#: help:google.docs.config,gdocs_resource_id:0
+msgid ""
+"\n"
+"This is the id of the template document, on google side. You can find it "
+"thanks to its URL: \n"
+"*for a text document with url like "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
+"`document:123456789`\n"
+"*for a spreadsheet document with url like "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"the ID is `spreadsheet:123456789`\n"
+"*for a presentation (slide show) document with url like "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, the ID is `presentation:123456789`\n"
+"*for a drawing document with url like "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
+"`drawings:123456789`\n"
+"...\n"
+msgstr ""
+
+#. module: google_docs
+#: model:ir.model,name:google_docs.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: google_docs
+#: field:google.docs.config,name_template:0
+msgid "Google Doc Name Pattern"
+msgstr ""
diff --git a/addons/hr/i18n/am.po b/addons/hr/i18n/am.po
new file mode 100644
index 00000000000..8fcfd7d61f4
--- /dev/null
+++ b/addons/hr/i18n/am.po
@@ -0,0 +1,979 @@
+# Amharic translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-04-08 13:09+0000\n"
+"Last-Translator: biniyam \n"
+"Language-Team: Amharic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_openerpuser0
+msgid "Openerp user"
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_timesheet_sheet:0
+msgid "Allow timesheets validation by managers"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "አስፈላጊ"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "የሰራተኞች መረጃ ማገናኘት"
+
+#. module: hr
+#: field:hr.employee,sinid:0
+msgid "SIN No"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+#: model:ir.ui.menu,name:hr.menu_hr_dashboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+#: model:ir.ui.menu,name:hr.menu_hr_root
+#: model:ir.ui.menu,name:hr.menu_human_resources_configuration
+msgid "Human Resources"
+msgstr "የሰው ሀይል አስተዳደር"
+
+#. module: hr
+#: help:hr.employee,image_medium:0
+msgid ""
+"Medium-sized photo of the employee. It is automatically resized as a "
+"128x128px image, with aspect ratio preserved. Use this field in form views "
+"or some kanban views."
+msgstr ""
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Time Tracking"
+msgstr "ግዜመያዣ"
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "በቡድን"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.view_department_form_installer
+msgid "Create Your Departments"
+msgstr "የስራ መደቦችን መፍጠር"
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employees currently occupying this job position."
+msgstr "በስራ መደቡ ላይ የታቀፍ የሰራተኞች ብዛት"
+
+#. module: hr
+#: field:hr.config.settings,module_hr_evaluation:0
+msgid "Organize employees periodic evaluation"
+msgstr "ሰራተኞች የመመዘኛ ጊዜ"
+
+#. module: hr
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
+msgid "Department"
+msgstr "የስራ ክፍል"
+
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work Email"
+msgstr "የስራ ኢሜይል"
+
+#. module: hr
+#: help:hr.employee,image:0
+msgid ""
+"This field holds the image used as photo for the employee, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_holidays:0
+msgid "This installs the module hr_holidays."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "ስራ"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "ቅጥር"
+
+#. module: hr
+#: field:hr.job,message_unread:0
+msgid "Unread Messages"
+msgstr "ያልተነበቡ መልእክቶች"
+
+#. module: hr
+#: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
+msgid "Company"
+msgstr "ድርጅት"
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "በቅጥር ላይ የሚጠበቅ"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Other Information ..."
+msgstr "የተለያዩ መረጃዎች"
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error! You cannot create recursive Categories."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_recruitment:0
+msgid "This installs the module hr_recruitment."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Birth"
+msgstr "የተወለደበት"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Employee Tags"
+msgstr "የሰራተኛው መገለጫ"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Launch Recruitement"
+msgstr "የቅጥር ማስታወቅያ ማውጣት"
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr "ተጠቃሚውን ከሰራተኞች ጋር ማገናኘት"
+
+#. module: hr
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Leaves"
+msgstr "ፍቃዶች"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Married"
+msgstr "ያገባ"
+
+#. module: hr
+#: field:hr.job,message_ids:0
+msgid "Messages"
+msgstr "መልእክቶች"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Talent Management"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_timesheet_sheet:0
+msgid "This installs the module hr_timesheet_sheet."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Mobile:"
+msgstr "ተንቀሳቃሽ ስልክ"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr "የስራ መደብ"
+
+#. module: hr
+#: help:hr.job,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,color:0
+msgid "Color Index"
+msgstr "የከለሮች ድብልቅ"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image_medium:0
+msgid "Medium-sized photo"
+msgstr "አነስተኛ መጠን ያለው ፎቶ"
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr "የመለያ ቁጥር"
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Female"
+msgstr "ሴት"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendance"
+msgstr "የሰራተኞች ሰአት መቆጣጠርያ"
+
+#. module: hr
+#: field:hr.employee,work_phone:0
+msgid "Work Phone"
+msgstr "የቢሮ ስልክ"
+
+#. module: hr
+#: field:hr.employee.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr "የስራው መገለጫ"
+
+#. module: hr
+#: field:hr.employee,work_location:0
+msgid "Office Location"
+msgstr "የቢሮው አድራሻ"
+
+#. module: hr
+#: field:hr.job,message_follower_ids:0
+msgid "Followers"
+msgstr "ተከታታይ"
+
+#. module: hr
+#: view:hr.employee:0
+#: model:ir.model,name:hr.model_hr_employee
+#: model:process.node,name:hr.process_node_employee0
+msgid "Employee"
+msgstr "ተቀጣሪ"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr "ሊሎች መረጃወች"
+
+#. module: hr
+#: help:hr.employee,image_small:0
+msgid ""
+"Small-sized photo of the employee. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr "የውልድት ቀን"
+
+#. module: hr
+#: help:hr.job,no_of_recruitment:0
+msgid "Number of new employees you expect to recruit."
+msgstr "አዲስ ይቀጠራሉ ተብሎ የሚጠበቅ የሰራተኞች ብዛት"
+
+#. module: hr
+#: model:ir.actions.client,name:hr.action_client_hr_menu
+msgid "Open HR Menu"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_account_analytic_analysis:0
+msgid ""
+"This installs the module account_analytic_analysis, which will install sales "
+"management too."
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "Human Resources Dashboard"
+msgstr "የሰው ሀይል አስተዳደር የመረጃ ስሊዳ"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr "ስራ"
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "Current Number of Employees"
+msgstr "አሁን ያለው የሰራተኞች ብዛት"
+
+#. module: hr
+#: field:hr.department,member_ids:0
+msgid "Members"
+msgstr "አባላቶች"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "ማስተካከያዎች"
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr "የሰራተኞች ቅጽ"
+
+#. module: hr
+#: field:hr.config.settings,module_hr_expense:0
+msgid "Manage employees expenses"
+msgstr "የሰራተኞችን ወጪ መከታተያ"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Tel:"
+msgstr "ስልክ"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Divorced"
+msgstr "አግብቶ የፈታ"
+
+#. module: hr
+#: field:hr.employee.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
+#: model:ir.actions.act_window,name:hr.open_module_tree_department
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+msgid "Departments"
+msgstr "ክፍሎች"
+
+#. module: hr
+#: model:process.node,name:hr.process_node_employeecontact0
+msgid "Employee Contact"
+msgstr "የሰራተኛው ተጠሪ"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "e.g. Part Time"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"
    \n"
+"                Click to define a new job position.\n"
+"              
    \n"
+"                Job Positions are used to define jobs and their "
+"requirements.\n"
+"                You can keep track of the number of employees you have per "
+"job\n"
+"                position and follow the evolution according to what you "
+"planned\n"
+"                for the future.\n"
+"              
    \n"
+"                You can attach a survey to a job position. It will be used "
+"in\n"
+"                the recruitment process to evaluate the applicants for this "
+"job\n"
+"                position.\n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: hr
+#: selection:hr.employee,gender:0
+msgid "Male"
+msgstr "ወንድ"
+
+#. module: hr
+#: view:hr.employee:0
+msgid ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_evaluation:0
+msgid "This installs the module hr_evaluation."
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_attendance:0
+msgid "This installs the module hr_attendance."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,image_small:0
+msgid "Smal-sized photo"
+msgstr "አንስተኛ መጠን ያላቸው ፎቶዎች"
+
+#. module: hr
+#: view:hr.employee.category:0
+#: model:ir.model,name:hr.model_hr_employee_category
+msgid "Employee Category"
+msgstr "የሰራተኞች መድብ"
+
+#. module: hr
+#: field:hr.employee,category_ids:0
+msgid "Tags"
+msgstr "ምልክት"
+
+#. module: hr
+#: help:hr.config.settings,module_hr_contract:0
+msgid "This installs the module hr_contract."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Related User"
+msgstr "ተጠቃሚዎች"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "or"
+msgstr "ወይም"
+
+#. module: hr
+#: field:hr.employee.category,name:0
+msgid "Category"
+msgstr "ምድብ"
+
+#. module: hr
+#: view:hr.job:0
+msgid "Stop Recruitment"
+msgstr "ቅጥር ማቆም"
+
+#. module: hr
+#: field:hr.config.settings,module_hr_attendance:0
+msgid "Install attendances feature"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr "የሰራተኞች የባንክ ቁጥር"
+
+#. module: hr
+#: field:hr.department,note:0
+msgid "Note"
+msgstr "ማስታወሻ"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_view_employee_tree
+msgid "Employees Structure"
+msgstr "የሰራተኞች መዋቅር"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Contact Information"
+msgstr "የግንኙነት መረጃ"
+
+#. module: hr
+#: field:res.users,employee_ids:0
+msgid "Related employees"
+msgstr "ተመሳሳይ ሰራተኞች"
+
+#. module: hr
+#: field:hr.config.settings,module_hr_holidays:0
+msgid "Manage holidays, leaves and allocation requests"
+msgstr "የባዕልና የረፍት ቀኖች መቆጣጠር"
+
+#. module: hr
+#: field:hr.department,child_ids:0
+msgid "Child Departments"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "Status"
+msgstr "ሁኔታው"
+
+#. module: hr
+#: field:hr.employee,otherid:0
+msgid "Other Id"
+msgstr "የተለየ መለያ"
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr "የሰራተኛው ውል"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Contracts"
+msgstr "ውሎች"
+
+#. module: hr
+#: help:hr.job,message_ids:0
+msgid "Messages and communication history"
+msgstr "የመልእክትና ግንኙነት ታሪኮች"
+
+#. module: hr
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,message_is_follower:0
+msgid "Is a Follower"
+msgstr "ተከታይ ነው"
+
+#. module: hr
+#: field:hr.config.settings,module_hr_recruitment:0
+msgid "Manage the recruitment process"
+msgstr "የቅጥሩን አካሄድ መቆጣጠር"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Active"
+msgstr "ግልፅ"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Human Resources Management"
+msgstr "የሰውሀይል አስተዳደር"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Install your country's payroll"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account Number"
+msgstr "የባንክ ሂሳብ ቁጥር"
+
+#. module: hr
+#: view:hr.department:0
+msgid "Companies"
+msgstr "ድርጅት"
+
+#. module: hr
+#: field:hr.job,message_summary:0
+msgid "Summary"
+msgstr "ማጠቃለያ"
+
+#. module: hr
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"
    \n"
+"                Click to add a new employee.\n"
+"              
    \n"
+"                With just a quick glance on the OpenERP employee screen, "
+"you\n"
+"                can easily find all the information you need for each "
+"person;\n"
+"                contact data, job position, availability, etc.\n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "HR Settings"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Citizenship & Other Info"
+msgstr "ዜግነት እና የተለያዩ መረጃዎች"
+
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You cannot create recursive departments."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "የስራ አድራሻ"
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Public Information"
+msgstr "ይፋዊ መረጃ"
+
+#. module: hr
+#: field:hr.employee,marital:0
+msgid "Marital Status"
+msgstr "የጋብቻ ሁኔታ"
+
+#. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr "የቅርብ ተጠሪ"
+
+#. module: hr
+#: field:hr.employee,image:0
+msgid "Photo"
+msgstr "ምስል"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Cancel"
+msgstr "መሰረዝይ"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"
    \n"
+"                Click to create a department.\n"
+"              
    \n"
+"                OpenERP's department structure is used to manage all "
+"documents\n"
+"                related to employees by departments: expenses, timesheets,\n"
+"                leaves and holidays, recruitments, etc.\n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: hr
+#: help:hr.config.settings,module_hr_timesheet:0
+msgid "This installs the module hr_timesheet."
+msgstr "የጊዜ ሰሌዳን ይጭናል"
+
+#. module: hr
+#: help:hr.job,expected_employees:0
+msgid ""
+"Expected number of employees for this job position after new recruitment."
+msgstr "ከመጀመርያው የቅጥር ሂደት በኋላ የሚጠበቀው የሰው ሀይል ብዛት"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.view_department_form_installer
+msgid ""
+"
    \n"
+"                Click to define a new department.\n"
+"              
    \n"
+"                Your departments structure is used to manage all documents\n"
+"                related to employees by departments: expenses and "
+"timesheets,\n"
+"                leaves and holidays, recruitments, etc.\n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Personal Information"
+msgstr "የግል መረጃ"
+
+#. module: hr
+#: field:hr.employee,city:0
+msgid "City"
+msgstr "ከተማ"
+
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr "የድንበርየለሽ መታወቂያ ቁጥር"
+
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Work Mobile"
+msgstr "ተንቀሳቃሽ የስራ ስልክ"
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Recruitement in Progress"
+msgstr "የቅጥር ሂደት ያለበት ደረጃ"
+
+#. module: hr
+#: field:hr.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allow invoicing based on timesheets (the sale application will be installed)"
+msgstr "በግዜው ሰሌዳ ደረሰኝ ፍቀድ"
+
+#. module: hr
+#: code:addons/hr/hr.py:221
+#, python-format
+msgid "Welcome to %s! Please help him/her take the first steps with OpenERP!"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.category:0
+msgid "Employees Categories"
+msgstr "የሰራተኞች የስራ መደብ"
+
+#. module: hr
+#: field:hr.employee,address_home_id:0
+msgid "Home Address"
+msgstr "የቤት አድራሻ"
+
+#. module: hr
+#: field:hr.config.settings,module_hr_timesheet:0
+msgid "Manage timesheets"
+msgstr "የጊዜ ሰሌዳውን አደራጅ"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_payroll_modules
+msgid "Payroll"
+msgstr "የደሞዝ መክፈያ ቅጽ"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Single"
+msgstr "ያላገባ"
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr "የስራው መደብ ስም"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Position"
+msgstr "የስራ ሹመት"
+
+#. module: hr
+#: help:hr.config.settings,module_hr_payroll:0
+msgid "This installs the module hr_payroll."
+msgstr ""
+
+#. module: hr
+#: field:hr.config.settings,module_hr_contract:0
+msgid "Record contracts per employee"
+msgstr "የእያንዳንዱን የሰራተኛ የቅጥር ውል ሙላ"
+
+#. module: hr
+#: view:hr.department:0
+msgid "department"
+msgstr "የስራ ክፍል"
+
+#. module: hr
+#: field:hr.employee,country_id:0
+msgid "Nationality"
+msgstr "ዜግነት"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Additional Features"
+msgstr "ተጨማሪ ግልጋሎቶች"
+
+#. module: hr
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "ማስታወሻዎች"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action2
+msgid "Subordinate Hierarchy"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr "ሀብት"
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee,name_related:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr "ስም"
+
+#. module: hr
+#: field:hr.employee,gender:0
+msgid "Gender"
+msgstr "ፆታ"
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee.category,employee_ids:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
+#: model:ir.actions.act_window,name:hr.open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+msgid "Employees"
+msgstr "ሰራተኞች"
+
+#. module: hr
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr "የጤና መድን ቁጥር"
+
+#. module: hr
+#: field:hr.department,name:0
+msgid "Department Name"
+msgstr "የስራ ክፍሉ ስም"
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
+msgid "Reports"
+msgstr "አጠቃላይ መግለጫ"
+
+#. module: hr
+#: field:hr.config.settings,module_hr_payroll:0
+msgid "Manage payroll"
+msgstr "የደሞዝ መክፍያ ቅፅን መቆጣጠር"
+
+#. module: hr
+#: view:hr.config.settings:0
+#: model:ir.actions.act_window,name:hr.action_human_resources_configuration
+msgid "Configure Human Resources"
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "No Recruitment"
+msgstr "ምንም ቅጥር የለም"
+
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,login:0
+msgid "Login"
+msgstr "ግባ"
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Total Forecasted Employees"
+msgstr "የሜጠበቀው የሰራተኞች ብዛት"
+
+#. module: hr
+#: help:hr.job,state:0
+msgid ""
+"By default 'In position', set it to 'In Recruitment' if recruitment process "
+"is going on for this job position."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "Users"
+msgstr "ተጠቃሚዎች"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr "የሰራ መደብ"
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_board_hr
+msgid ""
+"
    \n"
+"                  
    \n"
+"                    Human Resources dashboard is empty.\n"
+"                  
    \n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click 'Add "
+"to\n"
+"                    Dashboard' in the extended search options.\n"
+"                  
    \n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  
    \n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr "ተቆጣጣሪ"
+
+#. module: hr
+#: sql_constraint:hr.job:0
+msgid "The name of the job position must be unique per company!"
+msgstr "የስራው መደብ ስም በየድርጅቱ የተለያየ መሆን አለበት"
+
+#. module: hr
+#: help:hr.config.settings,module_hr_expense:0
+msgid "This installs the module hr_expense."
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,manager_id:0
+#: view:hr.employee:0
+#: field:hr.employee,parent_id:0
+msgid "Manager"
+msgstr "አስተዳዳሪ"
+
+#. module: hr
+#: selection:hr.employee,marital:0
+msgid "Widower"
+msgstr "የፈታ"
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "የበላይ አካል"
+
+#. module: hr
+#: view:hr.config.settings:0
+msgid "Apply"
+msgstr "ማመልከት"
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index ad14389644b..37d18af6be5 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-21 03:38+0000\n"
+"PO-Revision-Date: 2014-04-18 02:39+0000\n"
 "Last-Translator: Yoshi Tashiro \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-22 07:32+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,7 +25,7 @@ msgstr "OpenERPユーザ"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "マネジャーによるタイムシート検証"
 
 #. module: hr
 #: field:hr.job,requirements:0
@@ -111,7 +111,7 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_holidays:0
 msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "hr_holidays モジュールをインストールします。"
 
 #. module: hr
 #: view:hr.job:0
@@ -126,7 +126,7 @@ msgstr "採用中"
 #. module: hr
 #: field:hr.job,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未読メッセージ"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -144,7 +144,7 @@ msgstr "採用予定"
 #. module: hr
 #: view:hr.employee:0
 msgid "Other Information ..."
-msgstr ""
+msgstr "その他情報..."
 
 #. module: hr
 #: constraint:hr.employee.category:0
@@ -154,7 +154,7 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "hr_recruitment モジュールをインストールします。"
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index 453bf89fe52..5ab2cd2ffb5 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-01 18:23+0000\n"
-"Last-Translator: gobi \n"
+"PO-Revision-Date: 2014-03-28 02:50+0000\n"
+"Last-Translator: Jacara \n"
 "Language-Team: Mongolian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-02 06:00+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-29 07:30+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -541,7 +541,7 @@ msgstr "Ажилчдын бүтэц"
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "Гэрээний мэдээлэл"
+msgstr "Холбоо барих мэдээлэл"
 
 #. module: hr
 #: field:res.users,employee_ids:0
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index ba8c57ea3b2..54fd74a5609 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-04 06:48+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:10+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -25,7 +25,7 @@ msgstr "OpenERP användare"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "Tillåter att tidrapporter granskas av närmaste chef"
 
 #. module: hr
 #: field:hr.job,requirements:0
@@ -59,11 +59,14 @@ msgid ""
 "128x128px image, with aspect ratio preserved. Use this field in form views "
 "or some kanban views."
 msgstr ""
+"Medelstort foto av den anställde. Det storleksändras automatiskt till "
+"128x128px , med bildförhållande bevaras. Använd det här fältet i formulär "
+"vyer eller några Kanban vyer."
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Time Tracking"
-msgstr ""
+msgstr "Tidrapporter"
 
 #. module: hr
 #: view:hr.employee:0
@@ -79,12 +82,12 @@ msgstr "Skapa din avdelning"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "Antal anställda som förnärvarande innehar denna befattning."
 
 #. module: hr
 #: field:hr.config.settings,module_hr_evaluation:0
 msgid "Organize employees periodic evaluation"
-msgstr ""
+msgstr "Anordna strukturerad utvärdering av personalen"
 
 #. module: hr
 #: view:hr.department:0
@@ -107,11 +110,12 @@ msgid ""
 "This field holds the image used as photo for the employee, limited to "
 "1024x1024px."
 msgstr ""
+"Detta fält innehåller ett foto av den anställde, begränsat till 1024x1024px."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_holidays:0
 msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "Detta installerar modulen hr_holidays"
 
 #. module: hr
 #: view:hr.job:0
@@ -126,7 +130,7 @@ msgstr "I anställningsprocessen"
 #. module: hr
 #: field:hr.job,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -144,33 +148,33 @@ msgstr "Rekryteringsbehov"
 #. module: hr
 #: view:hr.employee:0
 msgid "Other Information ..."
-msgstr ""
+msgstr "Övrig information ..."
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error! You cannot create recursive Categories."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva kategorier."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "Detta installerar modulen hr_recruitment."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Birth"
-msgstr ""
+msgstr "Född"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Employee Tags"
-msgstr ""
+msgstr "Medarbetaretiketter"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Launch Recruitement"
-msgstr ""
+msgstr "Starta rekrytering"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -195,32 +199,32 @@ msgstr "Gift"
 #. module: hr
 #: field:hr.job,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Talent Management"
-msgstr ""
+msgstr "Kompetensutveckling"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "This installs the module hr_timesheet_sheet."
-msgstr ""
+msgstr "Detta installerar modulen hr_timesheet_sheet."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Mobil:"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Tjänst"
 
 #. module: hr
 #: help:hr.job,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -239,7 +243,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Medelstort foto"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -280,7 +284,7 @@ msgstr "Kontorsplats"
 #. module: hr
 #: field:hr.job,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr
 #: view:hr.employee:0
@@ -301,6 +305,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Litet foto av den anställde. Det storleksändras automatiskt till 64x64px, "
+"men bildförhållandet bevaras. Använd det här fältet i de fall en liten bild "
+"krävs."
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -310,12 +317,12 @@ msgstr "Födelsedatum"
 #. module: hr
 #: help:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Antal nya personer som väntas anställas"
 
 #. module: hr
 #: model:ir.actions.client,name:hr.action_client_hr_menu
 msgid "Open HR Menu"
-msgstr ""
+msgstr "Öppna personalmenyn"
 
 #. module: hr
 #: help:hr.job,message_summary:0
@@ -323,6 +330,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr
 #: help:hr.config.settings,module_account_analytic_analysis:0
@@ -330,6 +339,8 @@ msgid ""
 "This installs the module account_analytic_analysis, which will install sales "
 "management too."
 msgstr ""
+"Detta installerar modulen account_analytic_analysis, vilket kommer att "
+"installera kundorder också."
 
 #. module: hr
 #: view:board.board:0
@@ -346,7 +357,7 @@ msgstr "Jobb"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Current Number of Employees"
-msgstr ""
+msgstr "Aktuellt antal anställda"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -366,12 +377,12 @@ msgstr "Anställdsformulär och struktur"
 #. module: hr
 #: field:hr.config.settings,module_hr_expense:0
 msgid "Manage employees expenses"
-msgstr ""
+msgstr "Utläggshantering"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
-msgstr ""
+msgstr "Tel:"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -398,7 +409,7 @@ msgstr "Kontakt för den anställde"
 #. module: hr
 #: view:hr.employee:0
 msgid "e.g. Part Time"
-msgstr ""
+msgstr "eg Deltid"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -422,6 +433,22 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                 Klicka för att definiera en ny befattning. \n"
+"               
     \n"
+"                 Befattningar används för att definiera arbetsuppgifter och "
+"deras krav. \n"
+"                 Du kan hålla reda på hur många anställda du har per "
+"befattning \n"
+"                 och följa utvecklingen efter vad du planerat \n"
+"                 för framtiden. \n"
+"               
     \n"
+"                 Du kan bifoga en enkät till en befattning. Den kommer att "
+"användas i \n"
+"                 rekryteringsprocessen för att utvärdera sökande till "
+"befattningen. \n"
+"               
    \n"
+"            "
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -434,26 +461,28 @@ msgid ""
 "$('.oe_employee_picture').load(function() { if($(this).width() > "
 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "Detta installerar modulen hr_evaluation."
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "Fel! Rekusriva hierarkier med anställda ej möjligt-"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "Detta installerar modulen hr_attendance"
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Litet foto"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -464,12 +493,12 @@ msgstr "Anställningskategori"
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "Detta installerar modulen hr_contract"
 
 #. module: hr
 #: view:hr.employee:0
@@ -479,7 +508,7 @@ msgstr "Relaterad användare"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -489,12 +518,12 @@ msgstr "Kategori"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "Avsluta rekryteringen"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "Installerar närvarofunktionerna"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -519,12 +548,12 @@ msgstr "Kontaktinformation"
 #. module: hr
 #: field:res.users,employee_ids:0
 msgid "Related employees"
-msgstr ""
+msgstr "Relaterade anställda"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "Hantera röda dagar, ledighet och jobbönskemål"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -551,12 +580,12 @@ msgstr "Anställningskontrakt"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "Avtal"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande och kommunikationshistorik"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -566,12 +595,12 @@ msgstr "Personnummer"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "Administrera rekryteringsprocessen"
 
 #. module: hr
 #: view:hr.employee:0
@@ -581,12 +610,12 @@ msgstr "Aktiv"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "Personaladministration"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "Installera ditt lands lönehantering"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -601,7 +630,7 @@ msgstr "Företag"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Summering"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -626,21 +655,30 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                 Klicka för att lägga till en ny anställd. \n"
+"               
     \n"
+"                 Med bara en snabb blick på OpenERP anställdskärmen, \n"
+"                 kan du lätt hitta all information du behöver för varje "
+"person; \n"
+"                 kontaktuppgifter, befattning, tillgänglighet etc. \n"
+"               
    \n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "Personalinställningar"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "Medborgarskap och annan information"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "Fel! Rekursiv avdelningsstruktur ej tillåten."
 
 #. module: hr
 #: field:hr.employee,address_id:0
@@ -650,7 +688,7 @@ msgstr "ArbetsAdress"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "Publik information"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -665,7 +703,7 @@ msgstr "ir.actions.act_window"
 #. module: hr
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Senaste kontakt"
 
 #. module: hr
 #: field:hr.employee,image:0
@@ -675,7 +713,7 @@ msgstr "Bild"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -690,17 +728,28 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                 Klicka för att skapa en avdelning. \n"
+"               
     \n"
+"                 OpenERP avdelningsstruktur används för att hantera alla "
+"dokument \n"
+"                 relaterade till de anställda från avdelningarna: kostnader, "
+"tidrapporter, \n"
+"                 blad och helgdagar, rekryteringar etc. \n"
+"               
    \n"
+"            "
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
 msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "Detta installerar modulen hr_timesheet."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid ""
 "Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Väntat antal anställda vid denna befattning efter en ny rekryteringsomgång."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -715,6 +764,16 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                 Klicka för att definiera en ny avdelning. \n"
+"               
     \n"
+"                 Din avdelningsstruktur används för att hantera alla "
+"dokument \n"
+"                 relaterade till de anställda från avdelningarna: kostnader "
+"och tidrapporter, \n"
+"                 blad och helgdagar, rekryteringar etc. \n"
+"               
    \n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -739,19 +798,23 @@ msgstr "Arbetsmobil"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Recruitement in Progress"
-msgstr ""
+msgstr "Rekrytering pågår"
 
 #. module: hr
 #: field:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "Allow invoicing based on timesheets (the sale application will be installed)"
 msgstr ""
+"Tillåter fakturering baserat på tidrapporter (kundorder-modulen kommer "
+"installeras)"
 
 #. module: hr
 #: code:addons/hr/hr.py:221
 #, python-format
 msgid "Welcome to %s! Please help him/her take the first steps with OpenERP!"
 msgstr ""
+"Välkommen till %s! Snälla hjälp honom / henne att ta de första stegen med "
+"OpenERP!"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -766,12 +829,12 @@ msgstr "HemAdress"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet:0
 msgid "Manage timesheets"
-msgstr ""
+msgstr "Administrera tidrapporter"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_payroll_modules
 msgid "Payroll"
-msgstr ""
+msgstr "Lön"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -791,12 +854,12 @@ msgstr "I befattning"
 #. module: hr
 #: help:hr.config.settings,module_hr_payroll:0
 msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "Detta installerar modulen hr_payroll"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_contract:0
 msgid "Record contracts per employee"
-msgstr ""
+msgstr "Registrera avtal per anställd"
 
 #. module: hr
 #: view:hr.department:0
@@ -811,7 +874,7 @@ msgstr "Medborgarskap"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "Extra funktioner"
 
 #. module: hr
 #: field:hr.employee,notes:0
@@ -821,7 +884,7 @@ msgstr "Anteckningar"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Subordinate Hierarchy"
-msgstr ""
+msgstr "Underordnad hierarki"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -864,23 +927,23 @@ msgstr "Avdelningsnamn"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
 msgid "Reports"
-msgstr ""
+msgstr "Rapporter"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_payroll:0
 msgid "Manage payroll"
-msgstr ""
+msgstr "Lönadministration"
 
 #. module: hr
 #: view:hr.config.settings:0
 #: model:ir.actions.act_window,name:hr.action_human_resources_configuration
 msgid "Configure Human Resources"
-msgstr ""
+msgstr "Konfgiurera personaladministrationen"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "Ingen rekrytering"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
@@ -900,7 +963,7 @@ msgstr "Logga in"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "Prognosticerat antal anställda"
 
 #. module: hr
 #: help:hr.job,state:0
@@ -908,11 +971,13 @@ msgid ""
 "By default 'In position', set it to 'In Recruitment' if recruitment process "
 "is going on for this job position."
 msgstr ""
+"Som standard 'befattning\", ställ in den på\"Rekrytering pågår\" om "
+"rekryteringsprocessen pågår för denna befattning."
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -938,6 +1003,21 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     \n"
+"                   
     \n"
+"                     Human Resources instrumentpanelen är tomt.  \n"
+"                   
     \n"
+"                     För att lägga till din första rapport i denna "
+"instrumentpanelen, gå till någon \n"
+"                     meny, växla till lista eller graf visa och klicka  "
+"\"Lägg till \n"
+"                     anslagstavla \" i de utökade sökmöjligheter. \n"
+"                   
     \n"
+"                     Du kan välja och gruppera data innan du sätter in i \n"
+"                     anslagstavla med sökalternativen. \n"
+"                   
     \n"
+"               
    \n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -953,12 +1033,12 @@ msgstr "Namnet på befattningen måste vara unikt per bolag!"
 #. module: hr
 #: help:hr.config.settings,module_hr_expense:0
 msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Detta installerar modulen hr_expense."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -980,4 +1060,4 @@ msgstr "Underordnad"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po
index b43515b5df2..0d2c92066b9 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-04 06:54+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:10+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr "Skriv månatlig närvarorapport"
+msgstr ""
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -30,38 +30,41 @@ msgstr "Närvarosökning"
 #. module: hr_attendance
 #: field:hr.employee,last_sign:0
 msgid "Last Sign"
-msgstr ""
+msgstr "Senaste stämpling"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
 #: field:hr.employee,state:0
 #: model:ir.model,name:hr_attendance.model_hr_attendance
 msgid "Attendance"
-msgstr "Närvarande"
+msgstr "Närvaro"
 
 #. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/js/attendance.js:34
 #, python-format
 msgid "Last sign in: %s,
    %s.
    Click to sign out."
-msgstr ""
+msgstr "Senaste instämpling: %s,
    %s.
    Klicka för att stämpla ut."
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Fel ! Stämpla in (resp stämpla ut) måste följas av utstämpling (resp "
+"instämpling)"
 
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
 msgid "Specifies the reason for Signing In/Signing Out."
-msgstr "Ange in/utloggningsorsak"
+msgstr "Ange in/utstämplingsorsak"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
 msgid ""
 "(*) A positive delay means that the employee worked less than recorded."
 msgstr ""
-"(*) A positive delay means that the employee worked less than recorded."
+"(*) Ett positiv uppehåll innebär att den anställde arbetat mindre än "
+"registrerat."
 
 #. module: hr_attendance
 #: view:hr.attendance.month:0
@@ -72,7 +75,7 @@ msgstr "Skriv ut månatlig närvarorapport"
 #: code:addons/hr_attendance/report/timesheet.py:120
 #, python-format
 msgid "Attendances by Week"
-msgstr ""
+msgstr "Veckonärvaro"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -111,7 +114,7 @@ msgstr "Logga ut"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records are found for your selection!"
-msgstr ""
+msgstr "Rader saknas för urvalet!"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -125,7 +128,7 @@ msgstr "Utskrift"
 #: field:hr.attendance,employee_id:0
 #: model:ir.model,name:hr_attendance.model_hr_employee
 msgid "Employee"
-msgstr "Anställd"
+msgstr "Medarbetare"
 
 #. module: hr_attendance
 #: field:hr.attendance.month,month:0
@@ -177,7 +180,7 @@ msgstr "Varning"
 #. module: hr_attendance
 #: help:hr.config.settings,group_hr_attendance:0
 msgid "Allocates attendance group to all users."
-msgstr ""
+msgstr "Tilldela närvarogrupp till alla användare."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -193,7 +196,7 @@ msgstr "juni"
 #: code:addons/hr_attendance/report/attendance_by_month.py:190
 #, python-format
 msgid "Attendances by Month"
-msgstr ""
+msgstr "Månadsnärvaro"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
@@ -218,7 +221,7 @@ msgstr "Anledning"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr "Skrivut delatagarrapportfel"
+msgstr "Skriv ut närvarorapportfel"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
@@ -249,7 +252,7 @@ msgstr "Datum"
 #. module: hr_attendance
 #: field:hr.config.settings,group_hr_attendance:0
 msgid "Track attendances for all employees"
-msgstr ""
+msgstr "Följ upp närvaro för alla anställda"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -307,7 +310,7 @@ msgstr "Anställds närvaro"
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Define attendance reason"
-msgstr "Define attendance reason"
+msgstr "Defniera frånvarorsak"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -333,7 +336,7 @@ msgstr "januari"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available !"
-msgstr ""
+msgstr "Data saknas!"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -365,7 +368,7 @@ msgstr "Tidrapporter"
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
 msgid "Attendance Reasons"
-msgstr "Närvaro Orsaker"
+msgstr "Frånvaroorsaker"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -396,7 +399,7 @@ msgstr "september"
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr "Närvaro orsaker"
+msgstr "Frånvaroorsaker"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
@@ -413,7 +416,7 @@ msgstr ""
 #: code:addons/hr_attendance/static/src/js/attendance.js:36
 #, python-format
 msgid "Click to Sign In at %s."
-msgstr ""
+msgstr "Klicka för instämpling vid %s."
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
@@ -432,6 +435,8 @@ msgid ""
 "You tried to %s with a date anterior to another event !\n"
 "Try to contact the HR Manager to correct attendances."
 msgstr ""
+"Du försökte %s med ett datum som föregår en annan händelse!\n"
+"Försök att kontakta personalansvarig för att korrigera närvaro."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -463,7 +468,7 @@ msgstr ""
 #: view:hr.attendance.month:0
 #: view:hr.attendance.week:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index 34042c43678..770f36dd49b 100644
--- a/addons/hr_contract/i18n/sl.po
+++ b/addons/hr_contract/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-11-22 15:36+0000\n"
-"Last-Translator: Darja Zorman \n"
+"PO-Revision-Date: 2014-03-14 14:57+0000\n"
+"Last-Translator: Dušan Laznik (Mentis) \n"
 "Language-Team: Slovenian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-23 06:26+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -92,18 +92,18 @@ msgstr "Zaposlitev"
 #. module: hr_contract
 #: field:hr.contract,advantages:0
 msgid "Advantages"
-msgstr ""
+msgstr "Prednosti"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Work Permit"
-msgstr ""
+msgstr "Dovoljenje za delo"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
 msgid "Contract Types"
-msgstr ""
+msgstr "Vrste pogodb"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -140,7 +140,7 @@ msgstr "Opombe"
 #. module: hr_contract
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "Št. dovoljenja za delo"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -169,12 +169,12 @@ msgstr "Delovni urnik"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Salary and Advantages"
-msgstr ""
+msgstr "Plača in bonitete"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "Naziv delovnega mesta"
 
 #. module: hr_contract
 #: constraint:hr.contract:0
@@ -199,7 +199,7 @@ msgstr "Št. vizuma"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Dist."
-msgstr ""
+msgstr "Delo od doma"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index aff929cafe1..a8c3c242c15 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-17 23:52+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-04-01 06:48+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -45,7 +45,7 @@ msgstr "Gruppera efter..."
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Advantages..."
-msgstr ""
+msgstr "Fördelar..."
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
@@ -108,7 +108,7 @@ msgstr "Avtalstyper"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Exam"
-msgstr ""
+msgstr "Medicinsk undersökning"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -169,7 +169,7 @@ msgstr "Arbetsschema"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Salary and Advantages"
-msgstr ""
+msgstr "Lön och förmåner"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
@@ -179,7 +179,7 @@ msgstr "Befattning"
 #. module: hr_contract
 #: constraint:hr.contract:0
 msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
+msgstr "Fel! Avtalets startdatum måste vara mindre än dess slutdatum."
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
@@ -199,7 +199,7 @@ msgstr "Visa nummer"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Dist."
-msgstr ""
+msgstr "Hem-arbete distans"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -209,7 +209,7 @@ msgstr "Födelseort"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period Duration"
-msgstr ""
+msgstr "Provanställningstid"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index 7b829ae5bec..be108bb7424 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-08 09:41+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -25,19 +25,19 @@ msgstr "Skicka en anonym sammanfattning till chefen"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Appraisal"
-msgstr "Starta Bedömning"
+msgstr "Starta utvärdering"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr "Gruppera efter..."
+msgstr "Gruppera på..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Cancel Appraisal"
-msgstr ""
+msgstr "Avbryt utvärdering"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
@@ -48,30 +48,30 @@ msgstr "Request_id"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
 msgid "Delay to Start"
-msgstr "Fördröjning till Start"
+msgstr "Tid till start"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in waiting appreciation state"
-msgstr "Bedömning som väntar"
+msgstr "Utvärdering som väntar på erkännande"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,company_id:0
 #: field:hr_evaluation.plan.phase,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 #: field:hr_evaluation.plan.phase,survey_id:0
 msgid "Appraisal Form"
-msgstr "Bedömningsformulär"
+msgstr "Utvärderingsformulär"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -83,12 +83,12 @@ msgstr "Dag"
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Appraisal Phases"
-msgstr "Bedömningsfaser"
+msgstr "Utvärderingsetapper"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Request"
-msgstr ""
+msgstr "Skicka begäran"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -96,40 +96,40 @@ msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
 msgstr ""
-"Det antal månader ska användas för att schemalägga den första "
-"Utvärderingsdatumet för den anställde, när man väljer en Utvärderingsplan. "
+"Det antal månader som skall användas för att schemalägga det första "
+"utvärderingsdatumet för den anställde, när man väljer en utvärderingsplan. "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Appraisals"
-msgstr ""
+msgstr "Utvärderingar"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Appraisal Name"
-msgstr "(Eval_name): Bedömnings namn"
+msgstr "(Eval_name): Utvärderingsnamn"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_ids:0
 #: field:hr_evaluation.evaluation,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr "Meddelande"
+msgstr "Meddelandetext"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr "Invänta tidigare faser"
+msgstr "Invänta tidigare etapper"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Appraisal"
-msgstr "Bedömning av anställd"
+msgstr "Utvärdering av personal"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -148,13 +148,13 @@ msgstr "Uppfyller inte förväntningarna"
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
 msgid "Appraisal"
-msgstr "Bedömning"
+msgstr "Utvärdering"
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_unread:0
 #: help:hr_evaluation.evaluation,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -169,7 +169,7 @@ msgstr "Slutdatum"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Appraisal in (months)"
-msgstr "Första Bedömning i (månader)"
+msgstr "Första utvärdering i (månader)"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -215,7 +215,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in Plan In Progress state"
-msgstr "Bedömning som pågår"
+msgstr "Planerad och pågående utvärdering"
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_summary:0
@@ -224,11 +224,13 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Reset to Draft"
-msgstr "Återställ till Utkast"
+msgstr "Återställ till utkast"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -240,7 +242,7 @@ msgstr "Tidsfrist"
 #: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -250,12 +252,12 @@ msgstr "Pågående Utvärderingar"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr "undersöknings.begäran"
+msgstr "survey.request"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Cancel Survey"
-msgstr ""
+msgstr "Avbryt undersökning"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -265,7 +267,7 @@ msgstr "(Datum)s: Aktuellt datum"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Interviews"
-msgstr ""
+msgstr "Intervjuer"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:83
@@ -277,13 +279,13 @@ msgstr "Beträffande "
 #: field:hr.evaluation.interview,message_follower_ids:0
 #: field:hr_evaluation.evaluation,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_unread:0
 #: field:hr_evaluation.evaluation,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -292,7 +294,7 @@ msgstr ""
 #: field:hr_evaluation.evaluation,employee_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_employee
 msgid "Employee"
-msgstr "Anställd"
+msgstr "Medarbetare"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
@@ -316,12 +318,12 @@ msgid ""
 "Check this box if you want to send mail to employees coming under this phase"
 msgstr ""
 "Markera denna ruta om du vill skicka e-post till anställda som omfattas av "
-"denna fas"
+"denna etapp"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Creation Date"
-msgstr "Skapades"
+msgstr "Registeringsdatum"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
@@ -384,12 +386,12 @@ msgstr "Juli"
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
 msgid "Review Appraisal Plans"
-msgstr "Recension Bedömning Planer"
+msgstr "Granska utvärderingsplaner"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_evaluation_plans_installer
@@ -406,6 +408,18 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att definiera en ny utvärderingsplan .\n"
+"               
    \n"
+"                 Du kan definiera utvärderingsplaner (ex: första intervju "
+"efter 6\n"
+"                 månader, därefter varje år). Sedan kan varje anställd "
+"kopplas till\n"
+"                 en utvärderingsplan så att OpenERP automatiskt kan "
+"generera\n"
+"                 intervjubegäran till chefer och / eller underordnade.\n"
+"               
    \n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -420,12 +434,12 @@ msgstr "Handlingsplan"
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr "Regelbunden Bedömning"
+msgstr "Periodisk utvärdering"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Appraisal (months)"
-msgstr "Periodicitet av Bedömning (månader)"
+msgstr "Periodicitet av utvärdering (månader)"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -453,7 +467,7 @@ msgstr "Alla svar"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "Svara på undersökningen"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -484,7 +498,7 @@ msgstr "E-postinställningar"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders
 msgid "Appraisal Reminders"
-msgstr "BedömningsPåminnelser"
+msgstr "Utvärderingspåminnelser"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
@@ -532,7 +546,7 @@ msgstr "Pågående"
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Appraisal Plan"
-msgstr "BedömningsPlan"
+msgstr "Utvärderingsplan"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -558,7 +572,7 @@ msgstr "Betydligt under förväntningarna"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Appraisal"
-msgstr "Validera Bedömning"
+msgstr "Granska utvärdering"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -569,7 +583,7 @@ msgstr " (Employee_name) s: Partners namn"
 #: field:hr.evaluation.interview,message_is_follower:0
 #: field:hr_evaluation.evaluation,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -602,7 +616,7 @@ msgstr "Skicka en anonym sammanfattning till den anställde"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Appraisal Plan Phase"
-msgstr "BedömningPlan fas"
+msgstr "Utvärderingsplane etapp"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -618,7 +632,7 @@ msgstr "Utvecklingssamtal"
 #: field:hr.evaluation.interview,message_summary:0
 #: field:hr_evaluation.evaluation,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -651,12 +665,12 @@ msgstr "Väntar Värdering"
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Appraisal Analysis"
-msgstr "BedömningsAnalys"
+msgstr "Utvärderingsanalys"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Appraisal Deadline"
-msgstr "Tidsfrist Bedömning"
+msgstr "Frist för utvärdering"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
@@ -682,12 +696,12 @@ msgstr "Datum Tidsfrist"
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on which the evaluation is summarized."
-msgstr ""
+msgstr "Detta är sammanfattningen av utvärderingens slutliga bedömning."
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr "Uppifrån och ner Begäran om Bedömning"
+msgstr "Begäran av utvärdering från ledningen"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -713,7 +727,7 @@ msgstr "Klar"
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Appraisal Plans"
-msgstr "BedömningsPlaner"
+msgstr "Utvärderingsplaner"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
@@ -756,8 +770,8 @@ msgid ""
 "The date of the next appraisal is computed by the appraisal plan's dates "
 "(first appraisal + periodicity)."
 msgstr ""
-"Datumet för nästa Bedömning beräknas genom Bedömningsplanens datum (första "
-"Bedömning + periodicitet)."
+"Datumet för nästa utvärdering beräknas genom planeringens datum (första "
+"utvärderingen + periodicitet)."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
@@ -776,13 +790,13 @@ msgstr ""
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr "Egen Begäran om Bedömning"
+msgstr "Utvärdering på egen begäran"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr "BedömningsBlanketter"
+msgstr "Utvärderingsblankett"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -806,6 +820,14 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    Klicka för att skapa en ny "
+"utvärdering. 
    Varje anställd kan tilldelas en utvärderingsplan. En "
+"sådan plan definierar frekvensen och ditt sätt att hantera din periodiska "
+"personalutvärdering. Du kommer att kunna fastställa åtgärder och bifoga "
+"intervjuer till varje steg. OpenERP hanterar alla typer av utvärderingar: "
+"bottom-up, top-down, självutvärdering och slutlig utvärdering av "
+"projektledaren. 
    \n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -825,7 +847,7 @@ msgstr "Fas"
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr "Nerifrån och upp Begäran om Bedömning"
+msgstr "Begäran av utvärdering från golvet"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -836,7 +858,7 @@ msgstr "Februari"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Appraisal"
-msgstr "Intervju Bedömning"
+msgstr "Utvärderingsintervju"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
@@ -847,12 +869,12 @@ msgstr "Är Bedömning?"
 #: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
-msgstr "Du kan inte starta Utvärdering utan Bedömning."
+msgstr "Du kan inte starta kartläggning utan utvärdering."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal Summary..."
-msgstr ""
+msgstr "Utvärderingssummering"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
@@ -866,6 +888,8 @@ msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
 "draft state."
 msgstr ""
+"Du kan inte ändra status, eftersom vissa utvärderingssvar är att vänta eller "
+"bara är preleminära."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -875,7 +899,7 @@ msgstr "April"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Appraisal Plan Phases"
-msgstr "Bedömning Plan faser"
+msgstr "Utvärderingsplan etapper"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -892,18 +916,25 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
     Klicka för att skapa en ny "
+"intervjubegäran i samband med en personlig utvärdering. 
     "
+"Intervjuförfrågningar brukar genereras automatiskt av OpenERP enligt en "
+"anställds utvärderingsplan. Varje användare tar emot automatiska e-"
+"postmeddelanden och önskemål för att utvärdera sina kollegor regelbundet. "
+"
    \n"
+"            "
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Search Appraisal"
-msgstr "Sök Bedömning"
+msgstr "Sök utvärdering"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
@@ -937,7 +968,7 @@ msgstr "År"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Appraisal Summary"
-msgstr "Bedömning Sammanfattning"
+msgstr "Utvärderingssammanfattning"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
@@ -947,7 +978,7 @@ msgstr "Nästa datum för Bedömande"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Action Plan..."
-msgstr ""
+msgstr "Åtgärdsplan..."
 
 #~ msgid "Cancel"
 #~ msgstr "Avbryt"
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index c21193bdb3b..9f8177b66f4 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-06 21:00+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
+"PO-Revision-Date: 2014-04-10 13:40+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-11 05:59+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -31,6 +30,8 @@ msgid ""
 "No purchase account found for the product %s (or for his category), please "
 "configure one."
 msgstr ""
+"Kein Einkaufskonto zum Produkt %s (oder dessen Warengruppe) gefunden, bitte "
+"eines festlegen."
 
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_hr_expense_line
@@ -101,7 +102,7 @@ msgstr "Ungelesene Mitteilungen"
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Waiting Payment"
-msgstr ""
+msgstr "Zahlung erwartet"
 
 #. module: hr_expense
 #: field:hr.expense.expense,company_id:0
@@ -202,7 +203,7 @@ msgstr ""
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Open Accounting Entries"
-msgstr ""
+msgstr "Offene Buchungen"
 
 #. module: hr_expense
 #: help:hr.expense.expense,message_unread:0
@@ -290,6 +291,13 @@ msgid ""
 " If the accounting entries are made for the expense request, the status is "
 "'Waiting Payment'."
 msgstr ""
+"Wenn der Spesenantrag im Status \"Entwurf\" ist\n"
+"   wird er vom Benutzer bestätigt und zum Vorgesetzten mit Status \"Erwartet "
+"Bestätigung\" weitergeleitet.\n"
+"Wenn der Vorgesetzte diesen bestätigt gelangt er in den Status "
+"\"Akzeptiert\".\n"
+"Wenn dann die Buchungen für die Spesenantrag erfolgt sind, geht der Status "
+"auf \"Erwarte Zahlung\" über."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -448,13 +456,15 @@ msgstr "Genehmigungsdatum"
 #: code:addons/hr_expense/hr_expense.py:378
 #, python-format
 msgid "Expense Account Move"
-msgstr ""
+msgstr "Spesenbuchung"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:240
 #, python-format
 msgid "The employee must have a payable account set on his home address."
 msgstr ""
+"Der Mitarbeiter muss über ein Kreditorenkonto mit seiner Heimadresse "
+"verfügen."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -559,7 +569,7 @@ msgstr "Entwurf"
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Paid"
-msgstr ""
+msgstr "Bezahlt"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:353
@@ -695,7 +705,7 @@ msgstr "Zusammenfassung"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Journalbuchungen"
 
 #. module: hr_expense
 #: model:product.template,name:hr_expense.car_travel_product_template
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 4917edcc801..6980b0145f8 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-06-18 07:37+0000\n"
+"PO-Revision-Date: 2014-04-04 18:02+0000\n"
 "Last-Translator: Pedro Manuel Baeza \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -201,7 +201,7 @@ msgstr ""
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Open Accounting Entries"
-msgstr "Apuntes abiertos"
+msgstr "Abrir asiento contable"
 
 #. module: hr_expense
 #: help:hr.expense.expense,message_unread:0
@@ -943,7 +943,7 @@ msgstr "¡Sólo puede borrar gastos en borrador!"
 #. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Ledger Posting"
-msgstr "Fijado libro contable"
+msgstr "Asiento contable"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_approveinvoice0
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index 4236a8e654b..92f25fb5d77 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-04 06:12+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:11+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
 msgid "Confirmed Expenses"
-msgstr "Bekräftade utgifter"
+msgstr "Bekräftade utlägg"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:349
@@ -44,7 +44,7 @@ msgstr "Bokföraren ersätter utläggen"
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_approved
 msgid "Expense approved"
-msgstr ""
+msgstr "Utlägg godkänt"
 
 #. module: hr_expense
 #: field:hr.expense.expense,date_confirm:0
@@ -85,7 +85,7 @@ msgstr "Ny utgift"
 #: field:hr.expense.line,uom_id:0
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -95,7 +95,7 @@ msgstr "mars"
 #. module: hr_expense
 #: field:hr.expense.expense,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -155,7 +155,7 @@ msgstr "Anteckningar"
 #. module: hr_expense
 #: field:hr.expense.expense,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:172
@@ -165,7 +165,7 @@ msgstr ""
 #: code:addons/hr_expense/hr_expense.py:353
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_expense
 #: model:mail.message.subtype,description:hr_expense.mt_expense_refused
@@ -181,7 +181,7 @@ msgstr "Produkter"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Confirm Expenses"
-msgstr "Bekräfta utgifter"
+msgstr "Bekräfta utlägg"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -201,7 +201,7 @@ msgstr ""
 #. module: hr_expense
 #: help:hr.expense.expense,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -244,12 +244,14 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:453
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -264,7 +266,7 @@ msgstr "Totalt:"
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_refuseexpense0
 msgid "Refuse expense"
-msgstr "Avslagna utgifter"
+msgstr "Avslagna utlägg"
 
 #. module: hr_expense
 #: field:hr.expense.report,price_average:0
@@ -308,7 +310,7 @@ msgstr "Sekvensen ordning vid visning av en lista över kostnadsrader."
 #: view:hr.expense.report:0
 #: field:hr.expense.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
@@ -330,7 +332,7 @@ msgstr "Väntar"
 #. module: hr_expense
 #: field:hr.expense.expense,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -338,7 +340,7 @@ msgstr ""
 #: field:hr.expense.expense,employee_id:0
 #: view:hr.expense.report:0
 msgid "Employee"
-msgstr "Anställd"
+msgstr "Medarbetare"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -367,7 +369,7 @@ msgstr "Vissa kostnader kan faktureras kunden"
 #: code:addons/hr_expense/hr_expense.py:238
 #, python-format
 msgid "The employee must have a home address."
-msgstr ""
+msgstr "Medarbetaren måste ha en hemadress"
 
 #. module: hr_expense
 #: view:board.board:0
@@ -384,7 +386,7 @@ msgstr "Skapad datum"
 #. module: hr_expense
 #: model:ir.actions.report.xml,name:hr_expense.hr_expenses
 msgid "HR expenses"
-msgstr "Personalutgifter"
+msgstr "Personalutlägg"
 
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
@@ -422,7 +424,7 @@ msgstr "Efter skapandet av faktura, ersätt kostnader"
 #: code:addons/hr_expense/hr_expense.py:121
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reimbursement0
@@ -445,7 +447,7 @@ msgstr ""
 #: code:addons/hr_expense/hr_expense.py:240
 #, python-format
 msgid "The employee must have a payable account set on his home address."
-msgstr ""
+msgstr "Den anställde måste ha ett utgiftskonto anslutet till sin hemadress"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -500,7 +502,7 @@ msgstr "Valuta"
 #. module: hr_expense
 #: field:hr.expense.expense,voucher_id:0
 msgid "Employee's Receipt"
-msgstr ""
+msgstr "Medarbetarkvitto"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0
@@ -510,7 +512,7 @@ msgstr "Väntar på godkännande"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
 msgid "Employee encode all his expenses"
-msgstr "Anställd koda alla hans utgifter"
+msgstr "Medarbetare kodifierar alla sina utgifter"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -646,6 +648,17 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att registrera nya utgifter.\n"
+"               
    \n"
+"                 OpenERP kommer att se till att hela processen följs; "
+"bekostnad\n"
+"                 Bladet är validerat av chef (s), har arbetstagaren "
+"ersättning\n"
+"                 utlägg sina utlägg, vissa utlägg måste återfaktureras\n"
+"                 kunder.\n"
+"               
    \n"
+"            "
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -675,7 +688,7 @@ msgstr ""
 #. module: hr_expense
 #: model:product.template,name:hr_expense.car_travel_product_template
 msgid "Car Travel Expenses"
-msgstr "Utgifter resor med bil"
+msgstr "Bilutlägg"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -690,12 +703,12 @@ msgstr ""
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_confirmedexpenses0
 msgid "The employee validates his expense sheet"
-msgstr "Den anställde bekräftar sin kostnadsblankett"
+msgstr "Medarbetaren granskar sin utläggsansökan"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Expenses to Invoice"
-msgstr "Utgifter att fakturera"
+msgstr "Utlägg att fakturera"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_supplierinvoice0
@@ -716,7 +729,7 @@ msgstr ""
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Approved Expenses"
-msgstr "Godkända utgifter"
+msgstr "Godkända utlägg"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -881,7 +894,7 @@ msgstr "Ref."
 #. module: hr_expense
 #: field:hr.expense.report,employee_id:0
 msgid "Employee's Name"
-msgstr "Anställds namn"
+msgstr "Medarbetarens namn"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -962,7 +975,7 @@ msgstr "Utlägg godkänt"
 #: model:ir.ui.menu,name:hr_expense.next_id_49
 #: model:product.category,name:hr_expense.cat_expense
 msgid "Expenses"
-msgstr "Utgifter"
+msgstr "Utlägg"
 
 #. module: hr_expense
 #: help:product.product,hr_expense_ok:0
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 9efe633bb5b..f195124b98f 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-08 16:15+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:12+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -39,16 +39,18 @@ msgid ""
 "You cannot modify a leave request that has been approved. Contact a human "
 "resource manager."
 msgstr ""
+"Du kan inte ändra ett redan godkänt frånvaroönskemål. Kontakta "
+"personalansvarig."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr "Maximal tillåten ledighet - Ledigheten är redan förbrukad"
+msgstr "Maximal tillåten ledighet - Semestern är redan förbrukad"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr "Ledighetshantering"
+msgstr "Semesterplanering"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -58,12 +60,12 @@ msgstr "Gruppera på..."
 #. module: hr_holidays
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Mode"
-msgstr "Läge för Ledighetstilldelning"
+msgstr "Läge för semestertilldelning"
 
 #. module: hr_holidays
 #: field:hr.employee,leave_date_from:0
 msgid "From Date"
-msgstr ""
+msgstr "Från datum"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -75,7 +77,7 @@ msgstr "Avdelning"
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_allocation
 msgid "Allocation Requests to Approve"
-msgstr ""
+msgstr "Semesterönskemål att godkänna"
 
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
@@ -108,16 +110,18 @@ msgid ""
 "The default duration interval between the start date and the end date is 8 "
 "hours.  Feel free to adapt it to your needs."
 msgstr ""
+"Normalt tidsintervall mellan startdatum och slutdatum är 8 timmar. Känn dig "
+"fri att anpassa det till dina behov."
 
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
 msgid "Request refused"
-msgstr ""
+msgstr "Önskemål tillbakavisat"
 
 #. module: hr_holidays
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Allocation"
-msgstr ""
+msgstr "Tilldelning"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -132,7 +136,7 @@ msgstr "Ljus cyan"
 #. module: hr_holidays
 #: constraint:hr.holidays:0
 msgid "You can not have 2 leaves that overlaps on same day!"
-msgstr ""
+msgstr "Du kan inte ha två ledigheter som överlappar samma dag!"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -142,12 +146,12 @@ msgstr "Ljusgrön"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr "Aktuell ledighetstyp"
+msgstr "Aktuell frånvarutyp"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Validate"
-msgstr ""
+msgstr "Granska"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -161,7 +165,7 @@ msgstr "Godkänd"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr "Sök Ledighet"
+msgstr "Sök frånvaro"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -173,12 +177,12 @@ msgstr "Vägra"
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Leaves"
-msgstr "Ledighet"
+msgstr "Frånvaro"
 
 #. module: hr_holidays
 #: field:hr.holidays,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -189,19 +193,19 @@ msgstr "Ledig"
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr "LedighetsFörfrågningar att Godkänna"
+msgstr "Semesteransökan att godkänna"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr "Ledighet per avdelning"
+msgstr "Frånvaro per avdelning"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
@@ -222,8 +226,8 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
-"Välj 'Ledighetsförfrågan' om någon vill ta en ledig dag. \n"
-"Välj 'Tilldela ledighet' om du vill öka antalet ledigheter för någon"
+"Välj 'Semesterförfrågan' om någon vill ta en ledig dag. \n"
+"Välj 'Tilldela semster' om du vill öka antalet semesterdagar för någon"
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -233,7 +237,7 @@ msgstr "Granskning"
 #. module: hr_holidays
 #: help:hr.holidays,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -255,7 +259,7 @@ msgstr ""
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 msgid "Leave Type"
-msgstr "Ledighetstyp"
+msgstr "Frånvarotyp"
 
 #. module: hr_holidays
 #: help:hr.holidays,message_summary:0
@@ -263,6 +267,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:249
@@ -283,12 +289,12 @@ msgstr "Magenta"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.act_hr_leave_request_to_meeting
 msgid "Leave Meetings"
-msgstr ""
+msgstr "Frånvaromöten"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
 msgid "Legal Leaves 2013"
-msgstr ""
+msgstr "Lagstadgad semester 2013"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -311,7 +317,7 @@ msgstr "Sjukfrånvaro"
 #: code:addons/hr_holidays/hr_holidays.py:489
 #, python-format
 msgid "Leave Request for %s"
-msgstr "Ledighetsbegäran för %s"
+msgstr "Semsterönskemål för %s"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -322,7 +328,7 @@ msgstr "Summa"
 #: view:hr.holidays.status:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 msgid "Leave Types"
-msgstr ""
+msgstr "Frånvarotyper"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
@@ -332,7 +338,7 @@ msgstr "Återstående ledighet"
 #. module: hr_holidays
 #: field:hr.holidays,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
@@ -366,7 +372,7 @@ msgstr "Röd"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr "Ledighetstyp"
+msgstr "Frånvaro per typ"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -395,6 +401,10 @@ msgid ""
 "   \n"
 "The status is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"Statusen är satt till \"att skicka in\", när en semesterbegäran skapas.\n"
+"Statusen är \"godkännd\", när semesterbegäran bekräftas av användaren.\n"
+"Statusen \"Avvisad\", när semestern begäran avslås av chef.\n"
+"Statusen \"Godkänd\", när semestern ansökan godkänns av chef."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -414,19 +424,19 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
-"Funktionen bakom fältet 'Kvarvarande Semester' kan endast användas när det "
-"bara finns en ledighetstyp med alternativet 'Tillåt att överskrida gränsen' "
+"Funktionen bakom fältet 'Kvarvarande semester' kan endast användas när det "
+"bara finns en frånvarotyp med alternativet 'Tillåt att överskrida gränsen' "
 "ej är markerad. (%s hittades). Annars är uppdateringen tvetydig eftersom vi "
-"inte kan besluta om vilken ledighetstyp uppdateringen måste göras för.\n"
-"Du kanske föredrar att använda de vanliga menyerna 'Ledighetsbegäran' och "
+"inte kan besluta om vilken frånvarotyp uppdateringen måste göras för. \n"
+"Du kanske föredrar att använda de klassiska menyer 'Semesterbegäran' och "
 "'Tilldela Ledighet' som ligger i 'Personal \\ Frånvaro' för att hantera "
-"semesterdagar för de anställda, om konfigurationen inte tillåter att använda "
+"semesterdagar för de anställda om konfigurationen inte tillåter att använda "
 "detta fält."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr "Sök LedighetsTyp"
+msgstr "Sök frånvarotyp"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -436,7 +446,7 @@ msgstr "Väntar på godkännande"
 #. module: hr_holidays
 #: field:hr.holidays,category_id:0
 msgid "Employee Tag"
-msgstr ""
+msgstr "Anställds etikett"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -449,6 +459,8 @@ msgid ""
 "Filters only on allocations and requests that belong to an holiday type that "
 "is 'active' (active field is True)"
 msgstr ""
+"Filtrera endast om fördelningen och önskemål som hör till en fråmvarotyp som "
+"är \"aktiv\" (aktiva fältet är sant)"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
@@ -460,6 +472,13 @@ msgid ""
 "             
    \n"
 "           "
 msgstr ""
+"
    \n"
+"                Du kan tilldela återstående lagstadgad semester för varje "
+"anställd, OpenERP\n"
+"                kommer automatiskt att skapa och validera "
+"semesterförfrågningar.\n"
+"              
    \n"
+"           "
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -472,7 +491,7 @@ msgstr ""
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least one Department. And try again."
-msgstr ""
+msgstr "Åtminstonde en avdelning måste vara vald, försök igen."
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
@@ -492,14 +511,14 @@ msgstr "Månad"
 #. module: hr_holidays
 #: field:hr.holidays,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr "LedighetsFörfrågningar"
+msgstr "Semesterönskemål"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
@@ -524,7 +543,7 @@ msgstr ""
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -539,6 +558,16 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att skapa en nytt semesterönskemål.\n"
+"               
    \n"
+"                 När du har registrerat dina semesterönskemål, skickas det\n"
+"                 till en chef för granskning. Se till att välja rätt "
+"frånvarotyp\n"
+"                 (semesterdag, helgdagar, sjukdom) och den exakta\n"
+"                 antal öppna dagar relaterade till din frånvaro.\n"
+"               
    \n"
+"            "
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -551,8 +580,7 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
-"Detta värde kommer av summan av alla ledighetsförfrågningar med positivt "
-"värde."
+"Detta värde är en summering av alla semesterönskemål med positivt värde."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
@@ -565,7 +593,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Återställ till ny"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
@@ -580,7 +608,7 @@ msgstr "Ljus Coral"
 #. module: hr_holidays
 #: field:hr.employee,leave_date_to:0
 msgid "To Date"
-msgstr ""
+msgstr "Till datum"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -595,7 +623,7 @@ msgstr "Tilldela ledighet för personal"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Leaves Types"
-msgstr ""
+msgstr "Frånvarotyp"
 
 #. module: hr_holidays
 #: field:hr.holidays,meeting_id:0
@@ -613,7 +641,7 @@ msgstr ""
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -638,7 +666,7 @@ msgstr "Ledigheten redan förbrukad"
 #. module: hr_holidays
 #: field:hr.holidays,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -661,7 +689,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Add a reason..."
-msgstr ""
+msgstr "Lägg till orsak..."
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
@@ -671,7 +699,7 @@ msgstr "Första godkännande"
 #. module: hr_holidays
 #: field:hr.holidays,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
@@ -687,12 +715,12 @@ msgstr "Obetald"
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr "Ledighetssummering"
+msgstr "Summerad frånvaro"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Submit to Manager"
-msgstr ""
+msgstr "Skicka till chef"
 
 #. module: hr_holidays
 #: view:hr.employee:0
@@ -707,12 +735,12 @@ msgstr "Ljusblå"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr "Min avdelnings ledighet"
+msgstr "Min avdelnings frånvaro"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr "Aktuell Ledighetsstatus"
+msgstr "Aktuell frånvarostatus"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
@@ -747,7 +775,7 @@ msgstr "Ljusgul"
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr "Ledighetsanalys"
+msgstr "Frånvaroanalys"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -775,7 +803,7 @@ msgstr ""
 #: view:hr.holidays:0
 #: selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr "Ledighetstilldelning"
+msgstr "Semesterönskemål"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -787,7 +815,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr "Ledighet Detalj"
+msgstr "Frånvarodetaljer"
 
 #. module: hr_holidays
 #: field:hr.holidays,double_validation:0
@@ -799,7 +827,7 @@ msgstr "Applicera Dubbel validering"
 #: view:hr.employee:0
 #: view:hr.holidays:0
 msgid "days"
-msgstr ""
+msgstr "dagar"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -817,7 +845,7 @@ msgstr "Detaljer"
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr "Min Ledighet"
+msgstr "Min frånvaro"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -827,7 +855,7 @@ msgstr "Avdelning(ar)"
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "To Submit"
-msgstr ""
+msgstr "Att skicka"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:354
@@ -853,7 +881,7 @@ msgstr "Återstående Semester"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Tag"
-msgstr ""
+msgstr "Per anställdsetikett"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -865,7 +893,7 @@ msgstr "Nekad"
 #. module: hr_holidays
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Mötestyp"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
@@ -875,7 +903,7 @@ msgstr "Återstående ledighet"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocated Days"
-msgstr ""
+msgstr "Dagar med frånvaro"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -924,13 +952,13 @@ msgstr "Läge"
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Approved and Confirmed"
-msgstr ""
+msgstr "Både godkända och bekräftade"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:451
 #, python-format
 msgid "Request approved, waiting second validation."
-msgstr ""
+msgstr "Förfrågan godkänd, väntar sekundär validering."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -940,7 +968,7 @@ msgstr "Godkänn"
 #. module: hr_holidays
 #: help:hr.holidays,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:260
@@ -948,7 +976,7 @@ msgstr ""
 #: sql_constraint:hr.holidays:0
 #, python-format
 msgid "The start date must be anterior to the end date."
-msgstr ""
+msgstr "Startdatum måste föregå slutdatum."
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -967,7 +995,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr "Ledighetstilldening"
+msgstr "Semesterönskemål"
 
 #. module: hr_holidays
 #: xsl:holidays.summary:0
@@ -981,6 +1009,9 @@ msgid ""
 "to create allocation/leave request. Total based on all the leave types "
 "without overriding limit."
 msgstr ""
+"Total lagstadgad semester för den anställde, ändra detta värde för att skapa "
+"frånvaro / semesterönskemål. Totalt baserat på alla frånvarotyper utan "
+"tvingande gräns."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -990,7 +1021,7 @@ msgstr "Ljusrosa"
 #. module: hr_holidays
 #: xsl:holidays.summary:0
 msgid "leaves."
-msgstr ""
+msgstr "Frånvaro"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -1010,7 +1041,7 @@ msgstr "År"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Duration"
-msgstr ""
+msgstr "Varaktighet"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -1022,7 +1053,7 @@ msgstr "Att godkänna"
 #. module: hr_holidays
 #: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
 msgid "Request approved"
-msgstr ""
+msgstr "Önskemål accepterat"
 
 #. module: hr_holidays
 #: field:hr.holidays,notes:0
@@ -1032,4 +1063,4 @@ msgstr "Anledningar"
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
 msgid "Select Leave Type"
-msgstr ""
+msgstr "Välj frånvarotyp"
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index f944e8b1362..67fb89ebcf5 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -578,7 +578,7 @@ class hr_payslip(osv.osv):
         payslip_obj = Payslips(self.pool, cr, uid, payslip.employee_id.id, payslip)
         rules_obj = BrowsableObject(self.pool, cr, uid, payslip.employee_id.id, rules)
 
-        localdict = {'categories': categories_obj, 'rules': rules_obj, 'payslip': payslip_obj, 'worked_days': worked_days_obj, 'inputs': input_obj}
+        baselocaldict = {'categories': categories_obj, 'rules': rules_obj, 'payslip': payslip_obj, 'worked_days': worked_days_obj, 'inputs': input_obj}
         #get the ids of the structures on the contracts and their parent id as well
         structure_ids = self.pool.get('hr.contract').get_all_structures(cr, uid, contract_ids, context=context)
         #get the rules of the structure and thier children
@@ -588,11 +588,12 @@ class hr_payslip(osv.osv):
 
         for contract in self.pool.get('hr.contract').browse(cr, uid, contract_ids, context=context):
             employee = contract.employee_id
-            localdict.update({'employee': employee, 'contract': contract})
+            localdict = dict(baselocaldict, employee=employee, contract=contract)
             for rule in obj_rule.browse(cr, uid, sorted_rule_ids, context=context):
                 key = rule.code + '-' + str(contract.id)
                 localdict['result'] = None
                 localdict['result_qty'] = 1.0
+                localdict['result_rate'] = 100
                 #check if the rule can be applied
                 if obj_rule.satisfy_condition(cr, uid, rule.id, localdict, context=context) and rule.id not in blacklist:
                     #compute the amount of the rule
diff --git a/addons/hr_payroll/i18n/fa.po b/addons/hr_payroll/i18n/fa.po
new file mode 100644
index 00000000000..a2c3f0a2ea9
--- /dev/null
+++ b/addons/hr_payroll/i18n/fa.po
@@ -0,0 +1,1256 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-04-23 14:46+0000\n"
+"Last-Translator: Milad Safajuy \n"
+"Language-Team: Persian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-24 06:32+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr "ماهانه"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,rate:0
+msgid "Rate (%)"
+msgstr "امتیاز (%)"
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr "تعداد روزها"
+
+#. module: hr_payroll
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: view:hr.salary.rule:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "States"
+msgstr "وضعیت ها"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,input_ids:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr "ورودی‌ها"
+
+#. module: hr_payroll
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.employee:0
+#: field:hr.employee,slip_ids:0
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,company_id:0
+#: field:hr.payroll.structure,company_id:0
+#: field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0
+#: field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: view:hr.payslip.run:0
+msgid "to"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payslip_run_id:0
+#: view:hr.payslip.run:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Children Definition"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0
+#: field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip
+#: report:payslip:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:871
+#: code:addons/hr_payroll/hr_payroll.py:876
+#: code:addons/hr_payroll/hr_payroll.py:882
+#: code:addons/hr_payroll/hr_payroll.py:899
+#: code:addons/hr_payroll/hr_payroll.py:905
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Information"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.config.settings,module_hr_payroll_account:0
+msgid "Link your payroll to accounting system"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_select:0
+#: help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,code:0
+#: field:hr.payslip,number:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:432
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Total Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.payroll.structure:0
+msgid "Error ! You cannot create a recursive Salary Structure."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,code:0
+#: help:hr.salary.rule,code:0
+msgid ""
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"
    \n"
+"                Click to add a new contribution register.\n"
+"              
    \n"
+"                A contribution register is a third party involved in the "
+"salary\n"
+"                payment of the employees. It can be the social security, "
+"the\n"
+"                estate or anyone that collect or inject money on payslips.\n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: report:paylip.details:0
+msgid "Register Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,employee_id:0
+#: field:hr.payslip.line,employee_id:0
+#: model:ir.model,name:hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:90
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.config.settings,module_hr_payroll_account:0
+msgid "Create journal entries from payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: field:hr.payslip,line_ids:0
+#: view:hr.payslip.line:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip,state:0
+msgid "Rejected"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+#: field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:341
+#, python-format
+msgid "Refund: "
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:370
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,active:0
+#: help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,state:0
+#: field:hr.payslip.run,state:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days & Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,register_id:0
+#: help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "PaySlip Batch"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,child_ids:0
+#: field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,credit_note:0
+#: field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used to display the salary rule on payslip."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Cancel Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:899
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
+msgid "Amount Type"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,category_id:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Company Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:876
+#, python-format
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: selection:hr.payslip,state:0
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0
+#: report:paylip.details:0
+#: report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Percentage (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:871
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Day"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Employee Function"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Compute Sheet"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,active:0
+#: field:hr.salary.rule,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Designation"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Companies"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,contract_id:0
+#: field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)."
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Credit"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+msgid "Contribution"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:351
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0
+#: field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Refund"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.payslip.input,code:0
+#: field:hr.payslip.line,code:0
+#: field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0
+#: field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,sequence:0
+#: field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0
+#: field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Period from"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:674
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,struct_id:0
+#: view:hr.payroll.structure:0
+#: view:hr.payslip:0
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contribution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Calculations"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+#: field:hr.contribution.register,note:0
+#: field:hr.payroll.structure,note:0
+#: field:hr.payslip,name:0
+#: field:hr.payslip,note:0
+#: field:hr.payslip.input,name:0
+#: field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0
+#: field:hr.rule.input,name:0
+#: view:hr.salary.rule:0
+#: field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
+msgid "Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
+#: model:ir.ui.menu,name:hr_payroll.payroll_configure
+msgid "Payroll"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:370
+#, python-format
+msgid "You cannot delete a payslip which is not draft or cancelled!"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Address"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.contribution.register,name:0
+#: field:hr.payroll.structure,name:0
+#: field:hr.payslip.line,name:0
+#: field:hr.payslip.run,name:0
+#: field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+#: view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0
+#: view:hr.payslip.line:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,sequence:0
+#: help:hr.salary.rule,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the status is 'Draft'.            \n"
+"* If the payslip is under verification, the status is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then status is set to 'Done'.            \n"
+"* When user cancel payslip the status is 'Rejected'."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will be used to compute the % fields values; in general it is on basic, "
+"but you can also use categories code fields in lowercase as a variable names "
+"(hra, ma, lta, etc.) and the variable basic."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Other Inputs"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:882
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s)."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+#: field:hr.payslip.line,total:0
+#: report:paylip.details:0
+#: report:payslip:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Salary Computation"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Details By Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.input,code:0
+#: help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:905
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 146ec99f246..dbda8281393 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-03 10:32+0000\n"
-"Last-Translator: gobi \n"
+"PO-Revision-Date: 2014-04-01 07:52+0000\n"
+"Last-Translator: Jacara \n"
 "Language-Team: Mongolian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-04 06:48+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -247,7 +247,7 @@ msgstr "Дүрмийн дүнг тооцоолох арга."
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
 msgid "Contribution Register's Payslip Lines"
-msgstr "Хандивийн бүртгэлийн цалингийн хуудсын мөрүүд"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
@@ -357,11 +357,11 @@ msgid ""
 "            "
 msgstr ""
 "
    \n"
-"                Хандив оруулалтыг бүртгэхдээ дарна.\n"
+"                Шинэ суутгал шимтгэлийн төрөл бүртгэх бол энд дарна.\n"
 "              
    \n"
-"                Хандивын бүртгэл гэдэг нь цалингийн төлбөрт гуравдагч этгээд "
-"оролцох явдлыг хэлнэ. Энэ нь нийгмийн халамж, улс болон цалинд нэмэр оруулж "
-"байгаа хэн ч байж болно. \n"
+"                Суутгал шимтгэлийн төрөл гэдэг нь цалингийн дүнгээс "
+"гуравдагч этгээд суутгал шимтгэл авах явдалд хэрэглэгдэнэ. Тухайлбал "
+"нийгмийн даатгал, эрүүл мэндийн даатгал, ажилгүйдлийн тэтгэмж гэх мэт. \n"
 "              
    \n"
 "            "
 
@@ -466,7 +466,7 @@ msgstr "Төлбөрийн баримтыг хийсэн үү ? "
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Lines by Contribution Register"
-msgstr "Цалингийн хуудас хандивийн бүртгэлээр"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -504,7 +504,7 @@ msgstr "Нөхөн төлөх "
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
 msgid "PaySlip Lines by Contribution Registers"
-msgstr "Цалингийн хуудсын мөрүүд хандивын бүртгэлээр"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -758,7 +758,7 @@ msgstr "Хийгдсэн Цалингийн Хуудсын Багцууд"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Payslip Lines by Contribution Register:"
-msgstr "Цалингийн хуудсын мөрүүд хандивын бүртгэлээр:"
+msgstr "Суутгал шимтгэл бүхий цалингийн мөрүүд"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -1036,7 +1036,7 @@ msgstr "hr.config.settings"
 #: field:hr.salary.rule,register_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
-msgstr "Ажил олгогчийн даах суутгалын бүртгэл"
+msgstr "Суутгал шимтгэлийн төрөл"
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -1091,7 +1091,7 @@ msgstr "Нийт үндсэн цалин"
 #: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr "Ажил олгогчийн даах суутгалын бүртгэл"
+msgstr "Суутгал шимтгэлийн төрөл"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index 8d365c4ea17..1021e15c207 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-16 13:43+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:12+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-17 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -87,7 +87,7 @@ msgstr "Reguła wynagrodzenia nadrzędnego"
 #: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr "Pasek wypłaty"
+msgstr "Paski wypłaty"
 
 #. module: hr_payroll
 #: field:hr.payroll.structure,parent_id:0
@@ -132,7 +132,7 @@ msgstr "do"
 #: view:hr.payslip.run:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_run
 msgid "Payslip Batches"
-msgstr "Grupy pasków"
+msgstr "Listy płac"
 
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
@@ -173,7 +173,7 @@ msgstr "Generuj"
 #: help:hr.payslip.line,amount_percentage_base:0
 #: help:hr.salary.rule,amount_percentage_base:0
 msgid "result will be affected to a variable"
-msgstr ""
+msgstr "rezultat będzie zależny od zmiennej"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -183,7 +183,7 @@ msgstr "Suma"
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
 msgid "All Children Rules"
-msgstr ""
+msgstr "Wszystkie reguły podrzędne"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -194,7 +194,7 @@ msgstr "Dane wejściowe"
 #. module: hr_payroll
 #: constraint:hr.payslip:0
 msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr ""
+msgstr "'Data od' musi być wcześniejsza niż 'Data do'."
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
@@ -241,7 +241,7 @@ msgstr "Połącz system płacowy z księgowym"
 #: help:hr.payslip.line,amount_select:0
 #: help:hr.salary.rule,amount_select:0
 msgid "The computation method for the rule amount."
-msgstr ""
+msgstr "Metoda obliczania dla wartości reguły."
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -257,7 +257,7 @@ msgstr "Ostrzeżenie !"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Details by Salary Rule Category:"
-msgstr ""
+msgstr "Szczegóły według Kategorii reguły wynagrodzenia:"
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -282,13 +282,13 @@ msgstr "Projekt listy płac"
 #: code:addons/hr_payroll/hr_payroll.py:432
 #, python-format
 msgid "Normal Working Days paid at 100%"
-msgstr ""
+msgstr "Zwykłe dni robocze płatne 100%"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range_max:0
 #: field:hr.salary.rule,condition_range_max:0
 msgid "Maximum Range"
-msgstr ""
+msgstr "Zakres maksymalny"
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -372,7 +372,7 @@ msgstr ""
 #: report:contribution.register.lines:0
 #: report:paylip.details:0
 msgid "Register Name"
-msgstr ""
+msgstr "Nazwa rejestru"
 
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
@@ -400,7 +400,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Search Salary Rule"
-msgstr ""
+msgstr "Szukaj według reguł wynagrodzenia"
 
 #. module: hr_payroll
 #: field:hr.payslip,employee_id:0
@@ -423,34 +423,34 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Search Payslip Batches"
-msgstr ""
+msgstr "Szukaj list płac"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount_percentage_base:0
 #: field:hr.salary.rule,amount_percentage_base:0
 msgid "Percentage based on"
-msgstr ""
+msgstr "Procentowo bazując na"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:90
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: hr_payroll
 #: help:hr.config.settings,module_hr_payroll_account:0
 msgid "Create journal entries from payslips"
-msgstr ""
+msgstr "Twórz zapisy księgowe z pasków wymagrodzenia"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Made Payment Order ? "
-msgstr ""
+msgstr "Wykonano polecenie płatności ? "
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Lines by Contribution Register"
-msgstr ""
+msgstr "Pozycje paska wypłaty wg Rejestru Składek"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -488,7 +488,7 @@ msgstr "Refundacja: "
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
 msgid "PaySlip Lines by Contribution Registers"
-msgstr ""
+msgstr "Pozycje paska wypłaty wg Rejestrów Składek"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -539,7 +539,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip,details_by_salary_rule_category:0
 msgid "Details by Salary Rule Category"
-msgstr ""
+msgstr "Szczegóły wg kategorii Reguł wynagrodzenia"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
@@ -566,13 +566,13 @@ msgstr "Lista płac"
 #: field:hr.payslip.line,condition_range_min:0
 #: field:hr.salary.rule,condition_range_min:0
 msgid "Minimum Range"
-msgstr ""
+msgstr "Zakres minimalny"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,child_ids:0
 #: field:hr.salary.rule,child_ids:0
 msgid "Child Salary Rule"
-msgstr ""
+msgstr "Podrzędne reguły wynagrodzenia"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -594,7 +594,7 @@ msgstr "Zakres"
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
 msgid "Salary Structures Hierarchy"
-msgstr ""
+msgstr "Hierarchia Struktur wynagrodzeń"
 
 #. module: hr_payroll
 #: help:hr.employee,total_wage:0
@@ -616,7 +616,7 @@ msgstr "Korekta"
 #: view:hr.payslip:0
 #: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
 msgid "Payslip Computation Details"
-msgstr ""
+msgstr "Wyliczenia Paska wypłaty szczegółowo"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,appears_on_payslip:0
@@ -627,19 +627,19 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
 msgid "Payslip Input"
-msgstr ""
+msgstr "Wejścia Paska wypłaty"
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
 msgid "Salary Rule Categories"
-msgstr ""
+msgstr "Kategorie Reguł wynagrodzenia"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Cancel Payslip"
-msgstr ""
+msgstr "Anuluj Pasek wypłaty"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,contract_id:0
@@ -683,7 +683,7 @@ msgstr "Kategoria"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Company Contribution"
-msgstr ""
+msgstr "Składki firmowe"
 
 #. module: hr_payroll
 #: help:hr.payslip.run,credit_note:0
@@ -702,12 +702,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
 msgid "Salary Structures"
-msgstr ""
+msgstr "Struktury wynagrodzeń"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Draft Payslip Batches"
-msgstr ""
+msgstr "Projekty list płac"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -730,12 +730,12 @@ msgstr "Data Początkowa"
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Done Payslip Batches"
-msgstr ""
+msgstr "Wykonane listy płac"
 
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Payslip Lines by Contribution Register:"
-msgstr ""
+msgstr "Pozycje paska wypłaty wg Rejestrów Składek:"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -759,7 +759,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Day"
-msgstr ""
+msgstr "Dzień roboczy"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -769,7 +769,7 @@ msgstr "Funkcja pracownika"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payslip_report
 msgid "Employee PaySlip"
-msgstr ""
+msgstr "Pasek pracownika"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,salary_rule_id:0
@@ -779,7 +779,7 @@ msgstr "Reguła"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
 msgid "PaySlip Details"
-msgstr ""
+msgstr "Pasek wypłaty szczegółowo"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -795,7 +795,7 @@ msgstr "Aktywne"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Child Rules"
-msgstr ""
+msgstr "Reguły podrzędne"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range_min:0
@@ -856,12 +856,12 @@ msgstr ""
 #: field:hr.payslip.line,condition_python:0
 #: field:hr.salary.rule,condition_python:0
 msgid "Python Condition"
-msgstr ""
+msgstr "Warunek Python"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0
 msgid "Contribution"
-msgstr "Dotacja"
+msgstr "Składka"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:351
@@ -873,7 +873,7 @@ msgstr ""
 #: field:hr.rule.input,input_id:0
 #: model:ir.model,name:hr_payroll.model_hr_rule_input
 msgid "Salary Rule Input"
-msgstr ""
+msgstr "Wejście Reguły wynagrodzenia"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,quantity:0
@@ -918,7 +918,7 @@ msgstr "Numeracja"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Period"
-msgstr ""
+msgstr "Okres"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
@@ -934,12 +934,12 @@ msgstr "Ogólne"
 #: code:addons/hr_payroll/hr_payroll.py:674
 #, python-format
 msgid "Salary Slip of %s for %s"
-msgstr ""
+msgstr "Wynagrodzenie %s dla %s"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_employees
 msgid "Generate payslips for all selected employees"
-msgstr ""
+msgstr "Generuj paski wynagrodzenia dla wybranych pracowników"
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
@@ -989,13 +989,13 @@ msgstr "Co 2 miesiące"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Pay Slip Details"
-msgstr ""
+msgstr "Pasek wypłaty szczegółowo"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
 #: model:ir.ui.menu,name:hr_payroll.menu_department_tree
 msgid "Employee Payslips"
-msgstr ""
+msgstr "Paski wypłat"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_config_settings
@@ -1008,7 +1008,7 @@ msgstr ""
 #: field:hr.salary.rule,register_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
-msgstr ""
+msgstr "Rejestr składek"
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -1035,7 +1035,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
 msgid "Payslips Batches"
-msgstr ""
+msgstr "Generowanie Listy płac"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0
@@ -1063,7 +1063,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr ""
+msgstr "Rejestry składek"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
@@ -1098,7 +1098,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
 msgid "Salary Categories"
-msgstr ""
+msgstr "Kategorie wynagrodzeń"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -1182,7 +1182,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
 msgid "Salary Rule Categories Hierarchy"
-msgstr ""
+msgstr "Hierarchia kategorii Reguł wynagrodzenia"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:882
@@ -1201,7 +1201,7 @@ msgstr "Suma"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Salary Computation"
-msgstr ""
+msgstr "Obliczanie wynagrodzenia"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1225,7 +1225,7 @@ msgstr ""
 #: view:hr.payslip.run:0
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
 msgid "Generate Payslips"
-msgstr ""
+msgstr "Generuj paski wypłat"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -1246,7 +1246,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Name"
-msgstr ""
+msgstr "Nazwa paska"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1257,7 +1257,7 @@ msgstr "Księgowość"
 #: field:hr.payslip.line,condition_range:0
 #: field:hr.salary.rule,condition_range:0
 msgid "Range Based on"
-msgstr ""
+msgstr "Zakres bazujący na"
 
 #~ msgid "Cancel"
 #~ msgstr "Anuluj"
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index ca0bf75c7a5..2b10ef92876 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-03 07:50+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:12+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-04 07:07+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -102,7 +102,7 @@ msgstr "Överordnad"
 #: field:hr.salary.rule,company_id:0
 #: field:hr.salary.rule.category,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -124,7 +124,7 @@ msgstr "hr.salary.rule"
 #: view:hr.payslip:0
 #: view:hr.payslip.run:0
 msgid "to"
-msgstr ""
+msgstr "till"
 
 #. module: hr_payroll
 #: field:hr.payslip,payslip_run_id:0
@@ -152,7 +152,7 @@ msgstr "Antal / Pris"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Underliggande definitioner"
 
 #. module: hr_payroll
 #: field:hr.payslip.input,payslip_id:0
@@ -208,7 +208,7 @@ msgstr "Noteringar"
 #: code:addons/hr_payroll/hr_payroll.py:905
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -234,7 +234,7 @@ msgstr "Övrig information"
 #. module: hr_payroll
 #: field:hr.config.settings,module_hr_payroll_account:0
 msgid "Link your payroll to accounting system"
-msgstr ""
+msgstr "Länka lönesystemet till bokföringen"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_select:0
@@ -303,7 +303,7 @@ msgstr "Struktur"
 #. module: hr_payroll
 #: field:hr.contribution.register,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Företag"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -313,7 +313,7 @@ msgstr "Totalt Arbetsdagar"
 #. module: hr_payroll
 #: constraint:hr.payroll.structure:0
 msgid "Error ! You cannot create a recursive Salary Structure."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva ersättningsstrukturer."
 
 #. module: hr_payroll
 #: help:hr.payslip.line,code:0
@@ -354,6 +354,17 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att lägga till ett nytt medarbetarregister.\n"
+"               
    \n"
+"                 Ett medarbetarregister är en tredje part inblandad i "
+"ersättningssystemet\n"
+"                 för de anställda. Det kan vara Skattemyndighet, "
+"Försäkringskassan, Arbetsförmedlingen, pensionsstöd, löntagarorganisation "
+"eller vilken den organisation/kassa som tillför eller drar pengar på "
+"lönebeskeden.\n"
+"               
    \n"
+"            "
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range_max:0
@@ -441,12 +452,12 @@ msgstr "Procentsats baserad på"
 #: code:addons/hr_payroll/hr_payroll.py:90
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
 
 #. module: hr_payroll
 #: help:hr.config.settings,module_hr_payroll_account:0
 msgid "Create journal entries from payslips"
-msgstr ""
+msgstr "Skapa journalverifikat från lönebesked."
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
@@ -456,7 +467,7 @@ msgstr "Tillverkade betalningsorder? "
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Lines by Contribution Register"
-msgstr "Lönespecifikationsrader från Bidrags Register"
+msgstr "Lönespecifikationsrader från medarbetarregistret"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -469,7 +480,7 @@ msgstr "Lönespecifikation Rader"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Övrigt"
 
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
@@ -494,7 +505,7 @@ msgstr "Återbetalning: "
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
 msgid "PaySlip Lines by Contribution Registers"
-msgstr "Lönespecifikationsrader genom Bidrags Register"
+msgstr "Lönespecifikationsrader via medarbetarregistret"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -521,7 +532,7 @@ msgstr "Fast belopp"
 #: code:addons/hr_payroll/hr_payroll.py:370
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,active:0
@@ -537,7 +548,7 @@ msgstr ""
 #: field:hr.payslip,state:0
 #: field:hr.payslip.run,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -630,7 +641,7 @@ msgstr "Lönespecifikation Computation Detaljer"
 #: help:hr.payslip.line,appears_on_payslip:0
 #: help:hr.salary.rule,appears_on_payslip:0
 msgid "Used to display the salary rule on payslip."
-msgstr ""
+msgstr "Används för att visa löneregler på lönebeskedet."
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
@@ -647,7 +658,7 @@ msgstr "Lön Rule Kategorier"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Cancel Payslip"
-msgstr ""
+msgstr "Avbryt lönebesked"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,contract_id:0
@@ -664,7 +675,7 @@ msgstr "Beräkning"
 #: code:addons/hr_payroll/hr_payroll.py:899
 #, python-format
 msgid "Wrong range condition defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Fel omfångsvillkor definierat för löneregeln %s (%s)."
 
 #. module: hr_payroll
 #: help:hr.payslip.input,amount:0
@@ -694,7 +705,7 @@ msgstr "Kategori"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Company Contribution"
-msgstr ""
+msgstr "Bolagets bidrag"
 
 #. module: hr_payroll
 #: help:hr.payslip.run,credit_note:0
@@ -709,7 +720,7 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:876
 #, python-format
 msgid "Wrong percentage base or quantity defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Fel procentbas eller kvantitet definierad för löneregeln %s (%s)."
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
@@ -767,7 +778,7 @@ msgstr "Procent (%)"
 #: code:addons/hr_payroll/hr_payroll.py:871
 #, python-format
 msgid "Wrong quantity defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Fel kvantitet definierad för löneregeln %s (%s)."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -852,7 +863,7 @@ msgstr "Avtal"
 #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
 #, python-format
 msgid "You must select employee(s) to generate payslip(s)."
-msgstr ""
+msgstr "Du måste välja anställda för att skapa lönebesked"
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -931,12 +942,12 @@ msgstr "Sekvens"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Period from"
-msgstr ""
+msgstr "Period från"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -1018,7 +1029,7 @@ msgstr "Anställdas lönespecifikation"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -1026,7 +1037,7 @@ msgstr ""
 #: field:hr.salary.rule,register_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
-msgstr "Bidrags Register"
+msgstr "Medarbetarregister"
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -1081,7 +1092,7 @@ msgstr "Totala grundlönen"
 #: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr "Bidrags Register"
+msgstr "Medarbetarregister"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
@@ -1093,13 +1104,14 @@ msgstr "Lön"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.contribution_register
 msgid "PaySlip Lines By Conribution Register"
-msgstr "Lönespecifikationsrader från Bidragsregistret"
+msgstr "Lönespecifikationsrader från medarbetarergistret"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:370
 #, python-format
 msgid "You cannot delete a payslip which is not draft or cancelled!"
 msgstr ""
+"Du kan inte radera ett lönebesked som inte är i \"Utkast\" eller \"Avbruten\""
 
 #. module: hr_payroll
 #: report:paylip.details:0
@@ -1171,6 +1183,10 @@ msgid ""
 "* If the payslip is confirmed then status is set to 'Done'.            \n"
 "* When user cancel payslip the status is 'Rejected'."
 msgstr ""
+"* När lönebesked skapas statusen är \"Utkast\".\n"
+"* Om lönebesked är under kontroll, är statusen \"Väntar\".\n"
+"* Om lönebesked bekräftas då status är inställd på \"Klar\".\n"
+"* När användaren avbryter lönespecifikation statusen är \"Avvisad\"."
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range:0
@@ -1197,7 +1213,7 @@ msgstr "Lönespecifikation indata"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Other Inputs"
-msgstr ""
+msgstr "Övriga indata"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
@@ -1209,7 +1225,7 @@ msgstr "Lön Regel Kategorier Hierarki"
 #: code:addons/hr_payroll/hr_payroll.py:882
 #, python-format
 msgid "Wrong python code defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Fel i python-koden definierat för löneregeln %s (%s)."
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -1240,7 +1256,7 @@ msgstr "Den kod som kan användas i lön reglerna"
 #: code:addons/hr_payroll/hr_payroll.py:905
 #, python-format
 msgid "Wrong python condition defined for salary rule %s (%s)."
-msgstr ""
+msgstr "Fel i python-villkoret definierat för löneregeln %s (%s)."
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
@@ -1272,7 +1288,7 @@ msgstr "Lönespecifikation Namn"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Accounting"
-msgstr ""
+msgstr "Bokföring"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range:0
diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index 1df18587af2..5ddb71011d6 100644
--- a/addons/hr_payroll_account/i18n/mn.po
+++ b/addons/hr_payroll_account/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2014-02-01 12:10+0000\n"
-"Last-Translator: gobi \n"
+"PO-Revision-Date: 2014-03-27 02:58+0000\n"
+"Last-Translator: Jacara \n"
 "Language-Team: Mongolian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-02 06:00+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
@@ -124,4 +124,4 @@ msgstr "Тохируулах бичилт"
 #: field:hr.payslip,journal_id:0
 #: field:hr.payslip.run,journal_id:0
 msgid "Salary Journal"
-msgstr "Цалингийн бүртгэл"
+msgstr "Цалингийн журнал"
diff --git a/addons/hr_payroll_account/i18n/sv.po b/addons/hr_payroll_account/i18n/sv.po
index 419ec16d1f4..edace2b502c 100644
--- a/addons/hr_payroll_account/i18n/sv.po
+++ b/addons/hr_payroll_account/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 21:23+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:13+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
@@ -50,7 +50,7 @@ msgstr "Utgiftsjournalen \"%s\" saknar debet-konto"
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_tax_id:0
 msgid "Tax Code"
-msgstr "Skattekod"
+msgstr "Momskod"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,period_id:0
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
index 8d1761b565a..202207141e1 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-06 21:08+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
+"PO-Revision-Date: 2014-04-11 13:05+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:13+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-12 09:42+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -126,7 +125,7 @@ msgid "Sources of Applicants"
 msgstr "Herkunft der Bewerber"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:445
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Sie müssen den beantragten Job für diesen Bewerber definieren."
@@ -323,7 +322,7 @@ msgstr ""
 "weiterzuarbeiten."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:445
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Warnung!"
@@ -545,7 +544,7 @@ msgid "Applicants"
 msgstr "Bewerber"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:360
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Kein Betreff"
@@ -566,9 +565,7 @@ msgid "Gives the sequence order when displaying a list of stages."
 msgstr "Zeigt Reihenfolge bei Listenansicht der Einstellungsstufen."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:347
 #: field:hr.applicant,partner_id:0
-#, python-format
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -826,7 +823,7 @@ msgid "Schedule interview with this applicant"
 msgstr "Terminiere ein Interview mit Bewerber"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:407
+#: code:addons/hr_recruitment/hr_recruitment.py:397
 #, python-format
 msgid "Applicant created"
 msgstr "Bewerbung wurde eingegeben"
@@ -1011,7 +1008,7 @@ msgstr "Der Name der Einstellung muss eindeutig sein"
 #: code:addons/hr_recruitment/hr_recruitment.py:349
 #, python-format
 msgid "Contact Email"
-msgstr ""
+msgstr "Kontakt-E-Mail"
 
 #. module: hr_recruitment
 #: view:hired.employee:0
@@ -1111,7 +1108,7 @@ msgid "New"
 msgstr "Neu"
 
 #. module: hr_recruitment
-#: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
+#: model:calendar.event.type,name:hr_recruitment.categ_meet_interview
 #: view:hr.job:0
 msgid "Interview"
 msgstr "Fragebogen"
diff --git a/addons/hr_recruitment/i18n/lt.po b/addons/hr_recruitment/i18n/lt.po
new file mode 100644
index 00000000000..76a4866f3d0
--- /dev/null
+++ b/addons/hr_recruitment/i18n/lt.po
@@ -0,0 +1,1280 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2014-03-16 13:33+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Lithuanian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-03-17 05:09+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Application Summary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Start Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Mobile:"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,fold:0
+msgid ""
+"This stage is not visible, for example in status bar or kanban view, when "
+"there are no records in that stage to display."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Filter and view on next actions and date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected_extra:0
+msgid "Expected Salary Extra"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Extra advantages..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Pending Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.source:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_source_action
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_source
+msgid "Sources of Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:435
+#, python-format
+msgid "You must define Applied Job for this applicant."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"
    \n"
+"                Click to add a new job applicant.\n"
+"              
    \n"
+"                OpenERP helps you track applicants in the recruitment\n"
+"                process and follow up all operations: meetings, interviews, "
+"etc.\n"
+"              
    \n"
+"                If you setup the email gateway, applicants and their "
+"attached\n"
+"                CV are created automatically when an email is sent to\n"
+"                jobs@yourcompany.com. If you install the document "
+"management\n"
+"                modules, all resumes are indexed automatically, so that you "
+"can\n"
+"                easily search through their content.\n"
+"              
    \n"
+"            "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applications"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,emp_id:0
+msgid "employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.config.settings,fetchmail_applicants:0
+msgid "Create applicants from an incoming email account"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Refuse"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Master Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid "Doctoral Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,department_id:0
+msgid ""
+"Stages of the recruitment process may be different per department. If this "
+"stage is common to all departments, keep this field empty."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.act_hr_applicant_to_meeting
+msgid "Meetings"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.job,survey_id:0
+msgid "Interview Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.job,survey_id:0
+msgid ""
+"Choose an interview form for this job position and you will be able to "
+"print/answer this interview from all applicants who apply for this job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:435
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,availability:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Print interview report"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Hired employees"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,source_id:0
+msgid "Source"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid ""
+"
    \n"
+"            Click to add a new stage in the recruitment process.\n"
+"          
    \n"
+"            Define here your stages of the recruitment process, for "
+"example:\n"
+"            qualification call, first interview, second interview, refused,\n"
+"            hired.\n"
+"          
    \n"
+"        "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.job,alias_id:0
+msgid ""
+"Email alias for this job position. New emails will automatically create new "
+"applicants for this job position."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_hired_employee
+#: model:ir.model,name:hr_recruitment.model_hired_employee
+msgid "Create Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Print Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Recruitment / Applicants Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:351
+#, python-format
+msgid "No Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected_extra:0
+msgid "Salary Expected by Applicant, extra advantages"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,state:0
+msgid ""
+"The status is set to 'Draft', when a case is created.                      "
+"If the case is in progress the status is set to 'Open'.                      "
+"When the case is over, the status is set to 'Done'.                      If "
+"the case needs to be reviewed then the status is                       set "
+"to 'Pending'."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Draft recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Delete"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Hire & Create Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A contact is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,categ_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant_category
+msgid "Category of applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "e.g. Call for interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer related job question"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Yes"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+#: view:hr.recruitment.partner.create:0
+msgid "or"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "No"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "All Initial Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_degree
+msgid "Degrees"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,state:0
+#: field:hr.recruitment.report,state:0
+#: field:hr.recruitment.stage,state:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule interview with this applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant created"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Applications"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act
+msgid ""
+"
    \n"
+"            Click to add a new stage in the recruitment process.\n"
+"          
    \n"
+"            Don't forget to specify the department if your recruitment "
+"process\n"
+"            is different according to the job position.\n"
+"          
    \n"
+"        "
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.config.settings,module_document_ftp:0
+msgid "Allow the automatic indexation of resumes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed_extra:0
+msgid "Proposed Salary Extra"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
+#, python-format
+msgid "A contact is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact:"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+msgid "Survey"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Would you like to create an employee ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Degree:"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_form_installer
+msgid ""
+"Check if the following stages are matching your recruitment process. Don't "
+"forget to specify the department if your recruitment process is different "
+"according to the job position."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.config.settings:0
+msgid "Configure"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_website_company
+msgid "Company Website"
+msgstr ""
+
+#. module: hr_recruitment
+#: sql_constraint:hr.recruitment.degree:0
+msgid "The name of the Degree of Recruitment must be unique!"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:349
+#, python-format
+msgid "Contact Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a contact based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.config.settings,fetchmail_applicants:0
+msgid ""
+"Allow applicants to send their job application to an email address "
+"(jobs@mycompany.com),\n"
+"                and create automatically application documents in the system."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject / Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hired.employee:0
+msgid "Create New Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_linkedin
+msgid "LinkedIn"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
+msgid "New Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:calendar.event.type,name:hr_recruitment.categ_meet_interview
+#: view:hr.job:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.source,name:0
+msgid "Source Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.source,name:hr_recruitment.source_word
+msgid "Word of Mouth"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.stage,fold:0
+msgid "Hide in views if empty"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.config.settings,module_document_ftp:0
+msgid ""
+"Manage your CV's and motivation letter related to all applicants.\n"
+"                This installs the module document_ftp. This will install the "
+"knowledge management  module in order to allow you to search using specific "
+"keywords through  the content of all documents (PDF, .DOCx...)"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+#: selection:hr.recruitment.stage,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Referred By"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Departement:"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg. Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Open Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant_category,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp_avg:0
+msgid "Avg. Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.job,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Feedback of interviews..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Pending recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.stage,department_id:0
+msgid "Specific to a Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
+msgid "Bachelor Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,state:0
+msgid ""
+"The related status for the stage. The status of your document will "
+"automatically change according to the selected stage. Example, a stage is "
+"related to the status 'Close', when your document reach this stage, it will "
+"be automatically closed."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed_extra:0
+msgid "Salary Proposed by the Organisation, extra advantages"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+msgid "Applications to be Processed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Schedule Interview"
+msgstr ""
diff --git a/addons/hr_recruitment/i18n/sv.po b/addons/hr_recruitment/i18n/sv.po
index d4b8cdef4db..42e24232510 100644
--- a/addons/hr_recruitment/i18n/sv.po
+++ b/addons/hr_recruitment/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-04 08:45+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:13+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -35,17 +35,17 @@ msgstr "Krav"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Application Summary"
-msgstr ""
+msgstr "Summering av ansökningar"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Start Interview"
-msgstr ""
+msgstr "Starta intervju"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Mobil:"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,fold:0
@@ -53,6 +53,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Denna etapp är inte synlig, t.ex. i statusfältet eller kanbanvyn, i de fall "
+"etappen saknar poster."
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
@@ -95,7 +97,7 @@ msgstr "Jobb"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Extra advantages..."
-msgstr ""
+msgstr "Extra förmåner..."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -106,7 +108,7 @@ msgstr "Vilande arbeten"
 #: view:hr.applicant:0
 #: field:hr.applicant,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0
@@ -123,7 +125,7 @@ msgid "Sources of Applicants"
 msgstr "Källor för sökande"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:445
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "You must define Applied Job for this applicant."
 msgstr "Du måste definiera sökta jobb för denna sökande."
@@ -159,12 +161,28 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att lägga till en ny jobbsökande.\n"
+"               \n"
+"                 OpenERP hjälper dig att spåra de sökande i "
+"rekryteringsprocessen\n"
+"                 och följa upp all verksamhet: möten, intervjuer etc.\n"
+"               
    \n"
+"                 Om du ställer in den e-postbrygga sökande och deras "
+"bifogade\n"
+"                 CV skapas automatiskt när en e-post skickas till\n"
+"                 jobs@yourcompany.com. Om du installerar dokumenthantering\n"
+"                 moduler är alla meritförteckningar automatiskt indexerade, "
+"så att du kan\n"
+"                 enkelt söka igenom deras innehåll.\n"
+"               
    \n"
+"            "
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
 msgid "Applications"
-msgstr ""
+msgstr "Ansökningar"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -174,12 +192,12 @@ msgstr "Dagar för att öppna"
 #. module: hr_recruitment
 #: field:hr.applicant,emp_id:0
 msgid "employee"
-msgstr ""
+msgstr "anställd"
 
 #. module: hr_recruitment
 #: field:hr.config.settings,fetchmail_applicants:0
 msgid "Create applicants from an incoming email account"
-msgstr ""
+msgstr "Skapa en ansökan från inkommande e-post"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -191,7 +209,7 @@ msgstr "Dag"
 #: view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
 msgid "Create Contact"
-msgstr ""
+msgstr "Skapa kontakt"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -223,7 +241,7 @@ msgstr "Nästa åtgärd"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fel!"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
@@ -246,7 +264,7 @@ msgstr ""
 #. module: hr_recruitment
 #: help:hr.applicant,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_recruitment
 #: field:hr.applicant,color:0
@@ -256,7 +274,7 @@ msgstr "Färgindex"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.act_hr_applicant_to_meeting
 msgid "Meetings"
-msgstr ""
+msgstr "Möten"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -295,9 +313,11 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:445
+#: code:addons/hr_recruitment/hr_recruitment.py:435
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
@@ -349,7 +369,7 @@ msgstr "Rekryteringsstatistik"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Print interview report"
-msgstr ""
+msgstr "Skriv ut intervjurapport"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -376,7 +396,7 @@ msgstr "År"
 #. module: hr_recruitment
 #: field:hr.applicant,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_monster
@@ -386,7 +406,7 @@ msgstr "Monster"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
 msgid "Applicant Hired"
-msgstr ""
+msgstr "Sökande anställd"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -406,6 +426,16 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
    \n"
+"             Klicka för att lägga till en ny fas i rekryteringsprocessen.\n"
+"           
    \n"
+"             Här definierar du dina etapper i rekryteringsprocessen, till "
+"exempel:\n"
+"             kvalificeringssamtal, första intervjun, andra intervju, "
+"avslag,\n"
+"             anställd.\n"
+"           
    \n"
+"        "
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -506,7 +536,7 @@ msgid "Applicants"
 msgstr "Sökande"
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:360
+#: code:addons/hr_recruitment/hr_recruitment.py:351
 #, python-format
 msgid "No Subject"
 msgstr "Inget ämne"
@@ -527,9 +557,7 @@ msgid "Gives the sequence order when displaying a list of stages."
 msgstr "Visaren lista på stegen i sekvens ordning."
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:347
 #: field:hr.applicant,partner_id:0
-#, python-format
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -547,6 +575,9 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"Statusen är satt till \"Utkast\", när ett ärende skapas. Om ärendet pågår är "
+"status inställd på \"Öppna\". När fallet är över, sätts status till "
+"\"Klar\". Om ärendet måste granskas är status \"Väntar\"."
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -578,12 +609,12 @@ msgstr "Pågående"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Hire & Create Employee"
-msgstr ""
+msgstr "Anställ och skapa medarbetare"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
 msgid "Applicant hired"
-msgstr ""
+msgstr "Sökande anställd"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -619,17 +650,17 @@ msgstr ""
 #. module: hr_recruitment
 #: field:hr.applicant,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_applicant_category
 msgid "Category of applicant"
-msgstr ""
+msgstr "Sökandekategori"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "e.g. Call for interview"
-msgstr ""
+msgstr "eg Kalla till intervju"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -667,12 +698,12 @@ msgstr "Ämne"
 #: view:hired.employee:0
 #: view:hr.recruitment.partner.create:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
 msgid "Applicant Refused"
-msgstr ""
+msgstr "Sökande avslagen"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -779,10 +810,10 @@ msgid "Schedule interview with this applicant"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:407
+#: code:addons/hr_recruitment/hr_recruitment.py:397
 #, python-format
 msgid "Applicant created"
-msgstr ""
+msgstr "Sökande skapad"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -812,7 +843,7 @@ msgstr "Dagar i behandling"
 #. module: hr_recruitment
 #: field:hr.applicant,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,user_id:0
@@ -834,7 +865,7 @@ msgstr "Aktiva"
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,nbr:0
 msgid "# of Applications"
-msgstr ""
+msgstr "# sökanden"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_act
@@ -848,6 +879,13 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
    \n"
+"             Klicka för att lägga till en ny etapp i rekryteringsprocessen.\n"
+"           
    \n"
+"             Glöm inte att ange vilken avdelning om din rekryteringsprocess\n"
+"             skiljer sig beroende på befattning.\n"
+"           
    \n"
+"        "
 
 #. module: hr_recruitment
 #: field:hr.applicant,response:0
@@ -878,7 +916,7 @@ msgstr "januari"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:56
 #, python-format
 msgid "A contact is already existing with the same name."
-msgstr ""
+msgstr "Kontakt med samma namn finns redan"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
@@ -888,7 +926,7 @@ msgstr "Granska etapperna i rektryteringsprocessen"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contact:"
-msgstr ""
+msgstr "Kontakt:"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -914,7 +952,7 @@ msgstr "Vill du lägga upp en anställd ?"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Degree:"
-msgstr ""
+msgstr "Examen:"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -934,7 +972,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurera"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
@@ -955,7 +993,7 @@ msgstr "Namnet på examen för rekryteringen måste vara unik!"
 #: code:addons/hr_recruitment/hr_recruitment.py:349
 #, python-format
 msgid "Contact Email"
-msgstr ""
+msgstr "Kontaktpersonens e-postadress"
 
 #. module: hr_recruitment
 #: view:hired.employee:0
@@ -996,7 +1034,7 @@ msgstr "Ger sorteringsordningen när listan med examina visas."
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
 msgid "Stage changed"
-msgstr ""
+msgstr "Steg ändrat"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1025,7 +1063,7 @@ msgstr "LinkedIn"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
 msgid "New Applicant"
-msgstr ""
+msgstr "Ny sökande"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
@@ -1047,7 +1085,7 @@ msgid "New"
 msgstr "Ny"
 
 #. module: hr_recruitment
-#: model:crm.meeting.type,name:hr_recruitment.categ_meet_interview
+#: model:calendar.event.type,name:hr_recruitment.categ_meet_interview
 #: view:hr.job:0
 msgid "Interview"
 msgstr "Intervju"
@@ -1060,7 +1098,7 @@ msgstr "Källnamn"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Dag(ar)"
 
 #. module: hr_recruitment
 #: field:hr.applicant,description:0
@@ -1070,7 +1108,7 @@ msgstr "Beskrivning"
 #. module: hr_recruitment
 #: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
 msgid "Stage Changed"
-msgstr ""
+msgstr "Etapp ändrad"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1120,12 +1158,12 @@ msgstr "Anställd"
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
 msgid "Referred By"
-msgstr ""
+msgstr "Hänvisad av"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Departement:"
-msgstr ""
+msgstr "Avdelning:"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -1141,7 +1179,7 @@ msgstr "Första intervjuen"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
 msgid "Avg. Proposed Salary"
-msgstr ""
+msgstr "Erbjuden lön i medeltal"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1194,12 +1232,12 @@ msgstr "De här personerna kommer att ta emot e-post."
 #. module: hr_recruitment
 #: field:hr.job,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Feedback of interviews..."
-msgstr ""
+msgstr "Återkoppling från intervjuer..."
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1209,22 +1247,22 @@ msgstr "Vilande rekryteringar"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Contract"
-msgstr ""
+msgstr "Avtal"
 
 #. module: hr_recruitment
 #: field:hr.applicant,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: hr_recruitment
 #: help:hr.applicant,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: hr_recruitment
 #: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
 msgid "Applicant refused"
-msgstr ""
+msgstr "Ansökan avslagen"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
@@ -1255,7 +1293,7 @@ msgstr "Icke tilldelade rekryteringar"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,state:0
@@ -1289,4 +1327,4 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Schedule Interview"
-msgstr ""
+msgstr "Planerad intervju"
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index 717f002fb4e..ef6e8ac7fcc 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-19 07:22+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:13+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -42,6 +42,26 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Ännu ingen aktivitet på detta kontrakt.\n"
+"               \n"
+"                 I OpenERP är kontrakt och projekt implementerade som "
+"objektkonton, \n"
+"                 så att kostnader och intäkter är spårbara och enkla att "
+"analysera.\n"
+"               \n"
+"                 Kostnaderna kommer att skapas automatiskt när du "
+"registrerar leverantörs-\n"
+"                 fakturor, kostnader eller tidrapporter.\n"
+"               \n"
+"                 Intäkterna skapas automatiskt när du skapar kund-\n"
+"                 fakturor. Kundfakturor kan skapas baserat på "
+"försäljningsorder\n"
+"                 (fastpris fakturor), på tidrapporter (baserat på det "
+"arbete) eller\n"
+"                 på kostnader (t.ex. faktiska resekostnader).\n"
+"               \n"
+"            "
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -75,7 +95,7 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -103,7 +123,7 @@ msgstr "Tidrapport"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Please define employee for this user!"
-msgstr ""
+msgstr "Vänligen ange anställd för denna användare!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -129,7 +149,7 @@ msgstr "Fri"
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Tidrapporteringsrader"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -166,12 +186,12 @@ msgstr "Skriv ut tidrapport för anställda"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "Please define employee for your user."
-msgstr ""
+msgstr "Vänligen ange anställd för ditt användareid."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.act_analytic_cost_revenue
 msgid "Costs & Revenues"
-msgstr ""
+msgstr "Kostnader och intäkter"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -188,7 +208,7 @@ msgstr "Objekt"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Costs and Revenues"
-msgstr ""
+msgstr "Kostnader och intäkter"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:150
@@ -198,7 +218,7 @@ msgstr ""
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
@@ -244,6 +264,16 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att registrera aktiviteter.\n"
+"               \n"
+"                 Du kan registrera och spåra dina arbetstimmar med projekt "
+"varje\n"
+"                 dag. Varje tid på ett projekt kommer att bli en kostnad i\n"
+"                 objektredovisning / kontrakt och kan faktureras\n"
+"                 kunder om så önskas.\n"
+"               \n"
+"            "
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -254,7 +284,7 @@ msgstr "Skriv ut"
 #. module: hr_timesheet
 #: help:account.analytic.account,use_timesheets:0
 msgid "Check this field if this project manages timesheets"
-msgstr ""
+msgstr "Kryssa detta fält, om  projektet hanterar tidrapporter"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -280,7 +310,7 @@ msgstr "Startdatum"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #, python-format
 msgid "Please define cost unit for this employee."
-msgstr ""
+msgstr "Vänligen ange kostnadsenhet för denna antällda."
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
@@ -294,6 +324,8 @@ msgid ""
 "No analytic account is defined on the project.\n"
 "Please set one or we cannot automatically fill the timesheet."
 msgstr ""
+"Objektkonto saknas för detta projekt.\n"
+"Vänligen ange ett, annars går det inte att fylla i tidrapporten."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -307,6 +339,8 @@ msgid ""
 "No 'Analytic Journal' is defined for employee %s \n"
 "Define an employee for the selected user and assign an 'Analytic Journal'!"
 msgstr ""
+"Ingen 'Objektjournal' finns för denna anställda %s \n"
+"Ange en anställd för den valda användaren och knyt till en 'Objektjournal'!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -348,7 +382,7 @@ msgstr "Arbetsbeskrivning"
 #: view:hr.sign.in.project:0
 #: view:hr.sign.out.project:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: hr_timesheet
 #: xsl:hr.analytical.timesheet:0
@@ -421,6 +455,8 @@ msgid ""
 "No analytic journal defined for '%s'.\n"
 "You should assign an analytic journal on the employee form."
 msgstr ""
+"Objektjournal saknas för '%s'.\n"
+"En objektjournal bör knytas till den anställde i anställningsformuläret."
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -435,7 +471,7 @@ msgstr "June"
 #: field:hr.sign.in.project,state:0
 #: field:hr.sign.out.project,state:0
 msgid "Current Status"
-msgstr ""
+msgstr "Nuvarande Status"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -501,7 +537,7 @@ msgstr "Anställningsnummer"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Period"
-msgstr ""
+msgstr "Period"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -614,6 +650,8 @@ msgid ""
 "Please create an employee for this user, using the menu: Human Resources > "
 "Employees."
 msgstr ""
+"Vänligen skapa en anställd för denna användare, via menyn: Personal > "
+"Anställda."
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -643,7 +681,7 @@ msgstr "April"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Användarfel!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -659,7 +697,7 @@ msgstr "År"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Duration"
-msgstr ""
+msgstr "Varaktighet"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 66afa18ce49..0bb07e85372 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-30 23:31+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-27 12:40+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -60,7 +60,7 @@ msgstr "Gruppera efter..."
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Force to use a specific product"
-msgstr ""
+msgstr "Kräv en viss produkt"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 4334c73aace..0a4f9676da9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -20,10 +20,11 @@
 ##############################################################################
 
 import time
-from datetime import datetime, timedelta
+from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
 from openerp.osv import fields, osv
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.translate import _
 from openerp import netsvc
 
@@ -63,28 +64,56 @@ class hr_timesheet_sheet(osv.osv):
     def copy(self, cr, uid, ids, *args, **argv):
         raise osv.except_osv(_('Error!'), _('You cannot duplicate a timesheet.'))
 
-    def create(self, cr, uid, vals, *args, **argv):
+    def create(self, cr, uid, vals, context=None):
         if 'employee_id' in vals:
-            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id:
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).user_id:
                 raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign it to a user.'))
-            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).product_id:
                 raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product, like \'Consultant\'.'))
-            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).journal_id:
                 raise osv.except_osv(_('Configuration Error!'), _('In order to create a timesheet for this employee, you must assign an analytic journal to the employee, like \'Timesheet Journal\'.'))
-        return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **argv)
+        if vals.get('attendances_ids'):
+            # If attendances, we sort them by date asc before writing them, to satisfy the alternance constraint
+            vals['attendances_ids'] = self.sort_attendances(cr, uid, vals['attendances_ids'], context=context)
+        return super(hr_timesheet_sheet, self).create(cr, uid, vals, context=context)
 
-    def write(self, cr, uid, ids, vals, *args, **argv):
+    def write(self, cr, uid, ids, vals, context=None):
         if 'employee_id' in vals:
-            new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).user_id.id or False
+            new_user_id = self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).user_id.id or False
             if not new_user_id:
                 raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign it to a user.'))
-            if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id):
+            if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id, context=context):
                 raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlap!\nYou should use the menu \'My Timesheet\' to avoid this problem.'))
-            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).product_id:
                 raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product.'))
-            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
+            if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id'], context=context).journal_id:
                 raise osv.except_osv(_('Configuration Error!'), _('In order to create a timesheet for this employee, you must assign an analytic journal to the employee, like \'Timesheet Journal\'.'))
-        return super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, *args, **argv)
+        if vals.get('attendances_ids'):
+            # If attendances, we sort them by date asc before writing them, to satisfy the alternance constraint
+            # In addition to the date order, deleting attendances are done before inserting attendances
+            vals['attendances_ids'] = self.sort_attendances(cr, uid, vals['attendances_ids'], context=context)
+        res = super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, context=context)
+        if vals.get('attendances_ids'):
+            for timesheet in self.browse(cr, uid, ids):
+                if not self.pool['hr.attendance']._altern_si_so(cr, uid, [att.id for att in timesheet.attendances_ids]):
+                    raise osv.except_osv(_('Warning !'), _('Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)'))
+        return res
+
+    def sort_attendances(self, cr, uid, attendance_tuples, context=None):
+        date_attendances = []
+        for att_tuple in attendance_tuples:
+            if att_tuple[0] in [0,1,4]:
+                if att_tuple[0] in [0,1]:
+                    name = att_tuple[2]['name']
+                else:
+                    name = self.pool['hr.attendance'].browse(cr, uid, att_tuple[1]).name
+                date_attendances.append((1, name, att_tuple))
+            elif att_tuple[0] in [2,3]:
+                date_attendances.append((0, self.pool['hr.attendance'].browse(cr, uid, att_tuple[1]).name, att_tuple))
+            else: 
+                date_attendances.append((0, False, att_tuple))
+        date_attendances.sort()
+        return [att[2] for att in date_attendances]
 
     def button_confirm(self, cr, uid, ids, context=None):
         for sheet in self.browse(cr, uid, ids, context=context):
@@ -362,18 +391,22 @@ class hr_attendance(osv.osv):
             attendance_ids.extend([row[0] for row in cr.fetchall()])
         return attendance_ids
 
+    def _get_current_sheet(self, cr, uid, employee_id, date=False, context=None):
+        if not date:
+            date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        # ending date with no time to avoid timesheet with early date_to
+        date_to = date[0:10]+' 00:00:00'
+        # limit=1 because only one sheet possible for an employee between 2 dates
+        sheet_ids = self.pool.get('hr_timesheet_sheet.sheet').search(cr, uid, [
+            ('date_to', '>=', date_to), ('date_from', '<=', date),
+            ('employee_id', '=', employee_id)
+        ], limit=1, context=context)
+        return sheet_ids and sheet_ids[0] or False
+
     def _sheet(self, cursor, user, ids, name, args, context=None):
-        sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
         res = {}.fromkeys(ids, False)
         for attendance in self.browse(cursor, user, ids, context=context):
-            date_to = datetime.strftime(datetime.strptime(attendance.name[0:10], '%Y-%m-%d'), '%Y-%m-%d %H:%M:%S')
-            sheet_ids = sheet_obj.search(cursor, user,
-                [('date_to', '>=', date_to), ('date_from', '<=', attendance.name),
-                 ('employee_id', '=', attendance.employee_id.id)],
-                context=context)
-            if sheet_ids:
-                # [0] because only one sheet possible for an employee between 2 dates
-                res[attendance.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
+            res[attendance.id] = self._get_current_sheet(cursor, user, attendance.employee_id.id, attendance.name, context=context)
         return res
 
     _columns = {
@@ -392,16 +425,15 @@ class hr_attendance(osv.osv):
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
-        if 'sheet_id' in context:
-            ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, context['sheet_id'], context=context)
+
+        sheet_id = context.get('sheet_id') or self._get_current_sheet(cr, uid, vals.get('employee_id'), vals.get('name'), context=context)
+        if sheet_id:
+            ts = self.pool.get('hr_timesheet_sheet.sheet').browse(cr, uid, sheet_id, context=context)
             if ts.state not in ('draft', 'new'):
-                raise osv.except_osv(_('Error!'), _('You cannot modify an entry in a confirmed timesheet.'))
-        res = super(hr_attendance,self).create(cr, uid, vals, context=context)
-        if 'sheet_id' in context:
-            if context['sheet_id'] != self.browse(cr, uid, res, context=context).sheet_id.id:
-                raise osv.except_osv(_('User Error!'), _('You cannot enter an attendance ' \
-                        'date outside the current timesheet dates.'))
-        return res
+                raise osv.except_osv(_('Error!'), _('You can not enter an attendance in a submitted timesheet. Ask your manager to reset it before adding attendance.'))
+            elif ts.date_from > vals.get('name') or ts.date_to < vals.get('name'):
+                raise osv.except_osv(_('User Error!'), _('You can not enter an attendance date outside the current timesheet dates.'))
+        return super(hr_attendance,self).create(cr, uid, vals, context=context)
 
     def unlink(self, cr, uid, ids, *args, **kwargs):
         if isinstance(ids, (int, long)):
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 9af163bda08..3959ab40670 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-18 12:28+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -750,7 +750,7 @@ msgstr "Zakres kart"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr "Moja suma ibecności wg tygodni"
+msgstr "Moja suma obecności wg tygodni"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index 20bb174760c..c9008c07c33 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-19 07:52+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-20 06:19+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -34,7 +34,7 @@ msgstr "Tjänst"
 #: field:hr.timesheet.report,quantity:0
 #: field:timesheet.report,quantity:0
 msgid "Time"
-msgstr ""
+msgstr "Tid"
 
 #. module: hr_timesheet_sheet
 #: help:hr.config.settings,timesheet_max_difference:0
@@ -93,7 +93,7 @@ msgstr "# Kostnad"
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -123,7 +123,7 @@ msgstr "Satt till utkast"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Timesheet Period"
-msgstr ""
+msgstr "Tidrapportperiod"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0
@@ -134,7 +134,7 @@ msgstr "Datum till"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "to"
-msgstr ""
+msgstr "till"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -157,7 +157,7 @@ msgstr "Gruppera på dagen i datumet"
 #. module: hr_timesheet_sheet
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 msgid "My Current Timesheet"
-msgstr "My Current Timesheet"
+msgstr "Min aktuella tidrapport"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -189,7 +189,7 @@ msgstr "Avslå"
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Activities"
-msgstr ""
+msgstr "Tidrapporteringsrader"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
@@ -776,7 +776,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Submit to Manager"
-msgstr ""
+msgstr "Skicka till chef"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -835,6 +835,8 @@ msgid ""
 "You cannot have 2 timesheets that overlap!\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Du kan inte ha överlappande tidrapporter!\n"
+"Använd menyn \"Min aktuella tidrapport\" för att undvika detta problem."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index 6774d404802..5caaf71b0da 100644
--- a/addons/knowledge/i18n/sv.po
+++ b/addons/knowledge/i18n/sv.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-29 14:48+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:15+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-30 06:15+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Documents"
-msgstr ""
+msgstr "Dokument"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_webdav:0
@@ -33,11 +33,13 @@ msgid ""
 "Access your documents in OpenERP through WebDAV.\n"
 "                This installs the module document_webdav."
 msgstr ""
+"Få tillgång till dina dokument i OpenERP via WebDAV.\n"
+"                 Detta installerar modulen document_webdav."
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_page:0
 msgid "This installs the module document_page."
-msgstr ""
+msgstr "Detta installerar modulen document_page"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
@@ -48,12 +50,12 @@ msgstr "Samverkansinnehåll"
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: view:knowledge.config.settings:0
 msgid "Configure Knowledge"
-msgstr ""
+msgstr "Konfigurera kunskapssystemet"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Knowledge and Documents Management"
-msgstr ""
+msgstr "Dokumenthantering och kunskapsutveckling"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document:0
@@ -63,31 +65,36 @@ msgid ""
 "and a document dashboard.\n"
 "                This installs the module document."
 msgstr ""
+"Detta är en komplett dokumenthanteringssystem, med: användarautentisering,\n"
+"                 fritextsökning i dokumenten (dock ej pptx eller docx, "
+"använd odt-formaten och pdf för bästa resultat), och en "
+"dokumentanslagstavla.\n"
+"                 Detta installerar modulen document."
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_page:0
 msgid "Create static web pages"
-msgstr ""
+msgstr "Skapar statiska webbsidor"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_ftp:0
 msgid "Share repositories (FTP)"
-msgstr ""
+msgstr "Dela dokumentarkiv (FTP)"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
 msgid "Manage documents"
-msgstr ""
+msgstr "Administrera dokument"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -100,16 +107,18 @@ msgid ""
 "Access your documents in OpenERP through an FTP interface.\n"
 "                This installs the module document_ftp."
 msgstr ""
+"Få tillgång till dina dokument i OpenERP via ett FTP-gränssnitt.\n"
+"                 Detta installerar modulen document_ftp."
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_webdav:0
 msgid "Share repositories (WebDAV)"
-msgstr ""
+msgstr "Dela dokumentarkiv (WebDAV)"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/l10n_be/account_tax_template.xml b/addons/l10n_be/account_tax_template.xml
index 7dfd37b2f40..6958673ae8b 100644
--- a/addons/l10n_be/account_tax_template.xml
+++ b/addons/l10n_be/account_tax_template.xml
@@ -2052,6 +2052,8 @@
             VAT-IN-V82-CAR-EXC-C1
             Frais de voiture - VAT 50% Non Deductible
             
+            
+            
             
             0.105
             percent
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index ea695c5acf6..b02f8bafd75 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2013-06-19 09:15+0000\n"
+"PO-Revision-Date: 2014-03-25 12:14+0000\n"
 "Last-Translator: Pedro Manuel Baeza \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:15+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_appro_mbsd3
@@ -307,7 +307,7 @@ msgstr "Periodo (s)"
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:94
 #, python-format
 msgid "No data found for the selected year."
-msgstr ""
+msgstr "No se encontró información para el año seleccionado."
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_actifsimmobilises0
@@ -479,7 +479,7 @@ msgstr ""
 #. module: l10n_be
 #: help:partner.vat.intra,tax_code_id:0
 msgid "Keep empty to use the user's company"
-msgstr ""
+msgstr "Dejar vacío para utilizar la compañía del usuario"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_actif
@@ -507,7 +507,7 @@ msgstr "Guardar XML"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:149
 #, python-format
 msgid "No phone associated with the company."
-msgstr ""
+msgstr "Ningún teléfono asociado con esta compañía"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesplusdunan2
@@ -519,7 +519,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:111
 #, python-format
 msgid "No VAT number associated with your company."
-msgstr ""
+msgstr "No existe NIF asociado con su compañía"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservesimmunises3_B
@@ -548,7 +548,7 @@ msgstr "Países europeos"
 #: view:partner.vat.intra:0
 #: view:partner.vat.list:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -569,13 +569,13 @@ msgstr ""
 #. module: l10n_be
 #: field:vat.listing.clients,vat_amount:0
 msgid "VAT Amount"
-msgstr ""
+msgstr "Importe impuestos"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:246
 #, python-format
 msgid "No vat number defined for %s."
-msgstr ""
+msgstr "Ningún NIF definido para %s"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficepertereporte2
@@ -606,7 +606,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:69
 #, python-format
 msgid "No belgian contact with a VAT number in your database."
-msgstr ""
+msgstr "Ningún contacto belga con NIF en su base de datos."
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
@@ -638,12 +638,12 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:296
 #, python-format
 msgid "XML File has been Created"
-msgstr ""
+msgstr "Archivo XML creado"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_belgium_bs
 msgid "Belgium Balance Sheet"
-msgstr ""
+msgstr "Balance de situación belga"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_restitution:0
@@ -659,7 +659,7 @@ msgstr ""
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Opciones avanzadas"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_produitsexceptionnels1
@@ -685,7 +685,7 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:265
 #, python-format
 msgid "No data available for the client."
-msgstr ""
+msgstr "No existe información disponible para el cliente."
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_etablissementsdecrdit4
@@ -695,13 +695,13 @@ msgstr ""
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_terrainsetconstructions2
 msgid "Terrains et constructions"
-msgstr ""
+msgstr "Terrenos y construcciones"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:69
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_capitalsouscrit3
@@ -716,12 +716,12 @@ msgstr "IVA empresa intracomunitaria"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_stocks2
 msgid "Stocks"
-msgstr ""
+msgstr "Existencias"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_valeursdisponibles1
 msgid "Valeurs disponibles"
-msgstr ""
+msgstr "Valores disponibles"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,period_id:0
@@ -778,7 +778,7 @@ msgstr "Cancelar"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:147
 #, python-format
 msgid "No email address associated with the company."
-msgstr ""
+msgstr "Ningún correo electrónico asociado con la compañía."
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -815,7 +815,7 @@ msgstr ""
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_account_report_be_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Pérdidas y ganancias"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_passif0
@@ -916,7 +916,7 @@ msgstr "Periodo de declaración de IVA"
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:64
 #, python-format
 msgid "No data for the selected year."
-msgstr ""
+msgstr "No se encontró información para el año seleccionado."
 
 #. module: l10n_be
 #: field:partner.vat,limit_amount:0
diff --git a/addons/l10n_be/i18n/nl_BE.po b/addons/l10n_be/i18n/nl_BE.po
index f9200a32c6c..bff7c4560a6 100644
--- a/addons/l10n_be/i18n/nl_BE.po
+++ b/addons/l10n_be/i18n/nl_BE.po
@@ -8,34 +8,34 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-04 16:52+0000\n"
+"Last-Translator: Els Van Vossel (Foxy) \n"
 "Language-Team: Dutch (Belgium) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:15+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-05 06:18+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_appro_mbsd3
 msgid "Approvisionnements, marchandises, services et biens divers"
-msgstr ""
+msgstr "Handelsgoederen, grond- en hulpstoffen, diensten en diverse goederen"
 
 #. module: l10n_be
 #: field:vat.listing.clients,turnover:0
 msgid "Base Amount"
-msgstr ""
+msgstr "Grondslag"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rmunrationschargessocialesetpensions2
 msgid "Rémunérations, charges sociales et pensions"
-msgstr ""
+msgstr "Bezoldigingen, sociale lasten en pensioenen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_locationfinancementetdroitssimilaires2
 msgid "Location-financement et droits similaires"
-msgstr ""
+msgstr "Leasing en soortgelijke rechten"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,tax_code_id:0
@@ -45,12 +45,12 @@ msgstr "Btw-code"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_produitsetchargesdexploitation1
 msgid "Produits et charges d'exploitation"
-msgstr ""
+msgstr "Bedrijfsopbrengsten en bedrijfskosten"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_chargesfinancires1
 msgid "Charges financières"
-msgstr ""
+msgstr "Financiële kosten"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -60,33 +60,33 @@ msgstr ""
 #: view:partner.vat.list:0
 #: field:partner.vat.list,comments:0
 msgid "Comments"
-msgstr ""
+msgstr "Opmerkingen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_primesdmission2
 msgid "Primes d'émission"
-msgstr ""
+msgstr "Uitgiftepremies"
 
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_account_report_be_pl
 msgid "Comptes de Charges"
-msgstr ""
+msgstr "Kostenrekeningen"
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_payment:0
 msgid "It indicates whether a payment is to make or not?"
-msgstr ""
+msgstr "Duidt aan of er een betaling moet worden uitgevoerd."
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_vat_listing_clients
 msgid "vat.listing.clients"
-msgstr ""
+msgstr "Klantenlisting"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
 msgid "Partner VAT Intra"
-msgstr "Intracommunautaire opgave"
+msgstr "Intracommunautaire aangifte"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_ammo2
@@ -94,16 +94,18 @@ msgid ""
 "Amortissements et réductions de valeur sur frais d'établissement, sur "
 "immobilisations incorporelles et corporelles"
 msgstr ""
+"Afschrijvingen en waardeverminderingen op oprichtingskosten, op immateriële "
+"en materiële vaste activa"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_prlvementssurlesimptsdiffrs1
 msgid "Prélèvements sur les impôts différés"
-msgstr ""
+msgstr "Onttrekking aan de uitgestelde belastingen"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_account_report_be_bs
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Balans"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -115,33 +117,33 @@ msgstr "Bedrijf"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_immobilisationsincorporelles1
 msgid "Immobilisations incorporelles"
-msgstr ""
+msgstr "Immateriële vaste activa"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservesimmunises3
 msgid "Réserves immunisées"
-msgstr ""
+msgstr "Belastingvrije reserves"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:317
 #, python-format
 msgid "No record to print."
-msgstr ""
+msgstr "Geen record om af te drukken"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rserves2
 msgid "Réserves"
-msgstr ""
+msgstr "Reserves"
 
 #. module: l10n_be
 #: help:partner.vat.intra,mand_id:0
 msgid "Reference given by the Representative of the sending company."
-msgstr ""
+msgstr "Referentie van de vertegenwoordiger van de afzender"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_installationsmachinesetoutillage2
 msgid "Installations, machines et outillage"
-msgstr ""
+msgstr "Installaties, machines en uitrusting"
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,client_nihil:0
@@ -149,6 +151,9 @@ msgid ""
 "Tick this case only if it concerns only the last statement on the civil or "
 "cessation of activity: no clients to be included in the client listing."
 msgstr ""
+"Schakel dit vakje enkel in als het gaat om de laatste aangifte van het jaar "
+"of bij staking van de activiteiten: geen klanten op te nemen in "
+"klantenlisting"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -158,13 +163,13 @@ msgstr "XML opslaan"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_placementsdetrsorerie1
 msgid "Placements de trésorerie"
-msgstr ""
+msgstr "Geldbeleggingen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_autresdettes6
 #: model:account.financial.report,name:l10n_be.account_financial_report_autresdettes8
 msgid "Autres dettes"
-msgstr ""
+msgstr "Overige schulden"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -178,14 +183,14 @@ msgstr "_XML maken"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:111
 #, python-format
 msgid "insufficient data!"
-msgstr ""
+msgstr "Onvoldoende gegevens"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:317
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:116
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fout"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:112
@@ -200,12 +205,12 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:246
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Onvoldoende gegevens"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_effetspayer4
 msgid "Effets à payer"
-msgstr ""
+msgstr "Te betalen wissels"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -215,22 +220,22 @@ msgstr "Laatste aangifte"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_imptsdiffrs2
 msgid "Impôts différés"
-msgstr ""
+msgstr "Uitgestelde belastingen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_produitsfinanciers1
 msgid "Produits financiers"
-msgstr ""
+msgstr "Financiële opbrengsten"
 
 #. module: l10n_be
 #: field:vat.listing.clients,vat:0
 msgid "VAT"
-msgstr ""
+msgstr "Btw"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_transfertauximptsdiffrs1
 msgid "Transfert aux impôts différés"
-msgstr ""
+msgstr "Overboeking naar de uitgestelde belastingen"
 
 #. module: l10n_be
 #: help:partner.vat.intra,period_ids:0
@@ -241,12 +246,12 @@ msgstr "Kies hier de periode(n) voor uw intracommunautaire opgave"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_stocketcommandesencoursdexcution1
 msgid "Stock et commandes en cours d'exécution"
-msgstr ""
+msgstr "Voorraden en bestellingen in uitvoering"
 
 #. module: l10n_be
 #: field:partner.vat.intra,mand_id:0
 msgid "Reference"
-msgstr ""
+msgstr "Referentie"
 
 #. module: l10n_be
 #: help:partner.vat.intra,period_code:0
@@ -274,12 +279,12 @@ msgstr ""
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesunanauplus2
 msgid "Dettes à un an au plus"
-msgstr ""
+msgstr "Schulden op ten hoogste één jaar"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_imptssurlersultat1
 msgid "Impôts sur le résultat"
-msgstr ""
+msgstr "Belastingen op het resultaat"
 
 #. module: l10n_be
 #: field:partner.vat.intra,period_code:0
@@ -290,7 +295,7 @@ msgstr "Periodecode"
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettescommerciales5
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettescommerciales7
 msgid "Dettes commerciales"
-msgstr ""
+msgstr "Handelsschulden"
 
 #. module: l10n_be
 #: field:partner.vat.intra,period_ids:0
@@ -301,33 +306,33 @@ msgstr "Periode(n)"
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:94
 #, python-format
 msgid "No data found for the selected year."
-msgstr ""
+msgstr "Geen gegevens gevonden voor het geselecteerde jaar."
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_actifsimmobilises0
 msgid "ACTIFS IMMOBILISES"
-msgstr ""
+msgstr "VASTE ACTIVA"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_stock
 msgid "Stock et Encours"
-msgstr "Voorraden in bestelling"
+msgstr "Voorraden en bestellingen in uitvoering"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_autrescrances3
 #: model:account.financial.report,name:l10n_be.account_financial_report_autrescrances5
 msgid "Autres créances"
-msgstr ""
+msgstr "Overige vorderingen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_fraisdtablissements1
 msgid "Frais d'établissements"
-msgstr ""
+msgstr "Oprichtingskosten"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_immobilisationsencoursetacomptesverss2
 msgid "Immobilisations en cours et acomptes versés"
-msgstr ""
+msgstr "Activa in aanbouw en vooruitbetalingen"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_view
@@ -345,16 +350,18 @@ msgstr "Onvoldoende gegevens"
 msgid ""
 "You can remove clients/partners which you do not want to show in xml file"
 msgstr ""
+"Klanten/relaties die u niet in het xml-bestand wil opnemen, kunt u "
+"verwijderen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficepertedelexcercice1
 msgid "Bénéfice (Perte) de l'excercice"
-msgstr ""
+msgstr "Winst (Verlies) van het boekjaar"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,client_nihil:0
 msgid "Last Declaration, no clients in client listing"
-msgstr ""
+msgstr "Laatste aangifte, geen klanten in klantenlisting"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:258
@@ -368,19 +375,21 @@ msgid ""
 "Réductions de valeur sur stocks, sur commandes en cours d'exécution et sur "
 "créances commerciales: dotations (reprises)"
 msgstr ""
+"Waardeverminderingen op voorraden, op bestellingen in uitvoering en op "
+"handelsvorderingen: toevoegingen (terugnemingen)"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:116
 #, python-format
 msgid "Period code is not valid."
-msgstr ""
+msgstr "Periodecode is niet geldig"
 
 #. module: l10n_be
 #: help:partner.vat.intra,no_vat:0
 msgid ""
 "The Partner whose VAT number is not defined  and they are not included in "
 "XML File."
-msgstr ""
+msgstr "Relaties zonder btw-nummer worden niet opgenomen in het xml-bestand."
 
 #. module: l10n_be
 #: field:partner.vat.intra,no_vat:0
@@ -391,23 +400,23 @@ msgstr "Relatie zonder btw"
 #: model:account.financial.report,name:l10n_be.account_financial_report_acomptesreussurcommandes6
 #: model:account.financial.report,name:l10n_be.account_financial_report_acomptesreussurcommandes8
 msgid "Acomptes reçus sur commandes"
-msgstr ""
+msgstr "Ontvangen vooruitbetalingen op bestellingen"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:123
 #, python-format
 msgid "No partner has a VAT number asociated with him."
-msgstr ""
+msgstr "Geen enkele relatie heeft een btw-nummer"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_provisionspourrisquesetcharges2
 msgid "Provisions pour risques et charges"
-msgstr ""
+msgstr "Voorzieningen voor risico's en kosten"
 
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_account_report_be_bs
 msgid "Bilan"
-msgstr ""
+msgstr "Balans"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,file_save:0
@@ -419,12 +428,12 @@ msgstr "Bestand opslaan"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservesimmunises3_A
 msgid "Pour actions propres"
-msgstr ""
+msgstr "Voor eigen aandelen"
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_restitution:0
 msgid "It indicates whether a restitution is to make or not?"
-msgstr ""
+msgstr "Duidt aan of er een terugbetaling moet gebeuren"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:119
@@ -446,12 +455,12 @@ msgstr "Maakt een testbestand in xml"
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Intracom VAT Declaration"
-msgstr ""
+msgstr "Intracommunautaire aangifte"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficeperteencours0
 msgid "Bénéfice (Perte) en cours, non affecté(e)"
-msgstr ""
+msgstr "Te bestemmen winst (verlies) van het boekjaar"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -462,22 +471,22 @@ msgstr "_Voorbeeld"
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesfinancires5
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesfinancires7
 msgid "Dettes financières"
-msgstr ""
+msgstr "Financiële schulden"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficereporte0
 msgid "Bénéfice reporté"
-msgstr ""
+msgstr "Overgedragen winst"
 
 #. module: l10n_be
 #: help:partner.vat.intra,tax_code_id:0
 msgid "Keep empty to use the user's company"
-msgstr ""
+msgstr "Leeg laten voor het bedrijf van de gebruiker"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_actif
 msgid "ACTIF"
-msgstr ""
+msgstr "ACTIVA"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
@@ -487,7 +496,7 @@ msgstr "Test XML-bestand"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettes1
 msgid "DETTES"
-msgstr ""
+msgstr "SCHULDEN"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -500,34 +509,34 @@ msgstr "Xml opslaan"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:149
 #, python-format
 msgid "No phone associated with the company."
-msgstr ""
+msgstr "Voor uw bedrijf is geen telefoonnummer ingesteld"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesplusdunan2
 msgid "Dettes à plus d'un an"
-msgstr ""
+msgstr "Schulden op meer dan één jaar"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:87
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:111
 #, python-format
 msgid "No VAT number associated with your company."
-msgstr ""
+msgstr "Uw bedrijf heeft geen btw-nummer"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservesimmunises3_B
 msgid "Autres"
-msgstr ""
+msgstr "Overige"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_crancesplusdunan1
 msgid "Créances à plus d'un an"
-msgstr ""
+msgstr "Vorderingen op meer dan één jaar"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficepertedelexcerciceavantimpts1
 msgid "Bénéfice (Perte) de l'excercice avant impôts"
-msgstr ""
+msgstr "Winst (Verlies) van het boekjaar vóór belasting"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -541,7 +550,7 @@ msgstr "Europese landen"
 #: view:partner.vat.intra:0
 #: view:partner.vat.list:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -552,54 +561,55 @@ msgstr "Intracommunautaire opgave"
 #: model:account.financial.report,name:l10n_be.account_financial_report_comptesdergularisation1
 #: model:account.financial.report,name:l10n_be.account_financial_report_comptesdergularisation2
 msgid "Comptes de régularisation"
-msgstr ""
+msgstr "Overlopende rekeningen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_immobilisationscorporelles1
 msgid "Immobilisations corporelles"
-msgstr ""
+msgstr "Materiële vaste activa"
 
 #. module: l10n_be
 #: field:vat.listing.clients,vat_amount:0
 msgid "VAT Amount"
-msgstr ""
+msgstr "Btw-bedrag"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:246
 #, python-format
 msgid "No vat number defined for %s."
-msgstr ""
+msgstr "Geen btw-nummer ingesteld voor %s."
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficepertereporte2
 msgid "Bénéfice (Perte) reporté(e)"
-msgstr ""
+msgstr "Overgedragen winst (verlies)"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_plusvaluesdervaluation2
 msgid "Plus-values de réévaluation"
-msgstr ""
+msgstr "Herwaarderingsmeerwaarden"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_list
 msgid "partner.vat.list"
-msgstr ""
+msgstr "Jaarlijkse klantenlisting"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservelgale3
 msgid "Réserve légale"
-msgstr ""
+msgstr "Wettelijke reserve"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_capitauxpropres1
 msgid "CAPITAUX PROPRES"
-msgstr ""
+msgstr "EIGEN VERMOGEN"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:69
 #, python-format
 msgid "No belgian contact with a VAT number in your database."
 msgstr ""
+"Er is geen Belgische contactpersoon met een btw-nummer in uw database."
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
@@ -615,28 +625,28 @@ msgstr "Klanten"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_chargesexceptionnelles1
 msgid "Charges exceptionnelles"
-msgstr ""
+msgstr "Uitzonderlijke kosten"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_chiffredaffaires3
 msgid "Chiffre d'affaires"
-msgstr ""
+msgstr "Omzet"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_autreschargesdexploitation2
 msgid "Autres charges d'exploitation"
-msgstr ""
+msgstr "Andere bedrijfskosten"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:296
 #, python-format
 msgid "XML File has been Created"
-msgstr ""
+msgstr "XML-bestand is aangemaakt."
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_belgium_bs
 msgid "Belgium Balance Sheet"
-msgstr ""
+msgstr "BALANS NA WINSTVERDELING"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_restitution:0
@@ -647,59 +657,59 @@ msgstr "Teruggave"
 #: model:account.financial.report,name:l10n_be.account_financial_report_prov_pr_chargesetdotations2
 msgid ""
 "Provisions pour riques et charges: dotations (utilisations et reprises)"
-msgstr ""
+msgstr "Voorzieningen voor risico's en kosten: toevoegingen (terugnemingen)"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Geavanceerde opties"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_produitsexceptionnels1
 msgid "Produits exceptionnels"
-msgstr ""
+msgstr "Uitzonderlijke opbrengsten"
 
 #. module: l10n_be
 #: view:vat.listing.clients:0
 msgid "VAT listing"
-msgstr ""
+msgstr "Jaarlijkse klantenlisting"
 
 #. module: l10n_be
 #: field:partner.vat.list,partner_ids:0
 msgid "Clients"
-msgstr ""
+msgstr "Klanten"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_margebrutedexploitation2
 msgid "Marge brute d'exploitation"
-msgstr ""
+msgstr "Brutomarge"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:265
 #, python-format
 msgid "No data available for the client."
-msgstr ""
+msgstr "Geen gegevens beschikbaar voor de klant"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_etablissementsdecrdit4
 msgid "Etablissements de crédit"
-msgstr ""
+msgstr "Kredietinstellingen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_terrainsetconstructions2
 msgid "Terrains et constructions"
-msgstr ""
+msgstr "Terreinen en gebouwen"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:69
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_capitalsouscrit3
 msgid "Capital souscrit"
-msgstr ""
+msgstr "Geplaatst kapitaal"
 
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
@@ -709,12 +719,12 @@ msgstr "Intracommunautaire opgave"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_stocks2
 msgid "Stocks"
-msgstr ""
+msgstr "Voorraden"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_valeursdisponibles1
 msgid "Valeurs disponibles"
-msgstr ""
+msgstr "Liquide middelen"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,period_id:0
@@ -731,7 +741,7 @@ msgstr "Btw-aangifte"
 #: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing
 #: view:partner.vat:0
 msgid "Partner VAT Listing"
-msgstr "Intracommunautaire opgave"
+msgstr "Jaarlijkse klantenlisting"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -741,7 +751,7 @@ msgstr "Algemene informatie"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_immobilisationsfinancires1
 msgid "Immobilisations financières"
-msgstr ""
+msgstr "Financiële vaste activa"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -771,7 +781,7 @@ msgstr "Annuleren"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:147
 #, python-format
 msgid "No email address associated with the company."
-msgstr ""
+msgstr "Er is geen e-mailadres ingesteld voor uw bedrijf."
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -782,12 +792,12 @@ msgstr "XML maken"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_pertereporte0
 msgid "Perte reportée"
-msgstr ""
+msgstr "Overgedragen verlies"
 
 #. module: l10n_be
 #: field:vat.listing.clients,name:0
 msgid "Client Name"
-msgstr ""
+msgstr "Klantennaam"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
@@ -803,17 +813,17 @@ msgstr "Klanten bekijken"
 #: model:account.financial.report,name:l10n_be.account_financial_report_autresemprunts6
 #: model:account.financial.report,name:l10n_be.account_financial_report_autresemprunts9
 msgid "Autres emprunts"
-msgstr ""
+msgstr "Overige leningen"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_account_report_be_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Winst en verlies"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_passif0
 msgid "PASSIF"
-msgstr ""
+msgstr "PASSIVA"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
@@ -823,17 +833,17 @@ msgstr "Afdrukken"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_fournisseurs4
 msgid "Fournisseurs"
-msgstr ""
+msgstr "Leveranciers"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_commandesencoursdexcution2
 msgid "Commandes en cours d'exécution"
-msgstr ""
+msgstr "Bestellingen in uitvoering"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_actifscirculants0
 msgid "ACTIFS CIRCULANTS"
-msgstr ""
+msgstr "VLOTTENDE ACTIVA"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_capital2
@@ -851,32 +861,33 @@ msgstr "Bestand opslaan met '.xml'-extensie"
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesfiscalessalarialesetsociales3
 msgid "Dettes fiscales, salariales et sociales"
 msgstr ""
+"Schulden met betrekking tot belastingen, bezoldigingen en sociale lasten"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_autresimmobilisationscorporelles2
 msgid "Autres immobilisations corporelles"
-msgstr ""
+msgstr "Overige materiële vaste activa"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_crancesunanauplus1
 msgid "Créances à un an au plus"
-msgstr ""
+msgstr "Vorderingen op ten hoogste één jaar"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_impts4
 msgid "Impôts"
-msgstr ""
+msgstr "Belastingen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_charges_expl_pr_restruct2
 msgid ""
 "Charges d'exploitation portées à l'actif au titre de frais de restructuration"
-msgstr ""
+msgstr "Als herstructureringskosten geactiveerde bedrijfskosten"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rmunrationsetchargessociales4
 msgid "Rémunérations et charges sociales"
-msgstr ""
+msgstr "Bezoldigingen en sociale lasten"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.partner_vat_listing
@@ -886,7 +897,7 @@ msgstr "Jaarlijke klantenlisting"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficepertecouranteavantimpts1
 msgid "Bénéfice (Perte) courant(e) avant impôts"
-msgstr ""
+msgstr "Winst (Verlies) uit de gewone bedrijfsuitoefening vóór belasting"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -897,7 +908,7 @@ msgstr "Opmerking: "
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:99
 #, python-format
 msgid "Vat Listing"
-msgstr ""
+msgstr "Jaarlijkse klantenlisting"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
@@ -909,7 +920,7 @@ msgstr "Periodieke btw-aangifte"
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:64
 #, python-format
 msgid "No data for the selected year."
-msgstr ""
+msgstr "Geen gegevens voor het gekozen jaar."
 
 #. module: l10n_be
 #: field:partner.vat,limit_amount:0
@@ -919,32 +930,32 @@ msgstr "Bestedingslimiet"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_provisionsetimpotsdifferes1
 msgid "PROVISIONS ET IMPOTS DIFFERES"
-msgstr ""
+msgstr "VOORZIENINGEN EN UITGESTELDE BELASTINGEN"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_subsidesencapital2
 msgid "Subsides en capital"
-msgstr ""
+msgstr "Kapitaalsubsidies"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
 msgid "Customer List"
-msgstr ""
+msgstr "Klantenlijst"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
 msgid "Annual Listing of VAT-Subjected Customers"
-msgstr ""
+msgstr "Jaarlijkse listing van btw-plichtige klanten"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_mobilieretmatrielroulant2
 msgid "Mobilier et matériel roulant"
-msgstr ""
+msgstr "Meubilair en rollend materieel"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_capitalnonappel3
 msgid "Capital non appelé"
-msgstr ""
+msgstr "Niet-opgevraagd kapitaal"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
@@ -954,18 +965,18 @@ msgstr "Belgische aangiften"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_belgiumpl0
 msgid "Belgium P&L"
-msgstr ""
+msgstr "RESULTATENREKENING"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_crancescommerciales3
 #: model:account.financial.report,name:l10n_be.account_financial_report_crancescommerciales5
 msgid "Créances commerciales"
-msgstr ""
+msgstr "Handelsvorderingen"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_bnficepertedexploitation1
 msgid "Bénéfice (Perte) d'exploitation"
-msgstr ""
+msgstr "Bedrijfswinst (Bedrijfsverlies)"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
@@ -975,18 +986,18 @@ msgstr "Periodieke btw-aangifte"
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat
 msgid "partner.vat"
-msgstr ""
+msgstr "Klantenlisting"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_dettesplusdunanchantdanslanne3
 msgid "Dettes à plus d'un an échéant dans l'année"
-msgstr ""
+msgstr "Schulden op meer dan één jaar die binnen het jaar vervallen"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:184
 #, python-format
 msgid "No VAT number associated with the company."
-msgstr ""
+msgstr "Het bedrijf heeft geen btw-nummer"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,name:0
@@ -998,7 +1009,7 @@ msgstr "Bestandsnaam"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_etablissementcredits4
 msgid "Etablissements de crédit, dettes de location-financement et assimilés"
-msgstr ""
+msgstr "Kredietinstellingen, leasingschulden en soortgelijke schulden"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_payment:0
@@ -1013,14 +1024,14 @@ msgstr "Jaar"
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservesindisponibles3
 msgid "Réserves indisponibles"
-msgstr ""
+msgstr "Onbeschikbare reserves"
 
 #. module: l10n_be
 #: view:partner.vat.list:0
 msgid "Free Comments to be Added to the Declaration"
-msgstr ""
+msgstr "Vrije opmerkingen m.b.t. de aangifte"
 
 #. module: l10n_be
 #: model:account.financial.report,name:l10n_be.account_financial_report_rservesdisponibles3
 msgid "Réserves disponibles"
-msgstr ""
+msgstr "Beschikbare reserves"
diff --git a/addons/l10n_be_invoice_bba/i18n/zh_CN.po b/addons/l10n_be_invoice_bba/i18n/zh_CN.po
new file mode 100644
index 00000000000..6fd75287904
--- /dev/null
+++ b/addons/l10n_be_invoice_bba/i18n/zh_CN.po
@@ -0,0 +1,146 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2014-03-13 03:38+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Chinese (Simplified) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-03-14 06:58+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: l10n_be_invoice_bba
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "发票号必须在公司范围内唯一"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_account_invoice
+msgid "Invoice"
+msgstr "发票"
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "错误，您不能创建循环引用的会员用户"
+
+#. module: l10n_be_invoice_bba
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "BBA结构化传输有误！"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Random"
+msgstr "随机"
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_type:0
+msgid "Select Default Communication Type for Outgoing Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_algorithm:0
+msgid ""
+"Select Algorithm to generate the Structured Communication on Outgoing "
+"Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:109
+#: code:addons/l10n_be_invoice_bba/invoice.py:135
+#, python-format
+msgid ""
+"The daily maximum of outgoing invoices with an automatically generated BBA "
+"Structured Communications has been exceeded!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr "自动生成结构化BBA传输已超出每日销售发票的最大值,请手动建立BBA结构化传输"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:150
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:121
+#, python-format
+msgid ""
+"The Partner should have a 3-7 digit Reference Number for the generation of "
+"BBA Structured Communications!\n"
+"Please correct the Partner record."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的EAN编码"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:108
+#: code:addons/l10n_be_invoice_bba/invoice.py:120
+#: code:addons/l10n_be_invoice_bba/invoice.py:134
+#: code:addons/l10n_be_invoice_bba/invoice.py:162
+#: code:addons/l10n_be_invoice_bba/invoice.py:172
+#: code:addons/l10n_be_invoice_bba/invoice.py:197
+#, python-format
+msgid "Warning!"
+msgstr "警告！"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Customer Reference"
+msgstr "客户参考号"
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_type:0
+msgid "Communication Type"
+msgstr "讯息类型"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:173
+#: code:addons/l10n_be_invoice_bba/invoice.py:198
+#, python-format
+msgid ""
+"The BBA Structured Communication has already been used!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Date"
+msgstr "事务处理日期"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_res_partner
+msgid "Partner"
+msgstr "合作伙伴"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:151
+#, python-format
+msgid ""
+"Unsupported Structured Communication Type Algorithm '%s' !\n"
+"Please contact your OpenERP support channel."
+msgstr "不支持的结构化传输算法类型\"%s\"!请联系你的OpenERP 维护人员"
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_algorithm:0
+msgid "Communication Algorithm"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:163
+#, python-format
+msgid ""
+"Empty BBA Structured Communication!\n"
+"Please fill in a unique BBA Structured Communication."
+msgstr ""
diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/fr_fiscal_templates.xml
index bf49d15e08c..cca96422c22 100644
--- a/addons/l10n_fr/fr_fiscal_templates.xml
+++ b/addons/l10n_fr/fr_fiscal_templates.xml
@@ -40,11 +40,6 @@
             
             
         
-        
-            
-            
-            
-                
 
         
             
@@ -57,22 +52,12 @@
             
             
         
-        
-            
-            
-            
-                
 
         
             
             
             
         
-        
-            
-            
-            
-                
 
         
             
@@ -91,17 +76,6 @@
             
             
         
-        
-            
-            
-            
-        
-        
-            
-            
-            
-                
-        
 
         
             
@@ -124,17 +98,6 @@
             
             
         
-        
-            
-            
-            
-        
-        
-            
-            
-            
-                
-        
 
         
             
@@ -146,17 +109,6 @@
             
             
         
-        
-            
-            
-            
-        
-        
-            
-            
-            
-                
-        
 
         
             
@@ -177,11 +129,6 @@
             
             
         
-        
-            
-            
-            
-                
 
         
             
@@ -194,22 +141,12 @@
             
             
         
-        
-            
-            
-            
-                
 
         
             
             
             
         
-        
-            
-            
-            
-                
 
         
             
@@ -224,11 +161,6 @@
             
             
         
-        
-            
-            
-            
-                
 
         
             
@@ -241,23 +173,12 @@
             
             
         
-        
-            
-            
-            
-                
 
         
             
             
             
         
-        
-            
-            
-            
-                
-        
 
         
             
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index 8633cca7141..22e1e12f03c 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -29,28 +29,6 @@
       
       sale
     
-    
-    
-      
-      TVA collectée (vente) 19,6%
-      19.6
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      sale
-    
 
     
       
@@ -96,51 +74,7 @@
       sale
     
 
-    
-      
-      TVA collectée (vente) 7,0%
-      7.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      sale
-    
-
     
-      
-      TVA collectée (vente) 5,0%
-      5.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      sale
-    
-
-    
       
       TVA collectée (vente) 5,5%
       5.5
@@ -208,28 +142,6 @@
       purchase
     
 
-    
-      
-      TVA déductible (achat) 19,6%
-      ACH-19.6
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
       
       TVA déductible (achat) 8,5%
@@ -274,51 +186,7 @@
       purchase
     
 
-    
-      
-      TVA déductible (achat) 7,0%
-      ACH-7.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
-      
-      TVA déductible (achat) 5,0%
-      ACH-5.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
-    
       
       TVA déductible (achat) 5,5%
       ACH-5.5
@@ -387,29 +255,6 @@
       purchase
     
 
-    
-      
-      TVA déductible (achat) 19,6% TTC
-      ACH-19.6-TTC
-      
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
       
       TVA déductible (achat) 8,5% TTC
@@ -456,53 +301,7 @@
       purchase
     
 
-    
-      
-      TVA déductible (achat) 7,0% TTC
-      ACH-7.0-TTC
-      
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
-      
-      TVA déductible (achat) 5,0% TTC
-      ACH-5.0-TTC
-      
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
-    
       
       TVA déductible (achat) 5,5% TTC
       ACH-5.5-TTC
@@ -573,28 +372,6 @@
       purchase
     
 
-    
-      
-      TVA déd./immobilisation (achat) 19,6%
-      IMMO-19.6
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
       
       TVA déd./immobilisation (achat) 8,5%
@@ -639,51 +416,7 @@
       purchase
     
 
-    
-      
-      TVA déd./immobilisation (achat) 7,0%
-      IMMO-7.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
-      
-      TVA déd./immobilisation (achat) 5,0%
-      IMMO-5.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
-    
       
       TVA déd./immobilisation (achat) 5,5%
       IMMO-5.5
@@ -751,28 +484,6 @@
       purchase
     
 
-    
-      
-      TVA due s/ acq. intracommunautaire (achat) 19,6%   
-      ACH_UE_due-19.6
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
       
       TVA due s/ acq. intracommunautaire (achat) 8,5%
@@ -817,51 +528,7 @@
       purchase
     
 
-    
-      
-      TVA due s/ acq. intracommunautaire (achat) 7,0%
-      ACH_UE_due-7.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
     
-      
-      TVA due s/ acq. intracommunautaire (achat) 5,0%
-      ACH_UE_due-5.0
-      
-      percent
-      
-      
-      
-      
-
-      
-      
-
-      
-      
-      
-      
-      
-      purchase
-    
-
-    
       
       TVA due s/ acq. intracommunautaire (achat) 5,5%
       ACH_UE_due-5.5
@@ -925,24 +592,6 @@
       purchase
     
 
-    
-      
-      TVA déd. s/ acq. intracommunautaire (achat) 19,6%
-      ACH_UE_ded.-19.6
-      
-      percent
-      
-      
-
-      
-      
-
-      
-      
-      
-      purchase
-    
-
     
       
       TVA déd. s/ acq. intracommunautaire (achat) 8,5%
@@ -979,43 +628,7 @@
       purchase
     
 
-    
-      
-      TVA déd. s/ acq. intracommunautaire (achat) 7,0%
-      ACH_UE_ded.-7.0
-      
-      percent
-      
-      
-
-      
-      
-
-      
-      
-      
-      purchase
-    
-
     
-      
-      TVA déd. s/ acq. intracommunautaire (achat) 5,0%
-      ACH_UE_ded.-5.0
-      
-      percent
-      
-      
-
-      
-      
-
-      
-      
-      
-      purchase
-    
-
-    
       
       TVA déd. s/ acq. intracommunautaire (achat) 5,5%
       ACH_UE_ded.-5.5
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 3fa4690df92..40f00edd7db 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-02 09:19+0000\n"
-"Last-Translator: Davin Baragiotta \n"
+"PO-Revision-Date: 2014-04-14 23:15+0000\n"
+"Last-Translator: Sandy Carter (http://www.savoirfairelinux.com) "
+"\n"
 "Language-Team: French \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-03 06:24+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-04-15 07:51+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -60,7 +61,7 @@ msgstr "Commentaires"
 #: code:addons/mail/static/src/xml/mail.xml:313
 #, python-format
 msgid "more messages"
-msgstr "plus de messages"
+msgstr "messages supplémentaires"
 
 #. module: mail
 #: view:mail.alias:0
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 362f48772e4..bf48cf3d199 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-22 18:50+0000\n"
-"Last-Translator: Dariusz Żbikowski \n"
+"PO-Revision-Date: 2014-04-18 12:38+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-23 07:45+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -1510,7 +1510,7 @@ msgstr "Wiadomość Rich-text/HTML"
 #. module: mail
 #: view:mail.mail:0
 msgid "Creation Month"
-msgstr "Miesiąc tworzenia"
+msgstr "Miesiąc utworzenia"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -1661,7 +1661,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:213
 #, python-format
 msgid "Please, wait while the file is uploading."
-msgstr ""
+msgstr "Poczekaj, aż plik zostanie załadowany."
 
 #. module: mail
 #: view:mail.group:0
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index ae6a0cb7831..71301cbf59f 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-21 01:48+0000\n"
+"PO-Revision-Date: 2014-04-03 10:13+0000\n"
 "Last-Translator: Anders Wallenquist \n"
 "Language-Team: Svenska \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-22 06:02+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-04 07:07+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -133,6 +133,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"E-postadress till avsändaren. Det här fältet är satt när inget matchande "
+"företag hittas för inkommande e-post."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -168,6 +170,13 @@ msgid ""
 "discussions\n"
 "- All Messages: for every notification you receive in your Inbox"
 msgstr ""
+"Policy för mottagen e-post för nya meddelanden som skickas till sin "
+"personliga inkorg:\n"
+"- Aldrig: ingen e-post är skickad\n"
+"- Endast inkommande meddelanden: för meddelanden som inkommit per e-post\n"
+"- Inkommande e-post och diskussioner: för inkommande e-post tillsammans med "
+"meddelanden från interna diskussioner \n"
+"- Alla meddelanden: för samtliga notifikationer som du tar emot i din inkorg"
 
 #. module: mail
 #: field:mail.group,message_unread:0
@@ -189,6 +198,9 @@ msgid ""
 "Members of those groups will automatically added as followers. Note that "
 "they will be able to manage their subscription manually if necessary."
 msgstr ""
+"Medlemmarna i dessa grupper kommer automatiskt att läggas till som följare. "
+"Observera att de kommer att kunna hantera sin prenumeration för hand om det "
+"behövs."
 
 #. module: mail
 #. openerp-web
@@ -217,6 +229,9 @@ msgid ""
 " %s won't be notified of any email or discussion on this document. Do you "
 "really want to remove him from the followers ?"
 msgstr ""
+"Varning!\n"
+"  %s inte kommer att meddelas om någon e-post eller diskussion om detta "
+"dokument. Vill du verkligen ta bort honom från följare?"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0
@@ -239,6 +254,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field in form views or some "
 "kanban views."
 msgstr ""
+"Medelstora foto av gruppen. Det är automatiskt storleksändras som en "
+"128x128px bild, med bildförhållande bevaras. Använd det här fältet i "
+"formulär vyer eller några Kanbanvyer."
 
 #. module: mail
 #. openerp-web
@@ -261,6 +279,10 @@ msgid ""
 "\n"
 "(Document type: %s, Operation: %s)"
 msgstr ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
 
 #. module: mail
 #: view:mail.mail:0
@@ -285,14 +307,14 @@ msgstr "Tråd"
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "Open the full mail composer"
-msgstr ""
+msgstr "Öppna den avancerade e-posteditorn"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:29
 #, python-format
 msgid "ò"
-msgstr ""
+msgstr "ò"
 
 #. module: mail
 #: field:base.config.settings,alias_domain:0
@@ -321,6 +343,8 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
 
 #. module: mail
 #. openerp-web
@@ -344,6 +368,8 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Meddelandetyp: e-post för e-postmeddelande, avisering för systemmeddelande, "
+"kommentar är andra meddelanden som till exempel användarsvar"
 
 #. module: mail
 #: help:mail.message.subtype,relation_field:0
@@ -367,7 +393,7 @@ msgstr "Svar till"
 #: code:addons/mail/wizard/invite.py:37
 #, python-format
 msgid "
    You have been invited to follow %s.
    "
-msgstr ""
+msgstr "
    Du har blivit inbjuden att följa %s. 
    "
 
 #. module: mail
 #. openerp-web
@@ -386,7 +412,7 @@ msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 #. module: mail
 #: field:mail.group,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Medelstort foto"
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_to_me_feeds
@@ -438,7 +464,7 @@ msgstr "visa ytterligare meddelande"
 #: code:addons/mail/res_users.py:69
 #, python-format
 msgid "Invalid Action!"
-msgstr "Ogiltig åtgärd"
+msgstr "Ogiltig åtgärd!"
 
 #. module: mail
 #. openerp-web
@@ -468,6 +494,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: mail
 #: help:mail.alias,alias_model_id:0
@@ -537,7 +565,7 @@ msgstr "Från"
 #: field:mail.message,subtype_id:0
 #: view:mail.message.subtype:0
 msgid "Subtype"
-msgstr ""
+msgstr "Undertyp"
 
 #. module: mail
 #: view:mail.mail:0
@@ -548,7 +576,7 @@ msgstr "E-postmeddelande"
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: mail
 #. openerp-web
@@ -604,7 +632,7 @@ msgstr "Följare"
 #: model:ir.actions.client,name:mail.action_mail_archives_feeds
 #: model:ir.ui.menu,name:mail.mail_archivesfeeds
 msgid "Archives"
-msgstr "Arkiv"
+msgstr "Archives"
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -630,7 +658,7 @@ msgstr "Ny"
 #: code:addons/mail/static/src/js/mail_followers.js:155
 #, python-format
 msgid "One follower"
-msgstr "En följate"
+msgstr "En följare"
 
 #. module: mail
 #: field:mail.compose.message,model:0
@@ -681,6 +709,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Liten bild som representerar gruppen. Det är storleksändras automatiskt till "
+"64x64px, men med bevarat bildförhållande. Använd det här fältet när helst en "
+"liten bild krävs."
 
 #. module: mail
 #: view:mail.compose.message:0
@@ -721,7 +752,7 @@ msgstr "läs mer"
 #: code:addons/mail/wizard/invite.py:40
 #, python-format
 msgid "
    You have been invited to follow a new document.
    "
-msgstr ""
+msgstr "
    Du har blivit inbjuden att följa ett nytt dokument. 
    "
 
 #. module: mail
 #: field:mail.compose.message,parent_id:0
@@ -733,6 +764,7 @@ msgstr "Överliggande meddelande"
 #: selection:res.partner,notification_email_send:0
 msgid "All Messages (discussions, emails, followed system notifications)"
 msgstr ""
+"Alla meddelanden (diskussioner, e-post, prenumeration på systemaviseringar)"
 
 #. module: mail
 #. openerp-web
@@ -754,6 +786,12 @@ msgid ""
 "                
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                    Inga privata meddelanden.\n"
+"                
    \n"
+"                    Denna lista innehåller meddelanden skickade till dig.\n"
+"                
    \n"
+"            "
 
 #. module: mail
 #: model:mail.group,name:mail.group_rd
@@ -775,7 +813,7 @@ msgstr "Avancerat"
 #: code:addons/mail/static/src/xml/mail.xml:244
 #, python-format
 msgid "Move to Inbox"
-msgstr "Flytta till inboxen"
+msgstr "Flytta till inkorgen"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:193
@@ -796,12 +834,14 @@ msgid ""
 "You may not create a user. To create new users, you should use the "
 "\"Settings > Users\" menu."
 msgstr ""
+"Du kan inte skapa en användare. För att skapa nya användare används "
+"\"Inställningar > Användare\"-menyn"
 
 #. module: mail
 #: help:mail.followers,res_model:0
 #: help:mail.wizard.invite,res_model:0
 msgid "Model of the followed resource"
-msgstr ""
+msgstr "Modell för den prenumererade resursen"
 
 #. module: mail
 #. openerp-web
@@ -840,17 +880,17 @@ msgstr "Kontakt"
 msgid ""
 "Only the invited followers can read the\n"
 "                                    discussions on this group."
-msgstr ""
+msgstr "Endast inbjudna följare kan läsa denna grupps diskussioner"
 
 #. module: mail
 #: model:ir.model,name:mail.model_ir_ui_menu
 msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Has attachments"
-msgstr ""
+msgstr "Har bilagor"
 
 #. module: mail
 #: view:mail.mail:0
@@ -864,6 +904,7 @@ msgid ""
 "The following partners chosen as recipients for the email have no email "
 "address linked :"
 msgstr ""
+"Följande företag är valda mottagare för e-post som saknar länkad adress:"
 
 #. module: mail
 #: help:mail.alias,alias_defaults:0
@@ -871,11 +912,13 @@ msgid ""
 "A Python dictionary that will be evaluated to provide default values when "
 "creating new records for this alias."
 msgstr ""
+"Ett Python-dictionary som används för standardvärden när nya poster skapas "
+"för detta alias."
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_subtype
 msgid "Message subtypes"
-msgstr ""
+msgstr "Undertyper till meddelande"
 
 #. module: mail
 #. openerp-web
@@ -906,11 +949,21 @@ msgid ""
 "                
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                    Snyggt jobbat! Din inkorg är tom.\n"
+"                
    \n"
+"                    Din inkorg innehåller privata meddelanden eller e-post "
+"som skickats till dig\n"
+"                    tillsammans med information knuten till dokument eller "
+"personer du\n"
+"                    följer.\n"
+"                
    \n"
+"            "
 
 #. module: mail
 #: field:mail.mail,notification:0
 msgid "Is Notification"
-msgstr ""
+msgstr "Är en avisering"
 
 #. module: mail
 #. openerp-web
@@ -930,6 +983,8 @@ msgstr "Skicka nu"
 msgid ""
 "Unable to send email, please configure the sender's email address or alias."
 msgstr ""
+"Kunde inte skicka e-post, vänligen konfigurera avsändarens e-postadress "
+"eller alias."
 
 #. module: mail
 #: help:res.users,alias_id:0
@@ -947,7 +1002,7 @@ msgstr "Foto"
 #: help:mail.compose.message,vote_user_ids:0
 #: help:mail.message,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "Användare som röstat på detta meddelande"
 
 #. module: mail
 #: help:mail.group,alias_id:0
@@ -955,6 +1010,8 @@ msgid ""
 "The email address associated with this group. New emails received will "
 "automatically create new topics."
 msgstr ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
 
 #. module: mail
 #: view:mail.mail:0
@@ -981,7 +1038,7 @@ msgstr "Ägare"
 #: code:addons/mail/res_partner.py:52
 #, python-format
 msgid "Partner Profile"
-msgstr ""
+msgstr "Partner Profile"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
@@ -996,7 +1053,7 @@ msgstr "Meddelanden"
 #: help:mail.followers,res_id:0
 #: help:mail.wizard.invite,res_id:0
 msgid "Id of the followed resource"
-msgstr ""
+msgstr "Id of the followed resource"
 
 #. module: mail
 #: field:mail.compose.message,body:0
@@ -1016,6 +1073,8 @@ msgid ""
 "Description that will be added in the message posted for this subtype. If "
 "void, the name will be added instead."
 msgstr ""
+"Description that will be added in the message posted for this subtype. If "
+"void, the name will be added instead."
 
 #. module: mail
 #: field:mail.compose.message,vote_user_ids:0
@@ -1033,49 +1092,50 @@ msgstr "Gruppera"
 #: help:mail.message,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
+"Aktuell användare har en blockerad avisering länkad till detta meddelande"
 
 #. module: mail
 #: field:mail.group,public:0
 msgid "Privacy"
-msgstr ""
+msgstr "Integritet"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Notification"
-msgstr ""
+msgstr "Avisering"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail.js:654
 #, python-format
 msgid "Please complete partner's informations"
-msgstr ""
+msgstr "Please complete partner's informations"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:190
 #, python-format
 msgid "
    Access this document directly in OpenERP
    "
-msgstr ""
+msgstr "
    Access this document directly in OpenERP
    "
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Followers of selected items and"
-msgstr ""
+msgstr "Followers of selected items and"
 
 #. module: mail
 #: field:mail.alias,alias_force_thread_id:0
 msgid "Record Thread ID"
-msgstr ""
+msgstr "Record Thread ID"
 
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_group_root
 msgid "My Groups"
-msgstr ""
+msgstr "Mina grupper"
 
 #. module: mail
 #: model:ir.actions.client,help:mail.action_mail_archives_feeds
@@ -1131,7 +1191,7 @@ msgstr "Du har ett oläst meddelande"
 #: help:mail.compose.message,record_name:0
 #: help:mail.message,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Name get of the related document."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -1142,7 +1202,7 @@ msgstr ""
 #: field:mail.message,notification_ids:0
 #: view:mail.notification:0
 msgid "Notifications"
-msgstr "Notifikationer"
+msgstr "Aviseringar"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1156,13 +1216,16 @@ msgid ""
 "attached, even if they did not reply to it. If set, this will disable the "
 "creation of new records completely."
 msgstr ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:311
 #, python-format
 msgid "show more message"
-msgstr ""
+msgstr "visa fler meddelanden"
 
 #. module: mail
 #: help:mail.message.subtype,name:0
@@ -1177,17 +1240,17 @@ msgstr ""
 #. module: mail
 #: field:res.partner,notification_email_send:0
 msgid "Receive Messages by Email"
-msgstr ""
+msgstr "Ta emot meddelanden per e-post"
 
 #. module: mail
 #: model:mail.group,name:mail.group_best_sales_practices
 msgid "Best Sales Practices"
-msgstr ""
+msgstr "Marknadsföringspraxis"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Selected Group Only"
-msgstr ""
+msgstr "Endast valda grupper"
 
 #. module: mail
 #: field:mail.group,message_is_follower:0
@@ -1233,7 +1296,7 @@ msgstr "Endast inkommane post"
 #: code:addons/mail/static/src/xml/mail.xml:292
 #, python-format
 msgid "more"
-msgstr ""
+msgstr "more"
 
 #. module: mail
 #. openerp-web
@@ -1252,49 +1315,49 @@ msgstr "Skriv till mina följare"
 #. module: mail
 #: model:ir.model,name:mail.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Access Groups"
 
 #. module: mail
 #: field:mail.message.subtype,default:0
 msgid "Default"
-msgstr ""
+msgstr "Default"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Användare"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:246
 #, python-format
 msgid "Mark as Todo"
-msgstr ""
+msgstr "Mark as Todo"
 
 #. module: mail
 #: help:mail.message.subtype,parent_id:0
 msgid "Parent subtype, used for automatic subscription."
-msgstr ""
+msgstr "Parent subtype, used for automatic subscription."
 
 #. module: mail
 #: field:mail.group,message_summary:0
 #: field:mail.thread,message_summary:0
 #: field:res.partner,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Summering"
 
 #. module: mail
 #: code:addons/mail/mail_mail.py:222
 #: code:addons/mail/mail_mail.py:244
 #, python-format
 msgid "\"Followers of %s\" <%s>"
-msgstr ""
+msgstr "\"Followers of %s\" <%s>"
 
 #. module: mail
 #: view:mail.compose.message:0
 #: view:mail.wizard.invite:0
 msgid "Add contacts to notify..."
-msgstr ""
+msgstr "Add contacts to notify..."
 
 #. module: mail
 #: view:mail.group:0
@@ -1311,7 +1374,7 @@ msgstr "Blockerad"
 #. module: mail
 #: field:mail.group,menu_id:0
 msgid "Related Menu"
-msgstr ""
+msgstr "Relaterad meny"
 
 #. module: mail
 #: code:addons/mail/update.py:93
@@ -1331,6 +1394,7 @@ msgstr "Följer"
 msgid ""
 "Unfortunately this email alias is already used, please choose a unique one"
 msgstr ""
+"Unfortunately this email alias is already used, please choose a unique one"
 
 #. module: mail
 #: help:mail.alias,alias_user_id:0
@@ -1340,19 +1404,23 @@ msgid ""
 "the sender (From) address, or will use the Administrator account if no "
 "system user is found for that address."
 msgstr ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:52
 #, python-format
 msgid "And"
-msgstr ""
+msgstr "And"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:111
 #, python-format
 msgid "You have %d unread messages"
-msgstr ""
+msgstr "You have %d unread messages"
 
 #. module: mail
 #: field:mail.compose.message,message_id:0
@@ -1366,6 +1434,8 @@ msgid ""
 "This field holds the image used as photo for the group, limited to "
 "1024x1024px."
 msgstr ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
 
 #. module: mail
 #: field:mail.compose.message,attachment_ids:0
@@ -1378,7 +1448,7 @@ msgstr "Bilagor"
 #: field:mail.compose.message,record_name:0
 #: field:mail.message,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Message Record Name"
 
 #. module: mail
 #: field:mail.mail,email_cc:0
@@ -1388,12 +1458,12 @@ msgstr "Kopia"
 #. module: mail
 #: help:mail.notification,starred:0
 msgid "Starred message that goes into the todo mailbox"
-msgstr ""
+msgstr "Blockerade meddelanden som sorteras in i att-göra-boxen"
 
 #. module: mail
 #: view:mail.group:0
 msgid "Topics discussed in this group..."
-msgstr ""
+msgstr "Ämnen under diskussion i denna grupp..."
 
 #. module: mail
 #. openerp-web
@@ -1401,7 +1471,7 @@ msgstr ""
 #: view:mail.compose.message:0
 #, python-format
 msgid "Followers of"
-msgstr ""
+msgstr "Followers of"
 
 #. module: mail
 #: help:mail.mail,auto_delete:0
@@ -1412,14 +1482,14 @@ msgstr ""
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_group_feeds
 msgid "Discussion Group"
-msgstr ""
+msgstr "Discussion Group"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:242
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Done"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_comment
@@ -1445,17 +1515,17 @@ msgstr "Hela företaget"
 #: view:mail.compose.message:0
 #, python-format
 msgid "and"
-msgstr ""
+msgstr "and"
 
 #. module: mail
 #: help:mail.mail,body_html:0
 msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Rich-text/HTML message"
 
 #. module: mail
 #: view:mail.mail:0
 msgid "Creation Month"
-msgstr "Månad skapad"
+msgstr "Registreringsmånad"
 
 #. module: mail
 #: help:mail.compose.message,notified_partner_ids:0
@@ -1463,16 +1533,17 @@ msgstr "Månad skapad"
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
 msgstr ""
+"Företag som har en aviseringsknuff av detta meddelande till sina e-postlådor"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Show already read messages"
-msgstr ""
+msgstr "Visa lästa meddelanden"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Content"
-msgstr ""
+msgstr "Innehåll"
 
 #. module: mail
 #: field:mail.mail,email_to:0
@@ -1491,7 +1562,7 @@ msgstr "Besvara"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr "Meddelade företag"
+msgstr "Aviserade företag"
 
 #. module: mail
 #. openerp-web
@@ -1506,6 +1577,8 @@ msgid ""
 "This group is visible by non members.             Invisible groups can add "
 "members through the invite button."
 msgstr ""
+"Denna grupp är synlig för icke medlemmar. Osynliga grupper kan lägga till "
+"medlemmar via den \"osynliga\" knappen."
 
 #. module: mail
 #: model:mail.group,name:mail.group_board
@@ -1515,7 +1588,7 @@ msgstr "Styrelsemöten"
 #. module: mail
 #: field:mail.alias,alias_model_id:0
 msgid "Aliased Model"
-msgstr ""
+msgstr "Aliasobjekt"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0
@@ -1527,19 +1600,19 @@ msgstr "Meddelandets unika identifierare"
 #: field:mail.group,description:0
 #: field:mail.message.subtype,description:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_followers
 msgid "Document Followers"
-msgstr ""
+msgstr "Dokumentföljare"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail_followers.xml:35
 #, python-format
 msgid "Remove this follower"
-msgstr ""
+msgstr "Ta bort denna följare"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
@@ -1549,13 +1622,13 @@ msgstr "Aldrig"
 #. module: mail
 #: field:mail.mail,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr "Utgående mailserver"
+msgstr "Utgående e-postserver"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:930
 #, python-format
 msgid "Partners email addresses not found"
-msgstr ""
+msgstr "Företagets e-postadress saknas"
 
 #. module: mail
 #: view:mail.mail:0
@@ -1566,7 +1639,7 @@ msgstr "Skickat"
 #. module: mail
 #: field:mail.mail,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Utsmyckat innehåll"
 
 #. module: mail
 #: help:mail.compose.message,to_read:0
@@ -1593,13 +1666,17 @@ msgid ""
 "                
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                    Meddelanden saknas i gruppen.\n"
+"                
    \n"
+"            "
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:213
 #, python-format
 msgid "Please, wait while the file is uploading."
-msgstr ""
+msgstr "Vänligen vänta tills filen är uppladdad."
 
 #. module: mail
 #: view:mail.group:0
@@ -1609,42 +1686,45 @@ msgid ""
 "installed\n"
 "                                    the portal module."
 msgstr ""
+"Denna grupp är synlig för alla,\n"
+"                                     även dina kunder i de fall du "
+"installerat portalmodulen."
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:243
 #, python-format
 msgid "Set back to Todo"
-msgstr ""
+msgstr "Backa till Att göra"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:154
 #, python-format
 msgid "Attach a note that will not be sent to the followers"
-msgstr ""
+msgstr "Bilägg en notering som inte kommer skickas till prenumeranterna"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:279
 #, python-format
 msgid "nobody"
-msgstr ""
+msgstr "ingen"
 
 #. module: mail
 #: selection:res.partner,notification_email_send:0
 msgid "Incoming Emails and Discussions"
-msgstr ""
+msgstr "Inkommande post och diskussioner"
 
 #. module: mail
 #: field:mail.group,name:0
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "You cannot create recursive Partner hierarchies."
-msgstr ""
+msgstr "Du kan inte skapa rekursiv företagsstrukturer."
 
 #. module: mail
 #: help:base.config.settings,alias_domain:0
@@ -1652,6 +1732,8 @@ msgid ""
 "If you have setup a catch-all email domain redirected to the OpenERP server, "
 "enter the domain name here."
 msgstr ""
+"Om du har en 'fånga alla e-postmeddelanden'-domän vidarebefordra den till "
+"OpenERP-servern och ange domännamnet här."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -1668,7 +1750,7 @@ msgstr "Meddelanden"
 #: code:addons/mail/static/src/xml/mail.xml:139
 #, python-format
 msgid "others..."
-msgstr ""
+msgstr "övrigt..."
 
 #. module: mail
 #: model:ir.actions.client,name:mail.action_mail_star_feeds
@@ -1682,12 +1764,12 @@ msgstr "Att göra"
 #: field:mail.group,alias_id:0
 #: field:res.users,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Utgående e-post"
 
 #. module: mail
 #: help:mail.compose.message,notification_ids:0
@@ -1702,13 +1784,13 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:149
 #, python-format
 msgid "(no email address)"
-msgstr ""
+msgstr "(e-postadress saknas)"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr "Meddelanden"
+msgstr "Meddelandehantering"
 
 #. module: mail
 #: view:mail.alias:0
@@ -1735,7 +1817,7 @@ msgstr ""
 #: help:mail.thread,message_ids:0
 #: help:res.partner,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande och kommunikationshistorik"
 
 #. module: mail
 #: help:mail.mail,references:0
@@ -1745,7 +1827,7 @@ msgstr "Meddelandereferens, som identifierar tidigare meddelanden"
 #. module: mail
 #: field:mail.compose.message,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Författarmod"
 
 #. module: mail
 #: help:mail.message.subtype,res_model:0
@@ -1763,7 +1845,7 @@ msgstr "avgilla"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_group
 msgid "Discussion group"
-msgstr ""
+msgstr "Diskussionsgrupp"
 
 #. module: mail
 #: help:mail.mail,email_cc:0
@@ -1773,13 +1855,13 @@ msgstr "Blindkopiemottagare"
 #. module: mail
 #: field:mail.alias,alias_domain:0
 msgid "Alias domain"
-msgstr ""
+msgstr "Alias domän"
 
 #. module: mail
 #: code:addons/mail/update.py:93
 #, python-format
 msgid "Error during communication with the publisher warranty server."
-msgstr ""
+msgstr "Fel vid kommunikation med servern för 'utgivarens underhållsavtal'."
 
 #. module: mail
 #: selection:mail.group,public:0
@@ -1799,6 +1881,15 @@ msgid ""
 "                
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                    Inget 'att göra'.\n"
+"                
    \n"
+"                    När du arbetar med dina meddelanden i inkorgen, kan du "
+"märka vissa\n"
+"                    med att göra. Från denna meny, kommer du åt din "
+"att göra-lista.\n"
+"                
    \n"
+"            "
 
 #. module: mail
 #: selection:mail.mail,state:0
@@ -1808,7 +1899,7 @@ msgstr "Leverans misslyckades"
 #. module: mail
 #: field:mail.compose.message,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Ytterligare kontakter"
 
 #. module: mail
 #: help:mail.compose.message,parent_id:0
@@ -1819,7 +1910,7 @@ msgstr "Inledande meddelande i tråd."
 #. module: mail
 #: model:mail.group,name:mail.group_hr_policies
 msgid "HR Policies"
-msgstr ""
+msgstr "Personalpolicies"
 
 #. module: mail
 #. openerp-web
@@ -1844,7 +1935,7 @@ msgstr "Filter"
 #: code:addons/mail/static/src/js/many2many_tags_email.js:63
 #, python-format
 msgid "Please complete partner's informations and Email"
-msgstr ""
+msgstr "Vänligen komplettera företagets information och e-postadresser"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_message_subtype
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
index e0d1f3e96b2..361959a9927 100644
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@@ -86,7 +86,7 @@
             mail.mail
             
                 
-                    
+                    
                     
                     
                     
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 40a4fefa8a8..83f3693e3be 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -26,6 +26,7 @@ import email
 import logging
 import pytz
 import re
+import socket
 import time
 import xmlrpclib
 from email.message import Message
@@ -111,6 +112,7 @@ class mail_thread(osv.AbstractModel):
             if res[id]['message_unread_count']:
                 title = res[id]['message_unread_count'] > 1 and _("You have %d unread messages") % res[id]['message_unread_count'] or _("You have one unread message")
                 res[id]['message_summary'] = "9 %d %s" % (title, res[id].pop('message_unread_count'), _("New"))
+            res[id].pop('message_unread_count', None)
         return res
 
     def _get_subscription_data(self, cr, uid, ids, name, args, context=None):
@@ -536,14 +538,19 @@ class mail_thread(osv.AbstractModel):
         thread_references = references or in_reply_to
         ref_match = thread_references and tools.reference_re.search(thread_references)
         if ref_match:
-            thread_id = int(ref_match.group(1))
-            model = ref_match.group(2) or model
-            model_pool = self.pool.get(model)
-            if thread_id and model and model_pool and model_pool.exists(cr, uid, thread_id) \
-                and hasattr(model_pool, 'message_update'):
-                _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
-                                email_from, email_to, message_id, model, thread_id, custom_values, uid)
-                return [(model, thread_id, custom_values, uid)]
+            reply_thread_id = int(ref_match.group(1))
+            reply_model = ref_match.group(2) or model
+            reply_hostname = ref_match.group(3)
+            local_hostname = socket.gethostname()
+            # do not match forwarded emails from another OpenERP system (thread_id collision!)
+            if local_hostname == reply_hostname:
+                thread_id, model = reply_thread_id, reply_model
+                model_pool = self.pool.get(model)
+                if thread_id and model and model_pool and model_pool.exists(cr, uid, thread_id) \
+                    and hasattr(model_pool, 'message_update'):
+                    _logger.info('Routing mail from %s to %s with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
+                                    email_from, email_to, message_id, model, thread_id, custom_values, uid)
+                    return [(model, thread_id, custom_values, uid)]
 
         # Verify whether this is a reply to a private message
         if in_reply_to:
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py
index e7a22065ea1..bc2f207464c 100644
--- a/addons/mail/tests/test_mail_gateway.py
+++ b/addons/mail/tests/test_mail_gateway.py
@@ -318,11 +318,11 @@ class TestMailgateway(TestMailBase):
         # Test2: discussion update
         # --------------------------------------------------
 
-        # Do: even with a wrong destination, a reply should end up in the correct thread
+        # Do: even with a wrong destination, a reply should end up in the correct thread 
         frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other@gmail.com',
                                             msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
                                             to='erroneous@example.com>', subject='Re: news',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                                            extra='In-Reply-To: <1198923581.41972151344608186760.JavaMail@agrolait.com>\n')
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
                             'message_process: reply on Frogs should not have created a new group with new subject')
@@ -339,8 +339,8 @@ class TestMailgateway(TestMailBase):
 
         # Do: due to some issue, same email goes back into the mailgateway
         frog_groups = format_and_process(MAIL_TEMPLATE, email_from='other@gmail.com',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.diff1@agrolait.com>',
-                                            subject='Re: news', extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                                            to='erroneous@example.com>', subject='Re: news',
+                                            extra='In-Reply-To: <1198923581.41972151344608186760.JavaMail@agrolait.com>\n')
         # Test: no group 'Re: news' created, still only 1 Frogs group
         self.assertEqual(len(frog_groups), 0,
                             'message_process: reply on Frogs should not have created a new group with new subject')
@@ -366,28 +366,28 @@ class TestMailgateway(TestMailBase):
 
         # Do: post a new message, with a known partner -> duplicate emails -> partner
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik ',
-                                            to='erroneous@example.com>', subject='Re: news (2)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new1@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           subject='Re: news (2)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new1@agrolait.com>',
+                           extra='In-Reply-To: <1198923581.41972151344608186760.JavaMail@agrolait.com>\n')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is A-Raoul (only existing)
         self.assertEqual(frog_group.message_ids[0].author_id.id, extra_partner_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         # Do: post a new message, with a known partner -> duplicate emails -> user
         frog_group.message_unsubscribe([extra_partner_id])
         raoul_email = self.user_raoul.email
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': 'test_raoul@email.com'})
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik ',
-                                            to='erroneous@example.com>', subject='Re: news (3)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new2@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='groups@example.com', subject='Re: news (3)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new2@agrolait.com>',
+                           extra='In-Reply-To: <1198923581.41972151344608186760.JavaMail@agrolait.com>\n')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is Raoul (user), not A-Raoul
         self.assertEqual(frog_group.message_ids[0].author_id.id, self.partner_raoul_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         # Do: post a new message, with a known partner -> duplicate emails -> partner because is follower
         frog_group.message_unsubscribe([self.partner_raoul_id])
@@ -395,14 +395,14 @@ class TestMailgateway(TestMailBase):
         raoul_email = self.user_raoul.email
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': 'test_raoul@email.com'})
         format_and_process(MAIL_TEMPLATE, email_from='Lombrik Lubrik ',
-                                            to='erroneous@example.com>', subject='Re: news (3)',
-                                            msg_id='<1198923581.41972151344608186760.JavaMail.new3@agrolait.com>',
-                                            extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+                           to='groups@example.com', subject='Re: news (3)',
+                           msg_id='<1198923581.41972151344608186760.JavaMail.new3@agrolait.com>',
+                           extra='In-Reply-To: <1198923581.41972151344608186760.JavaMail@agrolait.com>\n')
         frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'Frogs')])
         frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         # Test: author is Raoul (user), not A-Raoul
         self.assertEqual(frog_group.message_ids[0].author_id.id, extra_partner_id,
-                            'message_process: email_from -> author_id wrong')
+                         'message_process: email_from -> author_id wrong')
 
         self.res_users.write(cr, uid, self.user_raoul_id, {'email': raoul_email})
 
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 301dff515b3..7e269ab7379 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import base64
 import re
 from openerp import tools
 from openerp import SUPERUSER_ID
@@ -237,12 +238,15 @@ class mail_compose_message(osv.TransientModel):
                     'parent_id': wizard.parent_id and wizard.parent_id.id,
                     'partner_ids': [partner.id for partner in wizard.partner_ids],
                     'attachment_ids': [attach.id for attach in wizard.attachment_ids],
+                    'attachments': [],
                 }
                 # mass mailing: render and override default values
                 if mass_mail_mode and wizard.model:
                     email_dict = self.render_message(cr, uid, wizard, res_id, context=context)
                     post_values['partner_ids'] += email_dict.pop('partner_ids', [])
-                    post_values['attachments'] = email_dict.pop('attachments', [])
+                    for filename, attachment_data in email_dict.pop('attachments', []):
+                        # decode as render message return in base64 while message_post expect binary
+                        post_values['attachments'].append((filename, base64.b64decode(attachment_data)))
                     attachment_ids = []
                     for attach_id in post_values.pop('attachment_ids'):
                         new_attach_id = ir_attachment_obj.copy(cr, uid, attach_id, {'res_model': self._name, 'res_id': wizard.id}, context=context)
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index 6f1fc51af7a..cebe952a9c4 100644
--- a/addons/marketing/i18n/sv.po
+++ b/addons/marketing/i18n/sv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 17:03+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:19+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
 msgid "marketing.config.settings"
-msgstr ""
+msgstr "marketing.config.settings"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
@@ -34,7 +34,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:marketing.action_marketing_configuration
 #: view:marketing.config.settings:0
 msgid "Configure Marketing"
-msgstr ""
+msgstr "Konfigurera marknadsföring"
 
 #. module: marketing
 #: view:crm.lead:0
@@ -45,17 +45,17 @@ msgstr "Marknadsföring"
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign:0
 msgid "Marketing campaigns"
-msgstr ""
+msgstr "Marknadsföringskampanj"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Kampanjer"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
@@ -70,7 +70,7 @@ msgstr "Användare"
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns Settings"
-msgstr ""
+msgstr "Kampanjinställningar"
 
 #. module: marketing
 #: field:marketing.config.settings,module_crm_profiling:0
@@ -80,12 +80,12 @@ msgstr ""
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Verkställ"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign:0
diff --git a/addons/marketing_campaign/i18n/sv.po b/addons/marketing_campaign/i18n/sv.po
index dc13c6627dc..2dfa0f693bc 100644
--- a/addons/marketing_campaign/i18n/sv.po
+++ b/addons/marketing_campaign/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 17:07+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:19+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -72,7 +72,7 @@ msgstr "Utlösare"
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "Uppföljning"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
diff --git a/addons/marketing_campaign_crm_demo/i18n/sl.po b/addons/marketing_campaign_crm_demo/i18n/sl.po
index e5ae1e81e5a..3b39a4af717 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-02-03 11:37+0000\n"
-"Last-Translator: Dušan Laznik (Mentis) \n"
+"PO-Revision-Date: 2014-03-14 12:53+0000\n"
+"Last-Translator: Darja Zorman \n"
 "Language-Team: Slovenian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:19+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_8
@@ -41,12 +41,12 @@ msgstr ""
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
 msgid "Marketing campaign demo report"
-msgstr "Marketing campaign demo report"
+msgstr "Demo poročilo o marketinški kampanji"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
 msgid "Thanks for subscribing to technical training"
-msgstr "Thanks for subscribing to technical training"
+msgstr "Hvala za prijavo na tehnično usposabljanje"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_3
@@ -68,12 +68,12 @@ msgstr ""
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
 msgid "Company :"
-msgstr "Company :"
+msgstr "Podjetje"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_4
 msgid "Thanks for buying the OpenERP book"
-msgstr "Thanks for buying the OpenERP book"
+msgstr "Hvala za nakup OpenERP knjige"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_6
@@ -86,23 +86,23 @@ msgid ""
 "reply to this message.
    \n"
 "            
    Regards,OpenERP Team,
    "
 msgstr ""
-"
    Hello,
    \n"
-"            
    We have very good offer that might suit you.\n"
-"            For our silver partners,We are  paid technical training on "
-"june,2010.
    \n"
-"            
    If any further information is required, do not hesitate to "
-"reply to this message.
    \n"
-"            
    Regards,OpenERP Team,
    "
+"
    Pozdravljeni,
    \n"
+"            
    Imamo zelo dobro ponudbo, ki bi vam lahko ustrezala.\n"
+"            Za naše Srebrne partnerje plačamo tehnično usposabljanje junija "
+"2010.
    \n"
+"            
    Če potrebujete dodatne informacije, prosimo, odgovorite na to "
+"sporočilo.
    \n"
+"            
    Pozdrav,OpenERP Team,
    "
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
 msgid "Thanks for showing interest in OpenERP"
-msgstr "Thanks for showing interest in OpenERP"
+msgstr "Hvala za izkazan interes za OpenERP"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
 msgid "Dummy Action"
-msgstr "Dummy Action"
+msgstr "Navidezna aktivnost"
 
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
@@ -150,12 +150,12 @@ msgstr ""
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Predlog za prijavo na OpenERP raziskovalni dan maja 2010"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
 msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Hvala za prijavo na OpenERP raziskovanli dan"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
@@ -165,7 +165,7 @@ msgstr "Propose gold partnership to silver partners"
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
 msgid "Propose paid training to Silver partners"
-msgstr "Propose paid training to Silver partners"
+msgstr "Predlagaj plačano usposabljanje Srebrnim partnerjem"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_4
@@ -175,10 +175,10 @@ msgid ""
 "            If any further information required kindly revert back.\n"
 "            
    Regards,OpenERP Team,
    "
 msgstr ""
-"
    Hello,
    \n"
-"            
    Thanks for showing interest and buying the OpenERP book.
    \n"
-"            If any further information required kindly revert back.\n"
-"            
    Regards,OpenERP Team,
    "
+"
    Pozdravljeni,
    \n"
+"            
    Hvala za izkazan interes in nakup knjige OpenERP.
    \n"
+"            Za dodatne informacije prosimo, da odgovorite.\n"
+"            
    Pozdrav, OpenERP Team,
    "
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_html:marketing_campaign_crm_demo.email_template_7
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index 536a8c38ec1..178420d3139 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-18 12:45+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:20+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -160,7 +160,7 @@ msgstr ""
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "Produkt członka"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
@@ -233,7 +233,7 @@ msgstr "Od"
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr ""
+msgstr "Błąd! Produkt tego członka jest przeterminowany"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index a3eefc673cc..6bdab6cc279 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 17:08+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:20+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -32,7 +32,7 @@ msgstr "Medlemskapsprocess"
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
-msgstr ""
+msgstr "Betalande medlem"
 
 #. module: membership
 #: view:report.membership:0
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 909f869e9ba..0d7a82585d4 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-20 04:52+0000\n"
+"Last-Translator: jack lee \n"
 "Language-Team: Chinese (Simplified) \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:20+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-21 06:51+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -233,7 +233,7 @@ msgstr "来自"
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr "错误，这个会员产品已过期"
+msgstr "错误，这个会员卡已过期"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -326,7 +326,7 @@ msgstr "会员资格到哪一天结束"
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr "会员产品"
+msgstr "会员卡"
 
 #. module: membership
 #: field:res.partner,membership_state:0
@@ -398,7 +398,7 @@ msgstr "业务伙伴为免费会员。"
 #. module: membership
 #: view:res.partner:0
 msgid "Buy Membership"
-msgstr "购买会员"
+msgstr "购买会员资格"
 
 #. module: membership
 #: field:report.membership,associate_member_id:0
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index d33fa4d2622..3157eee57bc 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -74,13 +74,12 @@ Dashboard / Reports for MRP will include:
         'res_config_view.xml',
     ],
     'demo': ['mrp_demo.xml'],
-    #TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company
-    # so the ymls are too complex to change at this stage
     'test': [
          'test/bom_with_service_type_product.yml',
-#         'test/order_demo.yml',
-#         'test/order_process.yml',
-#         'test/cancel_order.yml',
+         'test/mrp_users.yml',
+         'test/order_demo.yml',
+         'test/order_process.yml',
+         'test/cancel_order.yml',
     ],
     'installable': True,
     'application': True,
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index 0cd252364bf..e558d81e947 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-03-07 05:43+0000\n"
-"Last-Translator: Yoshi Tashiro \n"
+"PO-Revision-Date: 2014-03-31 07:55+0000\n"
+"Last-Translator: hiro TAKADA \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-08 06:54+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -29,6 +29,14 @@ msgid ""
 "                    * Notes for the technician and for the final customer.\n"
 "                This installs the module mrp_repair."
 msgstr ""
+"すべての製品の修理を管理できます。\n"
+"* 修復する製品の追加/削除\n"
+"* 在庫への影響\n"
+"* 請求(製品とサービス)\n"
+"* 保証コンセプト\n"
+"* 修理見積報告\n"
+"* 技術者および最終的な顧客のための注記\n"
+"mrp_repairモジュールがインスツールされます。"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -78,7 +86,7 @@ msgstr "スクラップ製品"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Mrp Workcenter"
-msgstr ""
+msgstr "MRPワークセンター"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -182,7 +190,7 @@ msgstr "製品数量"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "単位"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -197,7 +205,7 @@ msgstr "生産計画"
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
 msgid "Allow detailed planning of work order"
-msgstr ""
+msgstr "作業指示の詳細な計画を許可"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:633
@@ -282,7 +290,7 @@ msgstr "1製造オーダにて複数製品を生産（連産品/副産品）"
 msgid ""
 "The selection of the right Bill of Material to use will depend on the "
 "properties specified on the sales order and the Bill of Material."
-msgstr ""
+msgstr "適切な部品表の選択は受注や部品表で指定された属性に依存します。"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -290,7 +298,7 @@ msgid ""
 "When processing a sales order for this product, the delivery order\n"
 "                                will contain the raw materials, instead of "
 "the finished product."
-msgstr ""
+msgstr "この製品の受注を処理した場合、配送には完成品ではなく原材料が含まれます。"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -310,7 +318,7 @@ msgstr "予定済製品"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
-msgstr "設定 / 模型"
+msgstr "セット / 仮想部品"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -620,6 +628,10 @@ msgid ""
 "assembly operation.\n"
 "                This installs the module stock_no_autopicking."
 msgstr ""
+"このモジュールは製造オーダーに原材料を供給する中間のピッキングプロセスを可能にします。\n"
+"例えば、調達先(下請け)の生産を管理します。\n"
+"これを達成するため、「自動ピッキングなし」で委託した組立品の配置や組立作業の工程における調達先の場所を指定します。\n"
+"stock_no_autopickingモジュールがインストールされます。"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -745,6 +757,12 @@ msgid ""
 "                    * Product Attributes.\n"
 "                This installs the module product_manufacturer."
 msgstr ""
+"製品には以下の定義ができます。\n"
+"* メーカー\n"
+"* 製品名\n"
+"* 製品コード\n"
+"* 製品の属性\n"
+"product_manufacturerモジュールがインストールされます。"
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -1136,6 +1154,9 @@ msgid ""
 "                cases entail a small performance impact.\n"
 "                This installs the module mrp_jit."
 msgstr ""
+"調達オーダーでジャストインタイムの計算を可能にします。\n"
+"すべての調達はすぐに処理され、いくつかのケースでは生産力に小さな影響を及ぼすかもしれません。\n"
+"mrp_jitモジュールがインストールされます。"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -1334,7 +1355,7 @@ msgstr "集荷リスト"
 msgid ""
 "Bill of Materials allow you to define the list of required raw materials to "
 "make a finished product."
-msgstr ""
+msgstr "部品表には完成品の製造に必要な原材料のリストを定義することができます。"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:375
@@ -1461,6 +1482,8 @@ msgid ""
 "are attached to bills of materials\n"
 "                that will define the required raw materials."
 msgstr ""
+"ルーティングは製品のオーダーから生産においてワークセンター内で従うべき製造作業の作成と管理を可能にします。\n"
+"これらは必要な原材料を定義する部品表に添付されます。"
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -1532,7 +1555,7 @@ msgstr "完了"
 #. module: mrp
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+msgstr "この製品を販売する場合、OpenERPは製品に割り当てた部品表を使用して"
 
 #. module: mrp
 #: field:mrp.production,origin:0
@@ -1850,7 +1873,7 @@ msgstr "データ計算"
 #: code:addons/mrp/wizard/change_production_qty.py:88
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "エラー！"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1894,7 +1917,7 @@ msgstr "製造リードタイム"
 #: code:addons/mrp/mrp.py:285
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1904,7 +1927,7 @@ msgstr "製品販売単位数量"
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
 msgid "Product Move"
-msgstr ""
+msgstr "製品移動"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
@@ -2057,6 +2080,9 @@ msgid ""
 "                With this module: A + B + C -> D + E.\n"
 "                This installs the module mrp_byproduct."
 msgstr ""
+"部品表の中に副製品を構成できます。\n"
+"このモジュールを使用しない場合は A + B + C -> D ですが、使用する場合は A + B + C -> D + E にできます。\n"
+"mrp_byproductモジュールがインストールされます。"
 
 #. module: mrp
 #: field:procurement.order,bom_id:0
@@ -2182,7 +2208,7 @@ msgid ""
 "using the bill of materials assigned to this product.\n"
 "                        The delivery order will be ready once the production "
 "is done."
-msgstr ""
+msgstr "をトリガします。一旦生産されると、配送オーダーは準備完了となります。"
 
 #. module: mrp
 #: field:mrp.config.settings,module_stock_no_autopicking:0
@@ -2286,6 +2312,8 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"副製品がいくつかの製品で使用される場合、それ自身のBOMを作成するためにも有用です。この副製品の製造オーダーを望まない場合、BOMタイプとしてセット/仮想"
+"部品を選択します。仮想BOMがルート製品で使用される場合、生産の代わりに構成要素のセットとして販売と出荷を行います。"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_configuration
@@ -2303,7 +2331,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.config.settings,group_mrp_properties:0
 msgid "Allow several bill of materials per products using properties"
-msgstr ""
+msgstr "属性を使用して製品ごとにいくつかの部品表を許可"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 24fd98b1a4e..848ca794d3c 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-19 12:36+0000\n"
-"Last-Translator: Mirosław Bojanowicz \n"
+"PO-Revision-Date: 2014-04-12 14:54+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:20+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -2112,7 +2112,7 @@ msgstr "Normalne"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production started late"
-msgstr "Produkcja rozpoczęta z opuźnieniem"
+msgstr "Produkcja rozpoczęta z opóźnieniem"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
@@ -2411,8 +2411,7 @@ msgstr "Niebecności zasobu"
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr ""
-"Daje uporządkowana kolejność podczas wyświetlania listy rachunków materiałów."
+msgstr "Porządkuje kolejność wyświetlania zestawień materiałowych."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_config_settings
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index a06af50637a..64c5a4e745e 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-30 15:13+0000\n"
-"Last-Translator: Anders Eriksson, Mobila System \n"
+"PO-Revision-Date: 2014-03-31 17:06+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-31 05:26+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -101,7 +101,7 @@ msgstr ""
 #: help:mrp.production,message_unread:0
 #: help:mrp.production.workcenter.line,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -140,6 +140,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 7a94b1a660c..2d0a478c33d 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_analytic_line_user,account.analytic.line,account.model_account_analytic_line,group_mrp_user,1,1,1,0
 access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 35aae42b53d..9e5dc919720 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -4,6 +4,7 @@
 
     
         User
+        
         
     
     
diff --git a/addons/mrp/test/cancel_order.yml b/addons/mrp/test/cancel_order.yml
index 9e197156b15..2f721b6c653 100644
--- a/addons/mrp/test/cancel_order.yml
+++ b/addons/mrp/test/cancel_order.yml
@@ -1,3 +1,8 @@
+-
+  MRP user can cancelled Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   I first confirm order for PC Assemble SC349.
 -
diff --git a/addons/mrp/test/mrp_users.yml b/addons/mrp/test/mrp_users.yml
new file mode 100644
index 00000000000..05c4889cf28
--- /dev/null
+++ b/addons/mrp/test/mrp_users.yml
@@ -0,0 +1,31 @@
+-
+   Create a user as 'MRP Manager'
+-
+  !record {model: res.users, id: res_users_mrp_manager}:
+    company_id: base.main_company
+    name: MRP Manager
+    login: mam
+    password: mam
+    email: mrp_manager@yourcompany.com
+-
+  I added groups for MRP Manager.
+-
+  !record {model: res.users, id: res_users_mrp_manager}:
+    groups_id:
+      - mrp.group_mrp_manager
+      - account.group_account_user
+-
+   Create a user as 'MRP User'
+-
+  !record {model: res.users, id: res_users_mrp_user}:
+    company_id: base.main_company
+    name: MRP User
+    login: mau
+    password: mau
+    email: mrp_user@yourcompany.com
+-
+  I added groups for MRP User.
+-
+  !record {model: res.users, id: res_users_mrp_user}:
+    groups_id:
+      - mrp.group_mrp_user
\ No newline at end of file
diff --git a/addons/mrp/test/order_demo.yml b/addons/mrp/test/order_demo.yml
index ee21fee96df..0e4914390fb 100644
--- a/addons/mrp/test/order_demo.yml
+++ b/addons/mrp/test/order_demo.yml
@@ -1,3 +1,8 @@
+-
+  MRP user can create Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   I create Production Order of PC Assemble SC349 to produce 5.0 Unit.
 -
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index e672517c5a0..bbafe5b6b27 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -1,3 +1,8 @@
+-
+    MRP user can doing all process related to Production Order, so let's check data with giving the access rights of user.
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   I compute the production order.
 -
@@ -14,7 +19,7 @@
   Now I check workcenter lines.
 -
   !python {model: mrp.production}: |
-    from tools import float_compare
+    from openerp.tools import float_compare
     def assert_equals(value1, value2, msg, float_compare=float_compare):
         assert float_compare(value1, value2, precision_digits=2) == 0, msg
     order = self.browse(cr, uid, ref("mrp_production_test1"), context=context)
@@ -23,6 +28,7 @@
   I confirm the Production Order.
 -
   !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_test1}
+  
 -
   I check details of Produce Move of Production Order to trace Final Product.
 -
@@ -58,6 +64,16 @@
                     assert move_line.product_uos.id == order_line.product_uos.id, "UOS is not correspond in 'To consume line'."
                 assert move_line.location_id.id == routing_loc or order.location_src_id.id, "Source location is not correspond in 'To consume line'."
                 assert move_line.location_dest_id.id == source_location_id, "Destination Location is not correspond in 'To consume line'."
+-
+  I consume raw materials and put one material in scrap location due to waste it.
+-
+  !python {model: mrp.production}: |
+    scrap_location_ids = self.pool.get('stock.location').search(cr, uid, [('scrap_location','=',True)])
+    scrap_location_id = scrap_location_ids[0]
+    order = self.browse(cr, uid, ref("mrp_production_test1"))
+    for move in order.move_lines:
+        if move.product_id.id == ref("product.product_product_6"):
+            move.action_scrap(5.0, scrap_location_id)
 -
   I check details of an Internal Shipment after confirmed production order to bring components in Raw Materials Location.
 -
@@ -94,6 +110,11 @@
                 procurement_ids = procurement.search(cr, uid, [('move_id','=',move_line.id)])
                 assert procurement_ids, "Procurement should be created for shipment line of raw materials."
                 shipment_procurement = procurement.browse(cr, uid, procurement_ids[0], context=context)
+                # procurement state should be `confirmed` at this stage, except if mrp_jit is installed, in which
+                # case it could already be in `running` or `exception` state (not enough stock)
+                expected_states = ('confirmed', 'running', 'exception')
+                assert shipment_procurement.state in expected_states, 'Procurement state is `%s` for %s, expected one of %s' % \
+                    (shipment_procurement.state, shipment_procurement.product_id.name, expected_states)
                 assert shipment_procurement.date_planned == date_planned, "Planned date is not correspond in procurement."
                 assert shipment_procurement.product_id.id == order_line.product_id.id, "Product is not correspond in procurement."
                 assert shipment_procurement.product_qty == order_line.product_qty, "Qty is not correspond in procurement."
@@ -150,17 +171,7 @@
     order = self.browse(cr, uid, ref("mrp_production_test1"))
     assert order.state == 'in_production', 'Production order should be in production State.'
 -
-  I consume raw materials and put one material in scrap location due to waste it.
--
-  !python {model: mrp.production}: |
-    scrap_location_ids = self.pool.get('stock.location').search(cr, uid, [('scrap_location','=',True)])
-    scrap_location_id = scrap_location_ids[0]
-    order = self.browse(cr, uid, ref("mrp_production_test1"))
-    for move in order.move_lines:
         move.action_consume(move.product_qty)
-        if move.product_id.id == ref("product.product_product_6"):
-            move.action_scrap(5.0, scrap_location_id)
--
   I produce product.
 -
   !python {model: mrp.product.produce}: |
@@ -178,7 +189,10 @@
     order = self.browse(cr, uid, ref("mrp_production_test1"))
     assert order.state == 'done', "Production order should be closed."
 -
-  I check Total Costs at End of Production.
+  I check Total Costs at End of Production as a manager.
+-
+  !context
+    uid: 'res_users_mrp_manager'
 -
   !python {model: mrp.production}: |
     order = self.browse(cr, uid, ref("mrp_production_test1"))
@@ -212,6 +226,9 @@
                 assert line.product_uom_id.id == wc.product_id.uom_id.id, "UOM is not correspond."
 -
   I print a "BOM Structure".
+-
+  !context
+    uid: 'res_users_mrp_user'
 -
   !python {model: mrp.production}: |
     import netsvc, tools, os
diff --git a/addons/mrp_byproduct/i18n/sv.po b/addons/mrp_byproduct/i18n/sv.po
index 4ef8afe3027..5d8d26af0e8 100644
--- a/addons/mrp_byproduct/i18n/sv.po
+++ b/addons/mrp_byproduct/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 20:58+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:21+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -37,7 +37,7 @@ msgstr "Produkt"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Produktens måttenhet"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -47,7 +47,7 @@ msgstr "Produktionsorder"
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Ändra antal för produkter"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
@@ -74,7 +74,7 @@ msgstr "Produktkvantitet"
 #: code:addons/mrp_byproduct/mrp_byproduct.py:63
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Varning"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,bom_id:0
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 7fedb426edd..12d86e0b532 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -70,7 +70,7 @@ So, that we can compare the theoretic delay and real delay.
              'mrp_operations_demo.yml'
     ],
     'test': [ 
-#        'test/workcenter_operations.yml',
+        'test/workcenter_operations.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mrp_operations/test/workcenter_operations.yml b/addons/mrp_operations/test/workcenter_operations.yml
index c1449657967..f402e1cddd4 100644
--- a/addons/mrp_operations/test/workcenter_operations.yml
+++ b/addons/mrp_operations/test/workcenter_operations.yml
@@ -1,6 +1,24 @@
+-
+   Create a user as 'MRP User'
+-
+  !record {model: res.users, id: res_mrp_operation_user}:
+    company_id: base.main_company
+    name: MRP User
+    login: maou
+    password: maou
+    email: mrp_operation_user@yourcompany.com
+-
+  I added groups for MRP User.
+-
+  !record {model: res.users, id: res_mrp_operation_user}:
+    groups_id:
+      - mrp.group_mrp_user
 -
   In order to test mrp_operations with OpenERP, I refer created production order of PC Assemble SC349
-  with routing - Manual Component's Assembly to test complete production process with respect of workcenter.
+  with routing - Manual Component's Assembly to test complete production process with respect of workcenter with giving access rights of MRP User.
+-
+  !context
+    uid: 'res_mrp_operation_user'
 -
   I compute the production order.
 -
@@ -106,7 +124,7 @@
   I print a Barcode Report of Operation line.
 -
   !python {model: mrp_operations.operation.code}: |
-    import netsvc, tools, os
+    from openerp import netsvc, tools
     (data, format) = netsvc.LocalService('report.mrp.code.barcode').create(cr, uid, [ref('mrp_operations.mrp_op_1'),ref('mrp_operations.mrp_op_2'),ref('mrp_operations.mrp_op_3'),ref('mrp_operations.mrp_op_4'),ref('mrp_operations.mrp_op_5')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-barcode_report.'+format), 'wb+').write(data)
@@ -115,7 +133,7 @@
   I print Workcenter's Barcode Report.
 -
   !python {model: mrp.workcenter}: |
-    import netsvc, tools, os
+    from openerp import netsvc, tools
     (data, format) = netsvc.LocalService('report.mrp.wc.barcode').create(cr, uid, [ref('mrp.mrp_workcenter_0'),ref('mrp.mrp_workcenter_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'mrp_operations-workcenter_barcode_report.'+format), 'wb+').write(data)
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 4dbc6ac89de..9132094bf97 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -355,7 +355,8 @@ class mrp_repair(osv.osv):
         return self.write(cr,uid,ids,{'state':'cancel'})
 
     def wkf_invoice_create(self, cr, uid, ids, *args):
-        return self.action_invoice_create(cr, uid, ids)
+        self.action_invoice_create(cr, uid, ids)
+        return True
 
     def action_invoice_create(self, cr, uid, ids, group=False, context=None):
         """ Creates invoice(s) for repair order.
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 2653c558923..e94a5f60181 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -27,8 +27,8 @@
 This module allows users to create their own notes inside OpenERP
 =================================================================
 
-Use notes to write meeting minutes, organize ideas, organize personnal todo
-lists, etc. Each user manages his own personnal Notes. Notes are available to
+Use notes to write meeting minutes, organize ideas, organize personal todo
+lists, etc. Each user manages his own personal Notes. Notes are available to
 their authors only, but they can share notes to others users so that several
 people can work on the same note in real time. It's very efficient to share
 meeting minutes.
diff --git a/addons/note/i18n/de.po b/addons/note/i18n/de.po
index 845c6bf5f8f..e0a92742341 100644
--- a/addons/note/i18n/de.po
+++ b/addons/note/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-06 21:47+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
+"PO-Revision-Date: 2014-04-11 13:08+0000\n"
+"Last-Translator: Rudolf Schnapka \n"
 "Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-12 09:42+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -68,7 +67,7 @@ msgstr "Followers"
 #. module: note
 #: model:note.stage,name:note.note_stage_00
 msgid "New"
-msgstr ""
+msgstr "Neu"
 
 #. module: note
 #: model:ir.actions.act_window,help:note.action_note_note
diff --git a/addons/note/i18n/sv.po b/addons/note/i18n/sv.po
index 23b4172eeee..f4fddad811c 100644
--- a/addons/note/i18n/sv.po
+++ b/addons/note/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-01-20 18:02+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-31 20:10+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -67,7 +67,7 @@ msgstr "Följare"
 #. module: note
 #: model:note.stage,name:note.note_stage_00
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: note
 #: model:ir.actions.act_window,help:note.action_note_note
@@ -88,6 +88,24 @@ msgid ""
 "          
    \n"
 "        "
 msgstr ""
+"
    \n"
+"             Klicka för att lägga till en personlig anteckning.\n"
+"           
    \n"
+"             Använd anteckningar för att organisera personliga uppgifter "
+"eller anteckningar. Alla\n"
+"             anteckningar är privata, ingen annan kommer att kunna se dem. "
+"emellertid\n"
+"             du kan dela några anteckningar med andra personer genom att "
+"bjuda in följare\n"
+"             på anteckningen. (Användbart för mötesanteckningar, särskilt "
+"om\n"
+"             du aktiverar pad-funktionen för samarbetsredigering).\n"
+"           
    \n"
+"             Du kan anpassa hur du behandlar dina anteckningar / uppgifter "
+"genom att lägga till,\n"
+"             tar bort eller modifierar kolumner.\n"
+"           \n"
+"        "
 
 #. module: note
 #: model:note.stage,name:note.demo_note_stage_01
@@ -123,7 +141,7 @@ msgstr ""
 #. module: note
 #: help:note.note,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: note
 #: field:note.stage,name:0
@@ -190,60 +208,60 @@ msgstr "Senare"
 #. module: note
 #: model:ir.model,name:note.model_note_stage
 msgid "Note Stage"
-msgstr ""
+msgstr "Anteckningsetapp"
 
 #. module: note
 #: field:note.note,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
-msgstr ""
+msgstr "Användares etapper"
 
 #. module: note
 #: field:note.note,name:0
 msgid "Note Summary"
-msgstr ""
+msgstr "Anteckningssammandrag"
 
 #. module: note
 #: model:ir.actions.act_window,name:note.action_note_stage
 #: view:note.note:0
 msgid "Stages"
-msgstr ""
+msgstr "Etapper"
 
 #. module: note
 #: help:note.note,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: note
 #: view:note.note:0
 msgid "Delete"
-msgstr ""
+msgstr "Ta bort"
 
 #. module: note
 #: field:note.note,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Färgindex"
 
 #. module: note
 #: field:note.note,sequence:0
 #: field:note.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Nummerserie"
 
 #. module: note
 #: view:note.note:0
 #: field:note.note,tag_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etiketter"
 
 #. module: note
 #: view:note.note:0
 msgid "Archive"
-msgstr ""
+msgstr "Arkiv"
 
 #. module: note
 #: field:base.config.settings,module_note_pad:0
@@ -256,6 +274,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: note
 #: field:base.config.settings,group_note_fancy:0
@@ -266,7 +286,7 @@ msgstr ""
 #: field:note.note,current_partner_id:0
 #: field:note.stage,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Ägare"
 
 #. module: note
 #: help:note.stage,sequence:0
@@ -276,9 +296,9 @@ msgstr ""
 #. module: note
 #: field:note.note,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Klardatum"
 
 #. module: note
 #: field:note.stage,fold:0
 msgid "Folded by Default"
-msgstr ""
+msgstr "Nedvikt som standard"
diff --git a/addons/note/note.py b/addons/note/note.py
index 00c67c37191..3e419888c28 100644
--- a/addons/note/note.py
+++ b/addons/note/note.py
@@ -128,16 +128,15 @@ class note_note(osv.osv):
             current_stage_ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)], context=context)
 
             if current_stage_ids: #if the user have some stages
-
-                #dict of stages: map les ids sur les noms
-                stage_name = dict(self.pool.get('note.stage').name_get(cr, uid, current_stage_ids, context=context))
+                stages = self.pool['note.stage'].browse(cr, uid, current_stage_ids, context=context)
 
                 result = [{ #notes by stage for stages user
                         '__context': {'group_by': groupby[1:]},
-                        '__domain': domain + [('stage_ids.id', '=', current_stage_id)],
-                        'stage_id': (current_stage_id, stage_name[current_stage_id]),
-                        'stage_id_count': self.search(cr,uid, domain+[('stage_ids', '=', current_stage_id)], context=context, count=True)
-                    } for current_stage_id in current_stage_ids]
+                        '__domain': domain + [('stage_ids.id', '=', stage.id)],
+                        'stage_id': (stage.id, stage.name),
+                        'stage_id_count': self.search(cr,uid, domain+[('stage_ids', '=', stage.id)], context=context, count=True),
+                        '__fold': stage.fold,
+                    } for stage in stages]
 
                 #note without user's stage
                 nb_notes_ws = self.search(cr,uid, domain+[('stage_ids', 'not in', current_stage_ids)], context=context, count=True)
@@ -153,8 +152,9 @@ class note_note(osv.osv):
                         result = [{
                             '__context': {'group_by': groupby[1:]},
                             '__domain': domain + [dom_not_in],
-                            'stage_id': (current_stage_ids[0], stage_name[current_stage_ids[0]]),
-                            'stage_id_count':nb_notes_ws
+                            'stage_id': (stages[0].id, stages[0].name),
+                            'stage_id_count':nb_notes_ws,
+                            '__fold': stages[0].name,
                         }] + result
 
             else: # if stage_ids is empty
diff --git a/addons/note_pad/i18n/sv.po b/addons/note_pad/i18n/sv.po
index 3a5f0e091d1..dfe381e0b89 100644
--- a/addons/note_pad/i18n/sv.po
+++ b/addons/note_pad/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-26 14:14+0000\n"
-"Last-Translator: Mikael Dúi Bolinder \n"
+"PO-Revision-Date: 2014-03-31 20:02+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: note_pad
 #: model:ir.model,name:note_pad.model_note_note
@@ -25,4 +25,4 @@ msgstr "Anteckning"
 #. module: note_pad
 #: field:note.note,note_pad_url:0
 msgid "Pad Url"
-msgstr ""
+msgstr "Pad Url"
diff --git a/addons/pad/i18n/sv.po b/addons/pad/i18n/sv.po
index c0b9127d569..e19fa6a20ae 100644
--- a/addons/pad/i18n/sv.po
+++ b/addons/pad/i18n/sv.po
@@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 20:45+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: pad
 #. openerp-web
 #: code:addons/pad/static/src/xml/pad.xml:18
 #, python-format
 msgid "Ñ"
-msgstr ""
+msgstr "˜"
 
 #. module: pad
 #. openerp-web
@@ -32,16 +32,18 @@ msgid ""
 "You must configure the etherpad through the menu Settings > Companies > "
 "Companies, in the configuration tab of your company."
 msgstr ""
+"Du måste konfigurera etherpad via menyn Inställningar> Företag> Företag, på "
+"fliken konfigurationen av ditt företag."
 
 #. module: pad
 #: help:res.company,pad_key:0
 msgid "Etherpad lite api key."
-msgstr ""
+msgstr "Etherpad-lite api-nyckel."
 
 #. module: pad
 #: view:res.company:0
 msgid "e.g. beta.primarypad.com"
-msgstr ""
+msgstr "e.g. beta.primarypad.com"
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -51,24 +53,24 @@ msgstr "Bolag"
 #. module: pad
 #: model:ir.model,name:pad.model_pad_common
 msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
 
 #. module: pad
 #: view:res.company:0
 msgid "Pads"
-msgstr ""
+msgstr "Paddar"
 
 #. module: pad
 #: field:res.company,pad_server:0
 msgid "Pad Server"
-msgstr ""
+msgstr "Pad-server"
 
 #. module: pad
 #: field:res.company,pad_key:0
 msgid "Pad Api Key"
-msgstr ""
+msgstr "Pad Api-nyckel"
 
 #. module: pad
 #: help:res.company,pad_server:0
 msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Etherpad lite server. Example: beta.primarypad.com"
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 22e8931d12a..0a72e2abde3 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -14,6 +14,10 @@ _logger = logging.getLogger(__name__)
 class pad_common(osv.osv_memory):
     _name = 'pad.common'
 
+    def pad_is_configured(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return bool(user.company_id.pad_server)
+
     def pad_generate_url(self, cr, uid, context=None):
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id;
 
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index facf15b28de..d2d8b748ab5 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -71,6 +71,7 @@
 .oe_pad_loading{
     text-align: center;
     opacity: 0.75;
+    font-style: italic;
 }
 
 .etherpad_readonly ul, .etherpad_readonly ol {
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 97f87196cb9..cac1de89ea1 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,65 +1,82 @@
 openerp.pad = function(instance) {
+    var _t = instance.web._t;
     
     instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeWidgetMixin, {
         template: 'FieldPad',
         content: "",
         init: function() {
+            var self = this;
             this._super.apply(this, arguments);
-            this.set("configured", true);
-            this.on("change:configured", this, this.switch_configured);
+            this._configured_deferred = this.view.dataset.call('pad_is_configured').done(function(data) {
+                self.set("configured", !!data);
+            }).fail(function(data, event) {
+                event.preventDefault();
+                self.set("configured", true);
+            });
+            this.pad_loading_request = null;
         },
         initialize_content: function() {
             var self = this;
-            this.switch_configured();
             this.$('.oe_pad_switch').click(function() {
                 self.$el.toggleClass('oe_pad_fullscreen');
                 self.view.$el.find('.oe_chatter').toggle();
             });
+            this._configured_deferred.always(function() {
+                var configured = self.get('configured');
+                self.$(".oe_unconfigured").toggle(!configured);
+                self.$(".oe_configured").toggle(configured);
+            });
             this.render_value();
         },
-        switch_configured: function() {
-            this.$(".oe_unconfigured").toggle(! this.get("configured"));
-            this.$(".oe_configured").toggle(this.get("configured"));
-        },
         render_value: function() {
-            var self  = this;
-            if (this.get("configured") && ! this.get("value")) {
-                self.view.dataset.call('pad_generate_url', {
-                    context: {
-                        model: self.view.model,
-                        field_name: self.name,
-                        object_id: self.view.datarecord.id
-                    },
-                }).done(function(data) {
-                    if (! data.url) {
-                        self.set("configured", false);
+            var self = this;
+            $.when(this._configured_deferred, this.pad_loading_request).always(function() {
+                if (! self.get('configured')) {
+                    return;
+                };
+                var value = self.get('value');
+                if (self.get('effective_readonly')) {
+                    if (_.str.startsWith(value, 'http')) {
+                        self.pad_loading_request = self.view.dataset.call('pad_get_content', {url: value}).done(function(data) {
+                            self.$('.oe_pad_content').removeClass('oe_pad_loading').html('
    ');
+                            self.$('.oe_pad_readonly').html(data);
+                        }).fail(function() {
+                            self.$('.oe_pad_content').text(_t('Unable to load pad'));
+                        });
                     } else {
-                        self.set("value", data.url);
+                        self.$('.oe_pad_content').addClass('oe_pad_loading').show().text(_t("This pad will be initialized on first edit"));
                     }
-                });
-            }
-            this.$('.oe_pad_content').html("");
-            var value = this.get('value');
-            if (this.pad_loading_request) {
-                this.pad_loading_request.abort();
-            }
-            if (_.str.startsWith(value, 'http')) {
-                if (! this.get('effective_readonly')) {
-                    var content = '';
-                    this.$('.oe_pad_content').html(content);
-                    this._dirty_flag = true;
-                } else {
-                    this.content = '
    ... Loading pad ...
    ';
-                    this.pad_loading_request = $.get(value + '/export/html').done(function(data) {
-                        groups = /\<\s*body\s*\>(.*?)\<\s*\/body\s*\>/.exec(data);
-                        data = (groups || []).length >= 2 ? groups[1] : '';
-                        self.$('.oe_pad_content').html('
    ');
-                        self.$('.oe_pad_readonly').html(data);
-                    }).fail(function() {
-                        self.$('.oe_pad_content').text('Unable to load pad');
+                }
+                else {
+                    var def = $.when();
+                    if (! value || !_.str.startsWith(value, 'http')) {
+                        def = self.view.dataset.call('pad_generate_url', {
+                            context: {
+                                model: self.view.model,
+                                field_name: self.name,
+                                object_id: self.view.datarecord.id
+                            },
+                        }).done(function(data) {
+                            if (! data.url) {
+                                self.set("configured", false);
+                            } else {
+                                self.set("value", data.url);
+                            }
+                        });
+                    }
+                    def.then(function() {
+                        value = self.get('value');
+                        if (_.str.startsWith(value, 'http')) {
+                            var content = '';
+                            self.$('.oe_pad_content').html(content);
+                            self._dirty_flag = true;
+                        }
+                        else {
+                            self.$('.oe_pad_content').text(value);
+                        }
                     });
                 }
-            }
+            });
         },
     });
 
diff --git a/addons/pad_project/i18n/sv.po b/addons/pad_project/i18n/sv.po
index eb00d7904af..7d86b50b4fd 100644
--- a/addons/pad_project/i18n/sv.po
+++ b/addons/pad_project/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 20:42+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
@@ -25,7 +25,7 @@ msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
 #. module: pad_project
 #: field:project.task,description_pad:0
 msgid "Description PAD"
-msgstr ""
+msgstr "PAD beskrivning"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
index 6557ef8c702..940ce0bfd07 100644
--- a/addons/plugin/i18n/sv.po
+++ b/addons/plugin/i18n/sv.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 21:05+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:22+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: plugin
 #: code:addons/plugin/plugin_handler.py:105
 #, python-format
 msgid "Use the Partner button to create a new partner"
-msgstr ""
+msgstr "Använd företagsknappen för att skapa nytt företag"
 
 #. module: plugin
 #: code:addons/plugin/plugin_handler.py:116
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index 7974d495047..00894f8b80a 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-02-21 03:40+0000\n"
-"Last-Translator: Yoshi Tashiro \n"
+"PO-Revision-Date: 2014-04-01 14:08+0000\n"
+"Last-Translator: hiro TAKADA \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-22 07:33+0000\n"
-"X-Generator: Launchpad (build 16926)\n"
+"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -52,7 +52,7 @@ msgstr "販売レシートの印刷"
 #. module: point_of_sale
 #: field:pos.session,cash_register_balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "計算残高"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -112,7 +112,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "営業担当者"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -135,7 +135,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:1373
 #, python-format
 msgid "Assign a Custom EAN"
-msgstr ""
+msgstr "カスタムEANを割り当て"
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -143,7 +143,7 @@ msgid ""
 "You may have to control your cash amount in your cash register, before\n"
 "                          being able to start selling through the "
 "touchscreen interface."
-msgstr ""
+msgstr "タッチスクリーン・インターフェースを介して販売を開始する前に、キャッシュレジスタ内の現金を管理する必要があります。"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -165,7 +165,7 @@ msgstr "現金取出"
 #: code:addons/point_of_sale/point_of_sale.py:105
 #, python-format
 msgid "not used"
-msgstr ""
+msgstr "未使用"
 
 #. module: point_of_sale
 #: field:pos.config,iface_vkeyboard:0
@@ -345,6 +345,7 @@ msgid ""
 "Check this if this point of sale should open by default in a self checkout "
 "mode. If unchecked, OpenERP uses the normal cashier mode by default."
 msgstr ""
+"販売時点をセルフチェックアウト・モードでオープンする場合にチェックします。チェックしない場合、OpenERPは通常のレジモードを使用します。"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -425,7 +426,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,to_weight:0
 msgid "To Weight"
-msgstr ""
+msgstr "重量"
 
 #. module: point_of_sale
 #. openerp-web
@@ -510,7 +511,7 @@ msgstr ""
 #: selection:pos.session.opening,pos_state:0
 #, python-format
 msgid "In Progress"
-msgstr ""
+msgstr "進行中"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -645,7 +646,7 @@ msgstr "顧客請求書"
 msgid ""
 "You can continue sales from the touchscreen interface by clicking on \"Start "
 "Selling\" or close the cash register session."
-msgstr ""
+msgstr "「販売開始」をクリックしてタッチスクリーンのインターフェースから販売を続けるか、キャッシュレジスタのセッションを閉じることができます。"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -748,7 +749,7 @@ msgstr ""
 msgid ""
 "Check if, this is a product you can use to take cash from a statement for "
 "the point of sale backend, example: money lost, transfer to bank, etc."
-msgstr ""
+msgstr "チェックした場合、この製品は販売時点バックエンドの計算書から現金を取り出すために使用できます。例：金銭紛失、銀行振込など。"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -769,7 +770,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Click to start a session."
-msgstr ""
+msgstr "クリックしてセッションを開始してください。"
 
 #. module: point_of_sale
 #: view:pos.details:0
@@ -956,7 +957,7 @@ msgstr "売上合計"
 msgid ""
 "Check this if you want to group the Journal Items by Product while closing a "
 "Session"
-msgstr ""
+msgstr "セッションのクローズ中に製品単位で仕訳項目をグループ化する場合はチェックします。"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1080,7 +1081,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Set a Custom EAN"
-msgstr ""
+msgstr "カスタムEANを設定"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1341,7 +1342,7 @@ msgstr "請求合計"
 #: model:ir.model,name:point_of_sale.model_pos_category
 #: field:product.product,pos_categ_id:0
 msgid "Point of Sale Category"
-msgstr ""
+msgstr "販売時点カテゴリ"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1354,7 +1355,7 @@ msgstr "数量の数"
 msgid ""
 "This sequence is automatically created by OpenERP but you can change it to "
 "customize the reference numbers of your orders."
-msgstr ""
+msgstr "このシーケンスはOpenERPが自動で作成しますが、注文の参照番号をカスタマイズするために変更もできます。"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1482,7 +1483,7 @@ msgstr "製品カテゴリ"
 #. module: point_of_sale
 #: help:pos.config,journal_id:0
 msgid "Accounting journal used to post sales entries."
-msgstr ""
+msgstr "売上高の記帳に使われる会計仕訳"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
@@ -1540,7 +1541,7 @@ msgstr "不明"
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "Point of Sale Cash In"
-msgstr ""
+msgstr "販売時点の現金入"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1594,7 +1595,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,available_in_pos:0
 msgid "Available in the Point of Sale"
-msgstr ""
+msgstr "販売時点で利用可能"
 
 #. module: point_of_sale
 #: selection:pos.config,state:0
@@ -1649,7 +1650,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "Point of Sale Cash Out"
-msgstr ""
+msgstr "販売時点の現金出"
 
 #. module: point_of_sale
 #: selection:report.pos.order,month:0
@@ -1754,7 +1755,7 @@ msgstr "Timmermans Kriek 375ml"
 #. module: point_of_sale
 #: field:pos.config,sequence_id:0
 msgid "Order IDs Sequence"
-msgstr ""
+msgstr "注文IDシーケンス"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1939,7 +1940,7 @@ msgstr ""
 msgid ""
 "Check if, this is a product you can use to put cash into a statement for the "
 "point of sale backend."
-msgstr ""
+msgstr "チェックした場合、この製品は販売時点バックエンドの計算書に現金を引き当てるために使用できます。"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
@@ -2022,7 +2023,7 @@ msgstr "店："
 #. module: point_of_sale
 #: field:account.journal,self_checkout_payment_method:0
 msgid "Self Checkout Payment Method"
-msgstr ""
+msgstr "セルフチェックアウト支払方法"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2473,7 +2474,7 @@ msgstr "日付順"
 msgid ""
 "Check if the product should be weighted (mainly used with self check-out "
 "interface)."
-msgstr ""
+msgstr "製品の重量を測定する場合にチェックします(主にセルフチェックアウト・インターフェースで使用)。"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -2568,7 +2569,7 @@ msgstr "ビール"
 #. module: point_of_sale
 #: help:pos.config,name:0
 msgid "An internal identification of the point of sale"
-msgstr ""
+msgstr "販売時点の内部識別"
 
 #. module: point_of_sale
 #: view:pos.config:0
@@ -2766,7 +2767,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:460
 #, python-format
 msgid "Custom Ean13"
-msgstr ""
+msgstr "カスタムEAN13"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3011,7 +3012,7 @@ msgstr "キャッシュレジスタを開く"
 #. module: point_of_sale
 #: field:account.journal,amount_authorized_diff:0
 msgid "Amount Authorized Difference"
-msgstr ""
+msgstr "公差額"
 
 #. module: point_of_sale
 #. openerp-web
@@ -3028,7 +3029,7 @@ msgstr ""
 #. module: point_of_sale
 #: help:pos.session,config_id:0
 msgid "The physical point of sale you will use."
-msgstr ""
+msgstr "使用する物理的なPOS"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -3055,7 +3056,7 @@ msgstr "ペプシ 330ml"
 msgid ""
 "Person who uses the the cash register. It can be a reliever, a student or an "
 "interim employee."
-msgstr ""
+msgstr "キャッシュレジスタの使用者。交代員や学生、臨時の従業員など。"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
@@ -3217,7 +3218,7 @@ msgstr "終了日"
 msgid ""
 "The Point of Sale Category this products belongs to. Those categories are "
 "used to group similar products and are specific to the Point of Sale."
-msgstr ""
+msgstr "販売時点カテゴリは、この製品に属します。これらのカテゴリは類似する製品のグループに使用され、販売時点に固有のものです。"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_1,5l_product_template
@@ -3389,7 +3390,7 @@ msgstr "ファンタ ゼロ オレンジ 330ml"
 #. module: point_of_sale
 #: help:product.product,available_in_pos:0
 msgid "Check if you want this product to appear in the Point of Sale"
-msgstr ""
+msgstr "この製品を販売時点で表示する場合はチェックします。"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -3493,7 +3494,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,pos_reference:0
 msgid "Receipt Ref"
-msgstr ""
+msgstr "レシート参照"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
@@ -3569,6 +3570,14 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                クリックして新しい注文を作成します。\n"
+"              
    \n"
+"                "
+"進行中の注文は、このメニューで閲覧できます。新しい注文の記録には、タッチスクリーン・インターフェース向けの自分のセッションメニューを使用すべ"
+"きです。\n"
+"              
    \n"
+"            "
 
 #. module: point_of_sale
 #. openerp-web
@@ -3867,6 +3876,8 @@ msgid ""
 "maximum is reached, the user will have an error message at the closing of "
 "his session saying that he needs to contact his manager."
 msgstr ""
+"このフィールドは、セッションを閉じる際の論理的な現金と終了残高の最大許容差を表します。最大値に達した場合は、管理者と連絡が必要なことをエラーメッセージで伝"
+"えます。"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -3960,7 +3971,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.session.opening:0
 msgid "Click to continue the session."
-msgstr ""
+msgstr "クリックしてセッションを続けてください。"
 
 #. module: point_of_sale
 #: view:pos.config:0
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index 9917f819e03..5d53a0f19a3 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-24 20:34+0000\n"
-"Last-Translator: Dorin \n"
+"PO-Revision-Date: 2014-04-20 07:24+0000\n"
+"Last-Translator: Simonel Criste \n"
 "Language-Team: Romanian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-25 06:39+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-21 05:08+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -412,6 +412,8 @@ msgid ""
 "You cannot change the partner of a POS order for which an invoice has "
 "already been issued."
 msgstr ""
+"Nu se poate schimba partenerul pe un bon de POS pentru care a fost deja "
+"emisa o factură."
 
 #. module: point_of_sale
 #: view:pos.session.opening:0
@@ -473,7 +475,7 @@ msgstr "Cant. totala"
 #: code:addons/point_of_sale/static/src/js/screens.js:874
 #, python-format
 msgid "Back"
-msgstr ""
+msgstr "Înapoi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
@@ -536,7 +538,7 @@ msgstr "Validati & Deschideti Sesiunea"
 #: selection:pos.session.opening,pos_state:0
 #, python-format
 msgid "In Progress"
-msgstr "In curs de desfasurare"
+msgstr "În desfasurare"
 
 #. module: point_of_sale
 #: view:pos.session:0
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index 803947e2dc1..7847b5f71ff 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 21:08+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:24+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -43,6 +43,20 @@ msgid ""
 "              
    \n"
 "            "
 msgstr ""
+"
    \n"
+"                 Klicka för att definiera en ny kategori.\n"
+"               
    \n"
+"                 Kategorier används för att bläddra bland dina produkter på "
+"en\n"
+"                 pekskärm.\n"
+"               
    \n"
+"                 Om du knyter ett foto till kategori, anpassas layouten för\n"
+"                 pekskärmsgränssnittet automatiskt. Vi föreslår att inte att "
+"välja\n"
+"                 foto på kategorierna vid användning av för små (1024x768) "
+"skärmar.\n"
+"               
    \n"
+"            "
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -80,13 +94,13 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:398
 #, python-format
 msgid "ã"
-msgstr ""
+msgstr "˜"
 
 #. module: point_of_sale
 #: field:pos.config,journal_id:0
 #: field:pos.order,sale_journal:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Försäljningsjournal"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -112,7 +126,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Säljare"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 206b4a80e67..76c48d24f80 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -488,10 +488,15 @@ class pos_order(osv.osv):
     _description = "Point of Sale"
     _order = "id desc"
 
-    def create_from_ui(self, cr, uid, orders, context=None):
-        #_logger.info("orders: %r", orders)
+    def create_from_ui(self, cr, uid, orders, context=None):      
+        # Keep only new orders
+        submitted_references = [o['data']['name'] for o in orders]
+        existing_order_ids = self.search(cr, uid, [('pos_reference', 'in', submitted_references)], context=context)
+        existing_orders = self.read(cr, uid, existing_order_ids, ['pos_reference'], context=context)
+        existing_references = set([o['pos_reference'] for o in existing_orders])
+        orders_to_save = [o for o in orders if o['data']['name'] not in existing_references]
         order_ids = []
-        for tmp_order in orders:
+        for tmp_order in orders_to_save:
             order = tmp_order['data']
             order_id = self.create(cr, uid, {
                 'name': order['name'],
@@ -529,7 +534,10 @@ class pos_order(osv.osv):
                 }, context=context)
             order_ids.append(order_id)
             wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
+            try:
+                wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
+            except Exception:
+                _logger.error('ERROR: Could not mark POS Order as Paid.', exc_info=True)
         return order_ids
 
     def write(self, cr, uid, ids, vals, context=None):
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 54572ee3eb9..47cdf47fda4 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -19,5 +19,11 @@
         
         [('company_id', '=', user.company_id.id)]
     
+    
+        Point Of Sale Config
+        
+        
+        ['|',('shop_id.company_id','=',False),('shop_id.company_id','child_of',[user.company_id.id])]
+    
 
 
diff --git a/addons/portal_crm/i18n/it.po b/addons/portal_crm/i18n/it.po
new file mode 100644
index 00000000000..268c7fb6f8f
--- /dev/null
+++ b/addons/portal_crm/i18n/it.po
@@ -0,0 +1,542 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-04-08 15:43+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Italian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-04-09 07:06+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_contact_us
+msgid "Contact Us"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Content..."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails for mass "
+"mailing and marketing campaign. Filter 'Available for Mass Mailing' allows "
+"users to filter the leads when performing mass mailing."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Your name..."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact form"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Your email..."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Subject..."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Your phone number..."
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Close"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 493d36e7524..b4a134a77cd 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 17:05+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:25+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -41,7 +41,7 @@ msgstr "Related Menu"
 #. module: process
 #: selection:process.node,kind:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -139,7 +139,7 @@ msgstr "Workflow Transitions"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "Last modified by:"
-msgstr ""
+msgstr "Senast ändrad av:"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -151,7 +151,7 @@ msgstr "Action ID"
 #: code:addons/process/static/src/xml/process.xml:7
 #, python-format
 msgid "Process View"
-msgstr ""
+msgstr "Processvy"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition
@@ -199,7 +199,7 @@ msgstr "Starting Transitions"
 #: code:addons/process/static/src/xml/process.xml:54
 #, python-format
 msgid "Related:"
-msgstr ""
+msgstr "Relaterad:"
 
 #. module: process
 #: view:process.node:0
@@ -215,14 +215,14 @@ msgstr "Notes"
 #: code:addons/process/static/src/xml/process.xml:88
 #, python-format
 msgid "Edit Process"
-msgstr ""
+msgstr "Ändra processen"
 
 #. module: process
 #. openerp-web
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "N/A"
-msgstr ""
+msgstr "Inte applicerbart"
 
 #. module: process
 #: view:process.process:0
@@ -254,7 +254,7 @@ msgstr "Action"
 #: code:addons/process/static/src/xml/process.xml:67
 #, python-format
 msgid "Select Process"
-msgstr ""
+msgstr "Välj process"
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -341,7 +341,7 @@ msgstr "Kind of Node"
 #: code:addons/process/static/src/xml/process.xml:42
 #, python-format
 msgid "Subflows:"
-msgstr ""
+msgstr "Underflöde"
 
 #. module: process
 #: view:process.node:0
@@ -354,7 +354,7 @@ msgstr "Outgoing Transitions"
 #: code:addons/process/static/src/xml/process.xml:36
 #, python-format
 msgid "Notes:"
-msgstr ""
+msgstr "Anteckningar:"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -378,4 +378,4 @@ msgstr "Object Method"
 #: code:addons/process/static/src/xml/process.xml:77
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "Välj"
diff --git a/addons/procurement/i18n/ja.po b/addons/procurement/i18n/ja.po
index 6614836964a..ffee875fe36 100644
--- a/addons/procurement/i18n/ja.po
+++ b/addons/procurement/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2014-02-13 11:15+0000\n"
-"Last-Translator: Yoshi Tashiro \n"
+"PO-Revision-Date: 2014-03-31 06:07+0000\n"
+"Last-Translator: hiro TAKADA \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-14 07:44+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:52+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -557,7 +557,7 @@ msgstr "調達行"
 msgid ""
 "as it's a consumable (as a result of this, the quantity\n"
 "                           on hand may become negative)."
-msgstr ""
+msgstr "ことを考慮します(その結果、手元数量がマイナスになる場合もあります)。"
 
 #. module: procurement
 #: field:procurement.order,note:0
@@ -669,7 +669,7 @@ msgstr "例外"
 msgid ""
 "When you sell this product, a delivery order will be created.\n"
 "                           OpenERP will consider that the"
-msgstr ""
+msgstr "この製品を販売する場合、配送オーダーも作成されます。OpenERPは消耗品として"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:133
@@ -927,7 +927,7 @@ msgstr "調達方法は製品タイプに依存します。"
 #. module: procurement
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will"
-msgstr "この製品を販売する場合、OpenERPは配送のために利用可能在庫を使用します。"
+msgstr "この製品を販売する場合、OpenERPは"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 1890c48b974..e1b79d36980 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2014-02-05 00:30+0000\n"
-"Last-Translator: gobi \n"
+"PO-Revision-Date: 2014-03-27 02:07+0000\n"
+"Last-Translator: Jacara \n"
 "Language-Team: Mongolian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-06 06:24+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-03-27 08:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -305,7 +305,7 @@ msgstr "Батлах"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Multiple"
-msgstr "Олон тоо хэмжээ"
+msgstr "Бүхэлчлэл"
 
 #. module: procurement
 #: help:procurement.order,origin:0
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index badd0c7498f..450608ad4e6 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -441,7 +441,8 @@ class procurement_order(osv.osv):
         if len(to_cancel):
             move_obj.action_cancel(cr, uid, to_cancel)
         if len(to_assign):
-            move_obj.write(cr, uid, to_assign, {'state': 'assigned'})
+            move_obj.write(cr, uid, to_assign, {'state': 'confirmed'})
+            move_obj.action_assign(cr, uid, to_assign)
         self.write(cr, uid, ids, {'state': 'cancel'})
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
@@ -564,14 +565,14 @@ class stock_warehouse_orderpoint(osv.osv):
     ]
 
     def default_get(self, cr, uid, fields, context=None):
+        warehouse_obj = self.pool.get('stock.warehouse')
         res = super(stock_warehouse_orderpoint, self).default_get(cr, uid, fields, context)
         # default 'warehouse_id' and 'location_id'
         if 'warehouse_id' not in res:
-            warehouse = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'warehouse0', context)
-            res['warehouse_id'] = warehouse.id
+            warehouse_ids = res.get('company_id') and warehouse_obj.search(cr, uid, [('company_id', '=', res['company_id'])], limit=1, context=context) or []
+            res['warehouse_id'] = warehouse_ids and warehouse_ids[0] or False
         if 'location_id' not in res:
-            warehouse = self.pool.get('stock.warehouse').browse(cr, uid, res['warehouse_id'], context)
-            res['location_id'] = warehouse.lot_stock_id.id
+            res['location_id'] = res.get('warehouse_id') and warehouse_obj.browse(cr, uid, res['warehouse_id'], context).lot_stock_id.id or False
         return res
 
     def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None):
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index a4f00056046..38d605566d2 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-09-25 11:56+0000\n"
-"Last-Translator: Judyta Kazmierczak \n"
+"PO-Revision-Date: 2014-04-18 12:42+0000\n"
+"Last-Translator: Dariusz Żbikowski (Krokus) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:27+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-19 06:35+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -25,7 +25,7 @@ msgstr "Liczba warstw"
 #. module: product
 #: view:res.partner:0
 msgid "the parent company"
-msgstr ""
+msgstr "Firma nadrzędna"
 
 #. module: product
 #: help:product.pricelist.item,base:0
@@ -216,7 +216,7 @@ msgstr "Kategoria nadrzędna"
 #. module: product
 #: model:product.template,description:product.product_product_33_product_template
 msgid "Headset for laptop PC with USB connector."
-msgstr ""
+msgstr "Komputerowy zestaw słuchawkowy USB"
 
 #. module: product
 #: model:product.category,name:product.product_category_all
@@ -746,7 +746,7 @@ msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi"
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13 Barcode"
-msgstr ""
+msgstr "Kod kreskowy EAN13"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -1200,7 +1200,7 @@ msgstr "Wiadomości i historia komunikacji"
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "kg"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1210,7 +1210,7 @@ msgstr "Zdezaktualizowany"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: field:product.template,standard_price:0
@@ -1371,6 +1371,8 @@ msgid ""
 "This field holds the image used as image for the product, limited to "
 "1024x1024px."
 msgstr ""
+"To pole utrzymuje obraz użyty jako zdjęcie produktu, limitowany rozmiar "
+"1024x1024."
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1548,7 +1550,7 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
diff --git a/addons/product/i18n/th.po b/addons/product/i18n/th.po
index 81ff805f682..f2edf6102c7 100644
--- a/addons/product/i18n/th.po
+++ b/addons/product/i18n/th.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-04-13 12:07+0000\n"
+"Last-Translator: Rungsan Suyala \n"
 "Language-Team: Thai \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:27+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-14 05:59+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -50,7 +50,7 @@ msgstr "รับเข้า"
 #. module: product
 #: view:product.product:0
 msgid "Product Name"
-msgstr ""
+msgstr "ชื่อสินค้า"
 
 #. module: product
 #: view:product.template:0
diff --git a/addons/product_margin/i18n/am.po b/addons/product_margin/i18n/am.po
new file mode 100644
index 00000000000..759a5679951
--- /dev/null
+++ b/addons/product_margin/i18n/am.po
@@ -0,0 +1,283 @@
+# Amharic translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-03-18 11:07+0000\n"
+"Last-Translator: biniyam \n"
+"Language-Team: Amharic \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-03-19 06:30+0000\n"
+"X-Generator: Launchpad (build 16963)\n"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,turnover:0
+msgid "Turnover"
+msgstr "ተመላሽ"
+
+#. module: product_margin
+#: field:product.product,expected_margin_rate:0
+msgid "Expected Margin (%)"
+msgstr ""
+
+#. module: product_margin
+#: field:product.margin,from_date:0
+msgid "From"
+msgstr "ከ"
+
+#. module: product_margin
+#: help:product.product,total_cost:0
+msgid ""
+"Sum of Multiplication of Invoice price and quantity of Supplier Invoices "
+msgstr ""
+
+#. module: product_margin
+#: field:product.margin,to_date:0
+msgid "To"
+msgstr "ለ"
+
+#. module: product_margin
+#: help:product.product,total_margin:0
+msgid "Turnover - Standard price"
+msgstr "የተመላሽ መደበኛ ዋጋ"
+
+#. module: product_margin
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
+msgstr ""
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Draft, Open and Paid"
+msgstr "ያልተከፈለና የተከፈለ ደረሰኞች"
+
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr "የእቃው አይነት በአንድ መጠን ሲጨምር"
+
+#. module: product_margin
+#: field:product.product,purchase_avg_price:0
+#: field:product.product,sale_avg_price:0
+msgid "Avg. Unit Price"
+msgstr "የእቃዎች መካከለኛ ዋጋ"
+
+#. module: product_margin
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
+msgstr ""
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Catalog Price"
+msgstr "ቅናሽ ዋጋ"
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Paid"
+msgstr "ተከፈል"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr "የሽያጭ ክፍተት"
+
+#. module: product_margin
+#: help:product.product,sales_gap:0
+msgid "Expected Sale - Turn Over"
+msgstr "ሊሸጥ የሚችል እቃ"
+
+#. module: product_margin
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
+msgstr "ሊሸጥ የሚችል እቃ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Standard Price"
+msgstr "የእቃው መደበኛ ዋጋ"
+
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,date_to:0
+msgid "Margin Date To"
+msgstr "የእቃው መጠን የጨመረበት ቀን"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Analysis Criteria"
+msgstr "የመመዘኛ መስፈርት"
+
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,total_cost:0
+msgid "Total Cost"
+msgstr "አጠቃላይ ዋጋ"
+
+#. module: product_margin
+#: help:product.product,normal_cost:0
+msgid "Sum of Multiplication of Cost price and quantity of Supplier Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,expected_margin:0
+msgid "Expected Margin"
+msgstr "የሚጠበቅ ጭማሪ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "#Purchased"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin_rate:0
+msgid "Expected margin * 100 / Expected Sale"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,sale_avg_price:0
+msgid "Avg. Price in Customer Invoices."
+msgstr "የመካከለኛ ዋጋ ለገዢዎች"
+
+#. module: product_margin
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
+msgstr "የመካከለኛ ዋጋ አቅራቢዎች "
+
+#. module: product_margin
+#: field:product.margin,invoice_state:0
+#: field:product.product,invoice_state:0
+msgid "Invoice State"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,purchase_gap:0
+msgid "Normal Cost - Total Cost"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid ""
+"Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,total_margin:0
+msgid "Total Margin"
+msgstr "የሁሉም ዋጋ በአንድ መጠን ሲጨምር"
+
+#. module: product_margin
+#: field:product.product,date_from:0
+msgid "Margin Date From"
+msgstr "እቃው ከጨመረበት ቀን ጀምሮ"
+
+#. module: product_margin
+#: help:product.product,turnover:0
+msgid ""
+"Sum of Multiplication of Invoice price and quantity of Customer Invoices"
+msgstr ""
+
+#. module: product_margin
+#: field:product.product,normal_cost:0
+msgid "Normal Cost"
+msgstr "መደበኛ ዋጋ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Purchases"
+msgstr "ግዢዎች"
+
+#. module: product_margin
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
+msgstr ""
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Properties categories"
+msgstr "በአይነታቸው መከፍፈል"
+
+#. module: product_margin
+#: help:product.product,total_margin_rate:0
+msgid "Total margin * 100 / Turnover"
+msgstr ""
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Open Margins"
+msgstr ""
+
+#. module: product_margin
+#: selection:product.margin,invoice_state:0
+#: selection:product.product,invoice_state:0
+msgid "Open and Paid"
+msgstr "የተከፈተና የትከፈል"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Sales"
+msgstr "ሽያጭ"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
+msgstr "ውጤት"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "General Information"
+msgstr "አጠቃላይ መርጃ"
+
+#. module: product_margin
+#: field:product.product,purchase_gap:0
+msgid "Purchase Gap"
+msgstr "የግዢ ክፍተት"
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "Cancel"
+msgstr "መሰረዝ"
+
+#. module: product_margin
+#: view:product.product:0
+msgid "Margins"
+msgstr "በአንድ መጠን ሲጨምር"
+
+#. module: product_margin
+#: help:product.product,sale_num_invoiced:0
+msgid "Sum of Quantity in Customer Invoices"
+msgstr ""
+
+#. module: product_margin
+#: view:product.margin:0
+msgid "or"
+msgstr "ወይም"
+
+#. module: product_margin
+#: model:ir.model,name:product_margin.model_product_margin
+msgid "Product Margin"
+msgstr "የእቃው መጨመር"
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 18d31a4e48f..3b3678652a4 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2014-03-31 17:09+0000\n"
+"Last-Translator: Anders Wallenquist \n"
 "Language-Team: Swedish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:28+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -83,7 +83,7 @@ msgstr ""
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr ""
+msgstr "Katalogpris"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 099b69dcfc8..d4ecec9092b 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-26 15:45+0000\n"
+"PO-Revision-Date: 2014-04-11 13:39+0000\n"
 "Last-Translator: Ralf Hilgenstock \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-27 05:45+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-04-12 09:42+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: project
 #: view:project.project:0
@@ -1408,7 +1408,7 @@ msgstr "Benutzer E-Mail"
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr "Beschreibung der Prüfung für die delegierte Aufgabe"
+msgstr "Beschreibung der Prüfungsaufgabe"
 
 #. module: project
 #: field:project.config.settings,time_unit:0
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index c973d7feef6..bb83b69abc1 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-12-27 11:22+0000\n"
+"PO-Revision-Date: 2014-03-25 17:07+0000\n"
 "Last-Translator: Pedro Manuel Baeza \n"
 "Language-Team: Spanish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-12-28 05:37+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project
 #: view:project.project:0
@@ -905,7 +905,7 @@ msgstr "GTD"
 #. module: project
 #: view:project.project:0
 msgid "Project Stages"
-msgstr "Etapas del proyecto"
+msgstr "Etapas para tareas del proyecto"
 
 #. module: project
 #: help:project.task,state:0
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 1396c8c92f8..a75cc70eda5 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-28 06:26+0000\n"
-"Last-Translator: Florian Hatat \n"
+"PO-Revision-Date: 2014-03-26 13:18+0000\n"
+"Last-Translator: Philippe Latouche - Savoir-faire Linux \n"
 "Language-Team: French \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:28+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-03-27 08:13+0000\n"
+"X-Generator: Launchpad (build 16967)\n"
 
 #. module: project
 #: view:project.project:0
@@ -2208,6 +2208,9 @@ msgid ""
 "resource allocation.\n"
 "                This installs the module project_long_term."
 msgstr ""
+"Module de gestion de projet à long terme qui permet de suivre la "
+"planification,  l'échéancier et l'allocation des ressources.\n"
+"                Ceci installe le module project_long_term."
 
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_closed
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index 698fd292083..0160b5b8ea1 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME \n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-11-19 11:54+0000\n"
-"Last-Translator: Mirosław Bojanowicz \n"
+"PO-Revision-Date: 2014-04-12 15:00+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:28+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: project
 #: view:project.project:0
@@ -271,7 +271,7 @@ msgstr "Umowa/Konto analityczne"
 #. module: project
 #: view:project.config.settings:0
 msgid "Project Management"
-msgstr "Zarządzanie projektem"
+msgstr "Zarządzanie projektami"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -1022,8 +1022,8 @@ msgid ""
 "Follow this project to automatically track the events associated to tasks "
 "and issues of this project."
 msgstr ""
-"Obserwuj ten projekt żeby automatycznie śledzić wydarzenia powiązane do "
-"zadania i problemy projektu."
+"Obserwuj ten projekt, żeby automatycznie śledzić zdarzenia związane z "
+"zadaniem i problemy projektu."
 
 #. module: project
 #: view:project.task:0
@@ -2079,7 +2079,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_config_settings
 #: view:project.config.settings:0
 msgid "Configure Project"
-msgstr "Konfiguruj Projekt"
+msgstr "Konfiguruj projekt"
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -2211,7 +2211,7 @@ msgstr ""
 #: view:board.board:0
 #: field:project.project,task_count:0
 msgid "Open Tasks"
-msgstr "Otwarte Zadania"
+msgstr "Otwarte zadania"
 
 #. module: project
 #: field:project.project,priority:0
diff --git a/addons/project/project.py b/addons/project/project.py
index d7bc7113818..f62774fc107 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -288,7 +288,9 @@ class project(osv.osv):
                                         help="The kind of document created when an email is received on this project's email alias"),
         'privacy_visibility': fields.selection(_visibility_selection, 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
+        'doc_count': fields.function(
+            _get_attached_docs, string="Number of documents attached", type='integer'
+        )
      }
 
     def _get_type_common(self, cr, uid, context):
@@ -737,9 +739,10 @@ class task(base_stage, osv.osv):
             context = {}
         if default is None:
             default = {}
-        stage = self._get_default_stage_id(cr, uid, context=context)
-        if stage:
-            default['stage_id'] = stage
+        if not context.get('copy', False):
+            stage = self._get_default_stage_id(cr, uid, context=context)
+            if stage:
+                default['stage_id'] = stage
         return super(task, self).copy(cr, uid, id, default, context)
 
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
@@ -763,10 +766,10 @@ class task(base_stage, osv.osv):
         'description': fields.text('Description'),
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
-        'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange',
+        'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', select=True,
                         domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="Status", readonly=True,
+                selection=_TASK_STATE, string="Status", readonly=True, select=True,
                 help='The status is set to \'Draft\', when a case is created.\
                       If the case is in progress the status is set to \'Open\'.\
                       When the case is over, the status is set to \'Done\'.\
@@ -785,7 +788,7 @@ class task(base_stage, osv.osv):
         'date_start': fields.datetime('Starting Date',select=True),
         'date_end': fields.datetime('Ending Date',select=True),
         'date_deadline': fields.date('Deadline',select=True),
-        'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select="1", track_visibility='onchange'),
+        'project_id': fields.many2one('project.project', 'Project', ondelete='set null', select=True, track_visibility='onchange'),
         'parent_ids': fields.many2many('project.task', 'project_task_parent_rel', 'task_id', 'parent_id', 'Parent Tasks'),
         'child_ids': fields.many2many('project.task', 'project_task_parent_rel', 'parent_id', 'task_id', 'Delegated Tasks'),
         'notes': fields.text('Notes'),
@@ -811,7 +814,7 @@ class task(base_stage, osv.osv):
                 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
                 'project.task.work': (_get_task, ['hours'], 10),
             }),
-        'user_id': fields.many2one('res.users', 'Assigned to', track_visibility='onchange'),
+        'user_id': fields.many2one('res.users', 'Assigned to', select=True, track_visibility='onchange'),
         'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 80283ee92d1..7d14f923847 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -376,7 +376,7 @@

- + \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-11-19 21:15+0000\n" -"Last-Translator: Mirosław Bojanowicz \n" +"PO-Revision-Date: 2014-04-12 15:01+0000\n" +"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:29+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: project_gtd #: view:project.task:0 @@ -208,7 +208,7 @@ msgstr "Ramki" #. module: project_gtd #: view:project.task:0 msgid "In Progress and draft tasks" -msgstr "W trakcie i w wersji roboczej" +msgstr "W trakcie lub w stanie Projekt" #. module: project_gtd #: model:ir.model,name:project_gtd.model_project_gtd_context diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po index c759a185ba3..430958bced1 100644 --- a/addons/project_gtd/i18n/sv.po +++ b/addons/project_gtd/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 21:00+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:29+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: project_gtd #: view:project.task:0 @@ -82,7 +82,7 @@ msgstr "Idag" #. module: project_gtd #: view:project.task:0 msgid "Timeframe" -msgstr "" +msgstr "Tidsram" #. module: project_gtd #: model:project.gtd.timebox,name:project_gtd.timebox_lt @@ -195,7 +195,7 @@ msgstr "project.gtd.timebox" #: code:addons/project_gtd/wizard/project_gtd_empty.py:52 #, python-format msgid "Error!" -msgstr "" +msgstr "Fel!" #. module: project_gtd #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree @@ -225,7 +225,7 @@ msgstr "Tasks selection" #. module: project_gtd #: view:project.task:0 msgid "Display" -msgstr "" +msgstr "Visa" #. module: project_gtd #: model:project.gtd.context,name:project_gtd.context_office @@ -251,7 +251,7 @@ msgstr "Anger ordningsföljen vid listning av kontext" #. module: project_gtd #: view:project.task:0 msgid "Unread Messages" -msgstr "" +msgstr "Olästa meddelanden" #. module: project_gtd #: view:project.task:0 @@ -302,4 +302,4 @@ msgstr "För återstart av uppgiften" #. module: project_gtd #: view:project.timebox.fill.plan:0 msgid "or" -msgstr "" +msgstr "eller" diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po index 9b7e1c599b5..195cc974c6f 100644 --- a/addons/project_issue/i18n/de.po +++ b/addons/project_issue/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-01-26 12:11+0000\n" -"Last-Translator: Ralf Hilgenstock \n" +"PO-Revision-Date: 2014-04-11 13:43+0000\n" +"Last-Translator: Rudolf Schnapka \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-27 05:45+0000\n" -"X-Generator: Launchpad (build 16914)\n" +"X-Launchpad-Export-Date: 2014-04-12 09:42+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: project_issue #: model:project.category,name:project_issue.project_issue_category_03 @@ -671,7 +671,7 @@ msgstr "November" #: code:addons/project_issue/project_issue.py:499 #, python-format msgid "Customer Email" -msgstr "" +msgstr "Kunden-Email" #. module: project_issue #: view:project.issue.report:0 diff --git a/addons/project_issue/i18n/sv.po b/addons/project_issue/i18n/sv.po index 52c897a92ec..21d4d74ec68 100644 --- a/addons/project_issue/i18n/sv.po +++ b/addons/project_issue/i18n/sv.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-27 17:24+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: project_issue #: model:project.category,name:project_issue.project_issue_category_03 msgid "Deadly bug" -msgstr "" +msgstr "Showstopper" #. module: project_issue #: help:project.config.settings,fetchmail_issue:0 @@ -28,6 +28,8 @@ msgid "" "Allows you to configure your incoming mail server, and create issues from " "incoming emails." msgstr "" +"Tillåter att du konfigurerar din e-postserver för inkommande meddelanden att " +"skapa ärenden automatiskt" #. module: project_issue #: field:project.issue.report,delay_open:0 @@ -48,7 +50,7 @@ msgstr "Arbetstid för att öppna ärendet" #. module: project_issue #: model:mail.message.subtype,description:project_issue.mt_issue_started msgid "Issue started" -msgstr "" +msgstr "Ärende öppnat" #. module: project_issue #: field:project.issue,date_open:0 @@ -74,7 +76,7 @@ msgstr "Upparbetat (%)" #: view:project.issue:0 #: field:project.issue,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Olästa meddelanden" #. module: project_issue #: field:project.issue,company_id:0 @@ -97,11 +99,16 @@ msgid "" " * Ready for next stage indicates the issue is ready to be pulled to the " "next stage" msgstr "" +"Ett ärendes Kanban-tillstånd indikerar speciella situationer som påverkar " +"det:\n" +" * Normal är standardläget\n" +" * Blockerad indikerar något hindrar utvecklingen av denna fråga\n" +" * Redo för nästa steg anger att frågan är klar att dras till nästa steg" #. module: project_issue #: help:project.issue,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet" #. module: project_issue #: help:account.analytic.account,use_issues:0 @@ -155,7 +162,7 @@ msgstr "Dagar sedan registrering" #: view:project.issue.report:0 #: field:project.issue.report,task_id:0 msgid "Task" -msgstr "Ärende" +msgstr "Uppgift" #. module: project_issue #: model:mail.message.subtype,name:project_issue.mt_project_issue_stage @@ -194,6 +201,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att öppna ett nytt ärende.\n" +"

\n" +"

Med OpenERP ärendehantering kan du effektivt hantera saker\n" +" som interna förfrågningar, mjukvaruutvecklingsbuggar, kund-\n" +" klagomål, projektbekymmer, materialhaverier etc.\n" +"

\n" +" " #. module: project_issue #: selection:project.issue,state:0 @@ -204,7 +219,7 @@ msgstr "Avbruten" #. module: project_issue #: field:project.issue,description:0 msgid "Private Note" -msgstr "" +msgstr "Privat notering" #. module: project_issue #: field:project.issue.report,date_closed:0 @@ -229,7 +244,7 @@ msgstr "Arbetstimmar innan problemet är öppnar i snitt" #. module: project_issue #: model:ir.model,name:project_issue.model_account_analytic_account msgid "Analytic Account" -msgstr "" +msgstr "Objektkonto" #. module: project_issue #: help:project.issue,message_summary:0 @@ -237,6 +252,8 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning " +"presenteras i html-format för att kunna sättas in i kanban vyer." #. module: project_issue #: help:project.project,project_escalation_id:0 @@ -256,12 +273,12 @@ msgstr "Tilläggsinformation" #: code:addons/project_issue/project_issue.py:479 #, python-format msgid "Warning!" -msgstr "" +msgstr "Varning!" #. module: project_issue #: view:project.issue:0 msgid "Edit..." -msgstr "" +msgstr "Redigera..." #. module: project_issue #: view:project.issue:0 @@ -272,7 +289,7 @@ msgstr "Ansvarig" #: model:mail.message.subtype,name:project_issue.mt_issue_blocked #: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked msgid "Issue Blocked" -msgstr "" +msgstr "Ärende blockerat" #. module: project_issue #: view:project.issue:0 @@ -282,13 +299,13 @@ msgstr "Statistik" #. module: project_issue #: field:project.issue,kanban_state:0 msgid "Kanban State" -msgstr "" +msgstr "Kanbanstatus" #. module: project_issue #: code:addons/project_issue/project_issue.py:366 #, python-format msgid "Project issue converted to task." -msgstr "" +msgstr "Ärende konverterat till uppgift" #. module: project_issue #: view:project.issue:0 @@ -309,7 +326,7 @@ msgstr "Version" #. module: project_issue #: field:project.issue,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Följare" #. module: project_issue #: view:project.issue:0 @@ -321,7 +338,7 @@ msgstr "Ny" #. module: project_issue #: view:project.project:0 msgid "{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}" -msgstr "" +msgstr "{'invisible': [('use_tasks', '=', False),('use_issues','=',False)]}" #. module: project_issue #: field:project.issue,email_from:0 @@ -344,7 +361,7 @@ msgstr "Lägsta" #: code:addons/project_issue/project_issue.py:388 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (kopia)" #. module: project_issue #: view:project.issue:0 @@ -377,7 +394,7 @@ msgstr "project.issue.version" #. module: project_issue #: field:project.config.settings,fetchmail_issue:0 msgid "Create issues from an incoming email account " -msgstr "" +msgstr "Skapa ett ärende från ett inkommande e-post,eddelande " #. module: project_issue #: view:project.issue:0 @@ -423,7 +440,7 @@ msgstr "Ärendeanalys" #: code:addons/project_issue/project_issue.py:516 #, python-format msgid "No Subject" -msgstr "" +msgstr "Inget ämne" #. module: project_issue #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree @@ -441,7 +458,7 @@ msgstr "Kontakt" #. module: project_issue #: view:project.issue:0 msgid "Delete" -msgstr "" +msgstr "Ta bort" #. module: project_issue #: code:addons/project_issue/project_issue.py:371 @@ -467,7 +484,7 @@ msgstr "december" #. module: project_issue #: field:project.issue,categ_ids:0 msgid "Tags" -msgstr "" +msgstr "Etiketter" #. module: project_issue #: view:project.issue:0 @@ -477,12 +494,12 @@ msgstr "Ärendeuppföljningslista" #. module: project_issue #: model:project.category,name:project_issue.project_issue_category_01 msgid "Little problem" -msgstr "" +msgstr "Litet problem" #. module: project_issue #: view:project.project:0 msgid "creates" -msgstr "" +msgstr "skapar" #. module: project_issue #: field:project.issue,write_date:0 @@ -492,7 +509,7 @@ msgstr "Uppdateringsdatum" #. module: project_issue #: view:project.issue:0 msgid "Project:" -msgstr "" +msgstr "Projekt:" #. module: project_issue #: view:project.issue:0 @@ -508,7 +525,7 @@ msgstr "Nästa åtgärd" #: view:project.issue:0 #: selection:project.issue,kanban_state:0 msgid "Blocked" -msgstr "" +msgstr "Blockerad" #. module: project_issue #: field:project.issue,user_email:0 @@ -592,7 +609,7 @@ msgstr "Normal" #. module: project_issue #: view:project.issue:0 msgid "Category:" -msgstr "" +msgstr "Kategori:" #. module: project_issue #: selection:project.issue.report,month:0 @@ -602,7 +619,7 @@ msgstr "juni" #. module: project_issue #: help:project.issue,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Meddelande- och kommunikationshistorik" #. module: project_issue #: view:project.issue:0 @@ -617,7 +634,7 @@ msgstr "Dagar i behandling" #. module: project_issue #: field:project.issue,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Är en följare" #. module: project_issue #: help:project.issue,state:0 @@ -644,7 +661,7 @@ msgstr "november" #: code:addons/project_issue/project_issue.py:499 #, python-format msgid "Customer Email" -msgstr "" +msgstr "Kund-e-postmeddelande" #. module: project_issue #: view:project.issue.report:0 @@ -679,7 +696,7 @@ msgstr "De här personerna kommer att ta emot e-post." #. module: project_issue #: field:project.issue,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Sammandrag" #. module: project_issue #: field:project.issue,date:0 @@ -696,12 +713,12 @@ msgstr "Tilldelad" #. module: project_issue #: view:project.config.settings:0 msgid "Configure" -msgstr "" +msgstr "Konfigurera" #. module: project_issue #: model:mail.message.subtype,description:project_issue.mt_issue_closed msgid "Issue closed" -msgstr "" +msgstr "Ärende stängt" #. module: project_issue #: view:project.issue:0 @@ -755,12 +772,12 @@ msgstr "Projektärenden" #. module: project_issue #: view:project.issue:0 msgid "Add an internal note..." -msgstr "" +msgstr "Lägg till intern notering" #. module: project_issue #: view:project.issue:0 msgid "Cancel Issue" -msgstr "" +msgstr "Avbryt ärende" #. module: project_issue #: help:project.issue,progress:0 @@ -770,13 +787,13 @@ msgstr "Beräknas som: nedlagd tid / total tid." #. module: project_issue #: field:project.project,issue_count:0 msgid "Unclosed Issues" -msgstr "" +msgstr "Oavstängda ärenden" #. module: project_issue #: view:project.issue:0 #: selection:project.issue,kanban_state:0 msgid "Ready for next stage" -msgstr "" +msgstr "Klar för nästa steg" #. module: project_issue #: selection:project.issue.report,month:0 @@ -806,7 +823,7 @@ msgstr "Ärende" #. module: project_issue #: model:project.category,name:project_issue.project_issue_category_02 msgid "PBCK" -msgstr "" +msgstr "SBS" #. module: project_issue #: view:project.issue:0 @@ -831,13 +848,13 @@ msgstr "maj" #. module: project_issue #: model:ir.model,name:project_issue.model_project_config_settings msgid "project.config.settings" -msgstr "" +msgstr "project.config.settings" #. module: project_issue #: model:mail.message.subtype,name:project_issue.mt_issue_closed #: model:mail.message.subtype,name:project_issue.mt_project_issue_closed msgid "Issue Closed" -msgstr "" +msgstr "Ärende stängt" #. module: project_issue #: view:project.issue.report:0 @@ -849,13 +866,13 @@ msgstr "# e-postmeddelanden" #: model:mail.message.subtype,name:project_issue.mt_issue_new #: model:mail.message.subtype,name:project_issue.mt_project_issue_new msgid "Issue Created" -msgstr "" +msgstr "Ärende skapat" #. module: project_issue #: code:addons/project_issue/project_issue.py:497 #, python-format msgid "Customer" -msgstr "" +msgstr "Kund" #. module: project_issue #: selection:project.issue.report,month:0 @@ -866,7 +883,7 @@ msgstr "februari" #: model:mail.message.subtype,description:project_issue.mt_issue_stage #: model:mail.message.subtype,description:project_issue.mt_project_issue_stage msgid "Stage changed" -msgstr "" +msgstr "Steg ändrat" #. module: project_issue #: view:project.issue:0 @@ -890,6 +907,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att lägga till en ny version.\n" +"

\n" +" Här definierar du de olika versionerna av dina produkter " +"som du kan knyta ärenden till.\n" +"

\n" +" " #. module: project_issue #: help:project.issue,section_id:0 @@ -908,7 +932,7 @@ msgstr "Mina ärenden" #. module: project_issue #: help:project.issue.report,delay_open:0 msgid "Number of Days to open the project issue." -msgstr "" +msgstr "Antal dagar innan ärendet öppnas" #. module: project_issue #: selection:project.issue.report,month:0 @@ -918,12 +942,12 @@ msgstr "april" #. module: project_issue #: view:project.issue:0 msgid "⇒ Escalate" -msgstr "" +msgstr "⇒ Eskalera" #. module: project_issue #: model:mail.message.subtype,description:project_issue.mt_issue_new msgid "Issue created" -msgstr "" +msgstr "Ärende skapat" #. module: project_issue #: field:project.issue,working_hours_close:0 @@ -991,7 +1015,7 @@ msgstr "Varaktighet" #: model:mail.message.subtype,name:project_issue.mt_issue_started #: model:mail.message.subtype,name:project_issue.mt_project_issue_started msgid "Issue Started" -msgstr "" +msgstr "Ärende startat" #~ msgid "Maintenance" #~ msgstr "Underhåll" diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index da28c17d74c..20a61657e20 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -259,7 +259,7 @@ class project_issue(base_stage, osv.osv): 'company_id': fields.many2one('res.company', 'Company'), 'description': fields.text('Private Note'), 'state': fields.related('stage_id', 'state', type="selection", store=True, - selection=_TASK_STATE, string="Status", readonly=True, + selection=_TASK_STATE, string="Status", readonly=True, select=True, help='The status is set to \'Draft\', when a case is created.\ If the case is in progress the status is set to \'Open\'.\ When the case is over, the status is set to \'Done\'.\ @@ -283,9 +283,9 @@ class project_issue(base_stage, osv.osv): 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'version_id': fields.many2one('project.issue.version', 'Version'), 'stage_id': fields.many2one ('project.task.type', 'Stage', - track_visibility='onchange', + track_visibility='onchange', select=True, domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"), - 'project_id':fields.many2one('project.project', 'Project', track_visibility='onchange'), + 'project_id': fields.many2one('project.project', 'Project', track_visibility='onchange', select=True), 'duration': fields.float('Duration'), 'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"), 'day_open': fields.function(_compute_day, string='Days to Open', \ diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 74c83afd304..494f054f8e8 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -150,7 +150,7 @@ - + diff --git a/addons/project_issue_sheet/i18n/sv.po b/addons/project_issue_sheet/i18n/sv.po index ab9f0d4d56e..29fef1b4167 100644 --- a/addons/project_issue_sheet/i18n/sv.po +++ b/addons/project_issue_sheet/i18n/sv.po @@ -8,20 +8,20 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 21:04+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: project_issue_sheet #: code:addons/project_issue_sheet/project_issue_sheet.py:57 #, python-format msgid "The Analytic Account is pending !" -msgstr "" +msgstr "Objektkontot avaktar granskning !" #. module: project_issue_sheet #: model:ir.model,name:project_issue_sheet.model_account_analytic_line @@ -41,7 +41,7 @@ msgstr "Tidrapportrad" #. module: project_issue_sheet #: view:project.issue:0 msgid "on_change_project(project_id)" -msgstr "" +msgstr "on_change_project(project_id)" #. module: project_issue_sheet #: code:addons/project_issue_sheet/project_issue_sheet.py:57 diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po index f8103a7b342..c89d2538cac 100644 --- a/addons/project_timesheet/i18n/sl.po +++ b/addons/project_timesheet/i18n/sl.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-02-23 22:05+0000\n" -"Last-Translator: Dušan Laznik (Mentis) \n" +"PO-Revision-Date: 2014-03-14 12:50+0000\n" +"Last-Translator: Matjaž Mozetič (Matmoz) \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-15 07:29+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Tasks by User" -msgstr "Naloge po uporabniku" +msgstr "Opravila po uporabniku" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by year of date" -msgstr "" +msgstr "Združi po letnicah datuma" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -44,18 +44,20 @@ msgid "" "You cannot delete a partner which is assigned to project, but you can " "uncheck the active box." msgstr "" +"Partnerja, ki je dodeljen projektu, ne morete izbrisati, lahko pa odznačite " +"polje \"aktiven\"" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_task_work msgid "Project Task Work" -msgstr "" +msgstr "Delo na projektnih opravilih" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:294 #, python-format msgid "" "You cannot select a Analytic Account which is in Close or Cancelled state." -msgstr "" +msgstr "Analitičnega konta v stanju Zaprto ali Preklicano ne morete izbrati." #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -77,7 +79,7 @@ msgstr "Časovnice" #. module: project_timesheet #: view:project.project:0 msgid "Billable" -msgstr "Plačljivo" +msgstr "Zaračunljivo" #. module: project_timesheet #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue @@ -90,21 +92,28 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Kliknite za dodajanje pogodbe s kupcem.\n" +"

\n" +" Tu najdete pogodbe povezane s projekti kupcev\n" +" za potrebe sledenja napredovanja obračuna.\n" +"

\n" +" " #. module: project_timesheet #: view:account.analytic.line:0 msgid "Analytic Account/Project" -msgstr "" +msgstr "Analitični konto/Projekt" #. module: project_timesheet #: view:account.analytic.line:0 msgid "Analytic account/project" -msgstr "" +msgstr "Analitični konto/projekt" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue msgid "Customer Projects" -msgstr "" +msgstr "Projekti kupca" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:89 @@ -114,6 +123,8 @@ msgid "" "employee.\n" "Fill in the HR Settings tab of the employee form." msgstr "" +"Določite konto proizvoda in kategorije proizvoda za povezani kader.\n" +"Izpolnite tabelo HR Settings (Nastavitve kadrov) v obrazcu zaposleni." #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_account_analytic_line @@ -128,12 +139,12 @@ msgstr "Avgust" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0 msgid "Task invoice" -msgstr "" +msgstr "Obračun opravila" #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_taskwork0 msgid "Task Work" -msgstr "Delo na nalogi" +msgstr "Delo na opravilu" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -147,6 +158,8 @@ msgid "" "Please define journal on the related employee.\n" "Fill in the timesheet tab of the employee form." msgstr "" +"Določite prosim dnevnik za povezani kader.\n" +"Izpolnite tabelo časovnice v obrazcu zaposlenih." #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in @@ -156,7 +169,7 @@ msgstr "Prijavi/odjavi se iz projekta" #. module: project_timesheet #: view:project.project:0 msgid "Billable Project" -msgstr "" +msgstr "Zaračunljiv projekt" #. module: project_timesheet #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts @@ -171,12 +184,12 @@ msgstr "Ure" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Group by month of date" -msgstr "" +msgstr "Združi po mesecih datuma" #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_task msgid "Task" -msgstr "Naloga" +msgstr "Opravilo" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -198,12 +211,12 @@ msgstr "Julij" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_timesheettask0 msgid "Complete Your Timesheet." -msgstr "" +msgstr "Izpolni svojo časovnico" #. module: project_timesheet #: field:report.timesheet.task.user,task_hrs:0 msgid "Task Hours" -msgstr "Ure po nalogi" +msgstr "Ure na opravilu" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -221,21 +234,28 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Tu najdete časovnice in nabavo za pogodbe, ki jih lahko " +"zaračunate kupcu.\n" +" Če želite vknjižiti nova opravila za obračun, uporabite menu " +"časovnice.\n" +"

\n" +" " #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_timesheettask0 msgid "Timesheet task" -msgstr "" +msgstr "Opravilo časovnice" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_taskencoding0 msgid "Task encoding" -msgstr "" +msgstr "Knjiženje opravil" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0 msgid "Task summary is comes into the timesheet line" -msgstr "" +msgstr "Povzetek opravila kot bo prikazano na postavki časovnice" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -245,7 +265,7 @@ msgstr "Januar" #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_triggerinvoice0 msgid "Trigger Invoice" -msgstr "" +msgstr "Sproži račun" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -275,13 +295,13 @@ msgstr "report.timesheet.task.user" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskencoding0 msgid "Encode how much time u spent on your task" -msgstr "" +msgstr "Vknjiži čas porabljen na opravilu" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:85 #, python-format msgid "Please define employee for user \"%s\". You must create one." -msgstr "" +msgstr "Določite ali ustvarite zaposlenega za uporabnika \"%s\"." #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_res_partner @@ -292,12 +312,12 @@ msgstr "Partner" #: code:addons/project_timesheet/project_timesheet.py:294 #, python-format msgid "Invalid Analytic Account !" -msgstr "" +msgstr "Neveljaven analitični konto !" #. module: project_timesheet #: view:report.timesheet.task.user:0 msgid "Timesheet/Task hours Report Per Month" -msgstr "" +msgstr "Mesečno poročilo o Časovnicah/Urah na opravilih" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:84 @@ -316,7 +336,7 @@ msgstr "Fakturiranje" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_triggerinvoice0 msgid "Trigger invoices from sales order lines" -msgstr "" +msgstr "Sproži izdajo računov iz postavk prodajnega naloga" #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:100 @@ -326,6 +346,8 @@ msgid "" "employee.\n" "Fill in the timesheet tab of the employee form." msgstr "" +"Določite konto proizvoda in kategorije proizvoda za dotični kader.\n" +"Izpolnite tabelo Časovnica v obrazcu zaposleni/kadri." #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:60 @@ -334,24 +356,26 @@ msgid "" "

Timesheets on this project may be invoiced to %s, according to the terms " "defined in the contract.

" msgstr "" +"

Časovnice tega projekta se lahko zaračuna %s, glede na pogodbena " +"določila.

" #. module: project_timesheet #: model:process.node,note:project_timesheet.process_node_taskwork0 msgid "Work on task" -msgstr "Delo na nalogi" +msgstr "Delo na opravilu" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line msgid "Invoice Tasks" -msgstr "" +msgstr "Zaračunaj opravila" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user #: view:report.timesheet.task.user:0 msgid "Task Hours Per Month" -msgstr "" +msgstr "Delovne ure na opravilih po mesecih" #. module: project_timesheet #: selection:report.timesheet.task.user,month:0 @@ -366,7 +390,7 @@ msgstr "December" #. module: project_timesheet #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0 msgid "After task is completed, Create its invoice." -msgstr "" +msgstr "Po dokončanju opravila ustvari račun." #. module: project_timesheet #: code:addons/project_timesheet/project_timesheet.py:266 @@ -387,11 +411,12 @@ msgid "" "

Record your timesheets for the project " "'%s'.

" msgstr "" +"

Vknjiži časovnice za projekt '%s'.

" #. module: project_timesheet #: field:report.timesheet.task.user,timesheet_hrs:0 msgid "Timesheet Hours" -msgstr "" +msgstr "Ure časovnice" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -402,4 +427,4 @@ msgstr "Leto" #. module: project_timesheet #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0 msgid "Fill Timesheet" -msgstr "" +msgstr "Izpolni časovnico" diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po index e2661e7b1a3..592f9a1b4f7 100644 --- a/addons/project_timesheet/i18n/sv.po +++ b/addons/project_timesheet/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-30 12:27+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-31 06:40+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -44,6 +44,8 @@ msgid "" "You cannot delete a partner which is assigned to project, but you can " "uncheck the active box." msgstr "" +"Du kan inte ta bort ett företag som har tilldelats projekt, men du kan " +"avmarkera aktiv-rutan." #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_project_task_work @@ -56,6 +58,7 @@ msgstr "Projektaktivitetsarbete" msgid "" "You cannot select a Analytic Account which is in Close or Cancelled state." msgstr "" +"Du kan inte välja en objektkonto som är i stängt eller avbrutet läge." #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -72,7 +75,7 @@ msgstr "oktober" #: view:project.project:0 #, python-format msgid "Timesheets" -msgstr "" +msgstr "Tidrapporter" #. module: project_timesheet #: view:project.project:0 @@ -90,11 +93,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att lägga till ett kundavtal.\n" +"

\n" +" Här hittar du de avtal som rör din kundprojekt i syfte att " +"spåra faktureringen.\n" +" \n" +" " #. module: project_timesheet #: view:account.analytic.line:0 msgid "Analytic Account/Project" -msgstr "" +msgstr "Objektkonto/projekt" #. module: project_timesheet #: view:account.analytic.line:0 @@ -166,7 +176,7 @@ msgstr "Avtal att förnya" #. module: project_timesheet #: view:project.project:0 msgid "Hours" -msgstr "" +msgstr "Timmar" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -221,6 +231,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Här hittar du tidrapporter och inköp du gjorde för avtal " +"som kan vidarefakturerats till kunden.\n" +" Om du vill registrera nya jobb att fakturera, bör du " +"använda tidrapportmenyn istället.\n" +" \n" +" " #. module: project_timesheet #: model:process.node,name:project_timesheet.process_node_timesheettask0 @@ -282,6 +299,7 @@ msgstr "Ange hur mycket tid du förbrukade på din aktivitet" #, python-format msgid "Please define employee for user \"%s\". You must create one." msgstr "" +"Vänligen definiera anställd för användaren \"%s\". Du måste skapa en." #. module: project_timesheet #: model:ir.model,name:project_timesheet.model_res_partner @@ -344,7 +362,7 @@ msgstr "Arbete på aktiviteten" #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line msgid "Invoice Tasks" -msgstr "" +msgstr "Fakturera uppgifter" #. module: project_timesheet #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user @@ -372,7 +390,7 @@ msgstr "Skapa en faktura när aktiviteten är avslutad" #: code:addons/project_timesheet/project_timesheet.py:266 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "Ogiltig åtgärd" #. module: project_timesheet #: view:report.timesheet.task.user:0 @@ -387,6 +405,8 @@ msgid "" "

Record your timesheets for the project " "'%s'.

" msgstr "" +"

Registrera dina tidrapporter för " +"projekt '%s'.

" #. module: project_timesheet #: field:report.timesheet.task.user,timesheet_hrs:0 diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po index 51d80c0a3b1..0d4afc162a1 100644 --- a/addons/purchase/i18n/ar.po +++ b/addons/purchase/i18n/ar.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-27 19:23+0000\n" -"Last-Translator: gehad shaat \n" +"PO-Revision-Date: 2014-04-06 09:15+0000\n" +"Last-Translator: Mohamed M. Hagag \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:30+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-07 06:53+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: purchase #: model:res.groups,name:purchase.group_analytic_accounting @@ -887,7 +887,7 @@ msgstr "" #: model:ir.ui.menu,name:purchase.menu_purchase_config #: view:res.partner:0 msgid "Purchases" -msgstr "المشتريات" +msgstr "مشتريات" #. module: purchase #: view:purchase.report:0 diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po index c40b5deaf2c..4526c59ee18 100644 --- a/addons/purchase/i18n/ja.po +++ b/addons/purchase/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-16 14:38+0000\n" +"PO-Revision-Date: 2014-03-31 07:02+0000\n" "Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-17 06:03+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: purchase #: model:res.groups,name:purchase.group_analytic_accounting @@ -227,7 +227,7 @@ msgstr "" #. module: purchase #: view:product.product:0 msgid "When you sell this product, OpenERP will trigger" -msgstr "" +msgstr "この製品を販売する場合、OpenERPは調達先に必要な数量を購入するため" #. module: purchase #: view:purchase.order:0 @@ -1219,7 +1219,7 @@ msgid "" " The delivery order will be ready after having " "received the\n" " products." -msgstr "" +msgstr "をトリガします。配送オーダーは製品を受け取った後に準備完了となります。" #. module: purchase #: view:product.product:0 diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po index 037e14ee43a..ded6dfe66ad 100644 --- a/addons/purchase/i18n/nl.po +++ b/addons/purchase/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-03-03 12:45+0000\n" +"PO-Revision-Date: 2014-04-23 16:15+0000\n" "Last-Translator: Stefan Rijnhart (Therp) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-04 08:27+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-04-24 06:32+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: purchase #: model:res.groups,name:purchase.group_analytic_accounting @@ -1335,7 +1335,7 @@ msgstr "" #: code:addons/purchase/purchase.py:322 #, python-format msgid "Please create Invoices." -msgstr "Maak à.u.b. Facturen." +msgstr "Deze order(s) hebben nog geen facturen." #. module: purchase #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po index 7b7f4831fb2..795c543c47c 100644 --- a/addons/purchase/i18n/sv.po +++ b/addons/purchase/i18n/sv.po @@ -8,24 +8,24 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 20:00+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:31+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: purchase #: model:res.groups,name:purchase.group_analytic_accounting msgid "Analytic Accounting for Purchases" -msgstr "" +msgstr "Objektredovisning för inköp" #. module: purchase #: model:ir.model,name:purchase.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: purchase #: view:board.board:0 @@ -49,7 +49,7 @@ msgstr "Standardinköpslista" #. module: purchase #: report:purchase.order:0 msgid "Tel :" -msgstr "" +msgstr "Tel :" #. module: purchase #: help:purchase.order,pricelist_id:0 @@ -69,7 +69,7 @@ msgstr "Dag" #. module: purchase #: view:purchase.order:0 msgid "Cancel Order" -msgstr "" +msgstr "Avbryt order" #. module: purchase #: view:purchase.report:0 @@ -79,7 +79,7 @@ msgstr "Dagens ordrar" #. module: purchase #: help:purchase.order,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory @@ -104,12 +104,14 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning " +"presenteras i html-format för att kunna sättas in i kanban vyer." #. module: purchase #: code:addons/purchase/purchase.py:1050 #, python-format msgid "Configuration Error!" -msgstr "" +msgstr "Konfigurationsfel!" #. module: purchase #: code:addons/purchase/purchase.py:589 @@ -133,7 +135,7 @@ msgstr "Standardpris Inköp" #: code:addons/purchase/purchase.py:1037 #, python-format msgid "No supplier defined for this product !" -msgstr "" +msgstr "Leverantör saknas för denna produkt !" #. module: purchase #: help:res.company,po_lead:0 @@ -181,24 +183,24 @@ msgstr "Leveransadress :" #. module: purchase #: view:purchase.order:0 msgid "Confirm Order" -msgstr "" +msgstr "Bekräfta order" #. module: purchase #: field:purchase.config.settings,module_warning:0 msgid "Alerts by products or supplier" -msgstr "" +msgstr "Påminnelser via produkter eller leverantör" #. module: purchase #: field:purchase.order,name:0 #: view:purchase.order.line:0 #: field:purchase.order.line,order_id:0 msgid "Order Reference" -msgstr "Order Reference" +msgstr "Orderreferens" #. module: purchase #: view:purchase.config.settings:0 msgid "Invoicing Process" -msgstr "" +msgstr "Faktureringsprocess" #. module: purchase #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0 @@ -270,7 +272,7 @@ msgstr "" #: field:purchase.order.line,state:0 #: view:purchase.report:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: purchase #: selection:purchase.report,month:0 @@ -280,7 +282,7 @@ msgstr "augusti" #. module: purchase #: view:product.product:0 msgid "to" -msgstr "" +msgstr "till" #. module: purchase #: selection:purchase.report,month:0 @@ -296,7 +298,7 @@ msgstr "Inköpsorder" #: help:account.config.settings,group_analytic_account_for_purchases:0 #: help:purchase.config.settings,group_analytic_account_for_purchases:0 msgid "Allows you to specify an analytic account on purchase orders." -msgstr "" +msgstr "Tillåter dig att ange ett objektkonto på inköpsordrar." #. module: purchase #: model:ir.actions.act_window,help:purchase.action_invoice_pending @@ -313,6 +315,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att skapa ett fakturautkast.\n" +"

\n" +" Använd den här menyn för att kontrollera inkommande fakturor " +"från dina\n" +" leverantörer. OpenERP genererar fakturautkast från din " +"inköpsorder eller leveransmottagningar, enligt dina inställningar.\n" +"

\n" +" När du får en leverantörsfaktura kan du matcha den med\n" +" befintliga fakturautkast och validera den.\n" +"

\n" +" " #. module: purchase #: selection:purchase.report,month:0 @@ -389,6 +403,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka här för att registrera en leverantörsfaktura.\n" +"

\n" +" Leverantörsfakturor kan pre-genereras baserat på " +"inköpsorder eller leveransmottagningar. Detta gör att du kan kontrollera " +"dina leverantörsfakturor med dokumentutkast i OpenERP.\n" +"

\n" +" " #. module: purchase #: view:purchase.order:0 @@ -428,6 +450,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Här kan du spåra alla rader från inköpsorder där\n" +" fakturering är \"Baserat på inköpsorderrader\", och som du\n" +" har inte fått en leverantörsfaktura på ännu. Du kan " +"generera ett\n" +" utkast till leverantörsfakturan baserat på raderna från den " +"här listan.\n" +" \n" +" " #. module: purchase #: field:purchase.order.line,date_planned:0 @@ -437,7 +468,7 @@ msgstr "Planerat datum" #. module: purchase #: field:purchase.order,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Valuta" #. module: purchase #: field:purchase.order,journal_id:0 @@ -464,7 +495,7 @@ msgstr "Beställningar som inkluderar rader som inte är fakturerade." #: view:product.product:0 #: field:product.template,purchase_ok:0 msgid "Can be Purchased" -msgstr "" +msgstr "Kan köpas" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move @@ -489,7 +520,7 @@ msgstr "" #: view:purchase.order.group:0 #: view:purchase.order.line_invoice:0 msgid "or" -msgstr "" +msgstr "eller" #. module: purchase #: field:res.company,po_lead:0 @@ -515,7 +546,7 @@ msgstr "" #. module: purchase #: view:purchase.config.settings:0 msgid "Apply" -msgstr "" +msgstr "Verkställ" #. module: purchase #: field:purchase.order,amount_untaxed:0 @@ -539,7 +570,7 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Customer Address" -msgstr "" +msgstr "Kundadress" #. module: purchase #: selection:purchase.order,state:0 @@ -596,12 +627,12 @@ msgstr "Preleminära inköpsorder" #. module: purchase #: view:product.product:0 msgid "Suppliers" -msgstr "" +msgstr "Leverantörer" #. module: purchase #: view:product.product:0 msgid "To Purchase" -msgstr "" +msgstr "Att köpa" #. module: purchase #: model:ir.actions.act_window,help:purchase.purchase_form_action diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 8102ef6b469..a9d8e773b19 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -134,10 +134,7 @@ class purchase_order(osv.osv): def _invoiced(self, cursor, user, ids, name, arg, context=None): res = {} for purchase in self.browse(cursor, user, ids, context=context): - invoiced = False - if purchase.invoiced_rate == 100.00: - invoiced = True - res[purchase.id] = invoiced + res[purchase.id] = all(line.invoiced for line in purchase.order_line) return res def _get_journal(self, cr, uid, context=None): @@ -544,7 +541,7 @@ class purchase_order(osv.osv): inv_line_id = inv_line_obj.create(cr, uid, inv_line_data, context=context) inv_lines.append(inv_line_id) - po_line.write({'invoiced': True, 'invoice_lines': [(4, inv_line_id)]}, context=context) + po_line.write({'invoice_lines': [(4, inv_line_id)]}, context=context) # get invoice data and create invoice inv_data = { @@ -633,10 +630,9 @@ class purchase_order(osv.osv): 'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'), 'origin': order.name + ((order.origin and (':' + order.origin)) or ''), 'date': self.date_to_datetime(cr, uid, order.date_order, context), - 'partner_id': order.dest_address_id.id or order.partner_id.id, + 'partner_id': order.partner_id.id, 'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none', 'type': 'in', - 'partner_id': order.dest_address_id.id or order.partner_id.id, 'purchase_id': order.id, 'company_id': order.company_id.id, 'move_lines' : [], @@ -1291,9 +1287,15 @@ class account_invoice(osv.Model): user_id = uid po_ids = purchase_order_obj.search(cr, user_id, [('invoice_ids', 'in', ids)], context=context) wf_service = netsvc.LocalService("workflow") - for po_id in po_ids: + for order in purchase_order_obj.browse(cr, uid, po_ids, context=context): # Signal purchase order workflow that an invoice has been validated. - wf_service.trg_write(uid, 'purchase.order', po_id, cr) + invoiced = [] + for po_line in order.order_line: + if any(line.invoice_id.state not in ['draft', 'cancel'] for line in po_line.invoice_lines): + invoiced.append(po_line.id) + if invoiced: + self.pool['purchase.order.line'].write(cr, uid, invoiced, {'invoiced': True}) + wf_service.trg_write(uid, 'purchase.order', order.id, cr) return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 3504d49a884..3c8afceb6e7 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -270,7 +270,7 @@ - + @@ -297,7 +297,7 @@ - + diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index ae3a172ce3c..2b85e8f34c2 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -63,7 +63,7 @@ Example: Product: this product is deprecated, do not purchase more than 5. } _defaults = { - 'default_invoice_method': 'manual', + 'default_invoice_method': 'order', } def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None): diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py index e4a3252eef2..d0055d80c7f 100644 --- a/addons/purchase/stock.py +++ b/addons/purchase/stock.py @@ -111,7 +111,6 @@ class stock_picking(osv.osv): invoice_line_obj = self.pool.get('account.invoice.line') purchase_line_obj = self.pool.get('purchase.order.line') purchase_line_obj.write(cursor, user, [move_line.purchase_line_id.id], { - 'invoiced': True, 'invoice_lines': [(4, invoice_line_id)], }) return super(stock_picking, self)._invoice_line_hook(cursor, user, move_line, invoice_line_id) diff --git a/addons/purchase_double_validation/i18n/sv.po b/addons/purchase_double_validation/i18n/sv.po index a553aab04b8..f331a20ba59 100644 --- a/addons/purchase_double_validation/i18n/sv.po +++ b/addons/purchase_double_validation/i18n/sv.po @@ -8,42 +8,42 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 20:33+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:32+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: purchase_double_validation #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings msgid "purchase.config.settings" -msgstr "" +msgstr "purchase.config.settings" #. module: purchase_double_validation #: view:purchase.order:0 msgid "Purchase orders which are not approved yet." -msgstr "" +msgstr "Inköpsordrar som inte är godkända ännu." #. module: purchase_double_validation #: field:purchase.config.settings,limit_amount:0 msgid "limit to require a second approval" -msgstr "" +msgstr "gräns att kräva ett andra godkännande" #. module: purchase_double_validation #: view:board.board:0 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting msgid "Purchase Orders Waiting Approval" -msgstr "" +msgstr "Inköpsordrar i väntan på godkännande" #. module: purchase_double_validation #: view:purchase.order:0 msgid "To Approve" -msgstr "" +msgstr "Att godkänna" #. module: purchase_double_validation #: help:purchase.config.settings,limit_amount:0 msgid "Amount after which validation of purchase is required." -msgstr "" +msgstr "Belopp efter vilken granskning av inköpet krävs." diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index c1d80c7bf46..c31f8a69a37 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -109,7 +109,7 @@ class purchase_requisition(osv.osv): seller_delay = product_supplier.delay seller_qty = product_supplier.qty supplier_pricelist = supplier.property_product_pricelist_purchase or False - seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, False, {'uom': default_uom_po_id})[supplier_pricelist.id] + seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, supplier.id, {'uom': default_uom_po_id})[supplier_pricelist.id] if seller_qty: qty = max(qty,seller_qty) date_planned = self._planned_date(requisition_line.requisition_id, seller_delay) diff --git a/addons/report_webkit/default_header.html b/addons/report_webkit/default_header.html index 0798209a5b7..37fd4135b62 100644 --- a/addons/report_webkit/default_header.html +++ b/addons/report_webkit/default_header.html @@ -1,3 +1,4 @@ + diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po index 887a1e1ec59..c505e55f5ad 100644 --- a/addons/report_webkit/i18n/es.po +++ b/addons/report_webkit/i18n/es.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-25 14:56+0000\n" +"Last-Translator: Pedro Manuel Baeza \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:32+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-26 07:12+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: report_webkit #: view:ir.actions.report.xml:0 @@ -252,7 +252,7 @@ msgstr "Folio 27 210 x 330 mm" #. module: report_webkit #: field:ir.header_webkit,margin_top:0 msgid "Top Margin (mm)" -msgstr "Margen Superiro (mm)" +msgstr "Margen superior (mm)" #. module: report_webkit #: view:report.webkit.actions:0 diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py index 56f361370f2..c6a30f5e579 100644 --- a/addons/report_webkit/webkit_report.py +++ b/addons/report_webkit/webkit_report.py @@ -61,6 +61,7 @@ def mako_template(text): tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) + class WebKitParser(report_sxw): """Custom class that use webkit to render HTML reports Code partially taken from report openoffice. Thanks guys :) @@ -122,7 +123,7 @@ class WebKitParser(report_sxw): ), 'w' ) - head_file.write(header) + head_file.write(self._sanitize_html(header)) head_file.close() file_to_del.append(head_file.name) command.extend(['--header-html', head_file.name]) @@ -133,7 +134,7 @@ class WebKitParser(report_sxw): ), 'w' ) - foot_file.write(footer) + foot_file.write(self._sanitize_html(footer)) foot_file.close() file_to_del.append(foot_file.name) command.extend(['--footer-html', foot_file.name]) @@ -154,7 +155,7 @@ class WebKitParser(report_sxw): for html in html_list : html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w') count += 1 - html_file.write(html) + html_file.write(self._sanitize_html(html)) html_file.close() file_to_del.append(html_file.name) command.append(html_file.name) @@ -314,7 +315,6 @@ class WebKitParser(report_sxw): pdf = self.generate_pdf(bin, report_xml, head, foot, htmls) return (pdf, 'pdf') - def create(self, cursor, uid, ids, data, context=None): """We override the create function in order to handle generator Code taken from report openoffice. Thanks guys :) """ @@ -335,11 +335,18 @@ class WebKitParser(report_sxw): report_xml.report_sxw = None else: return super(WebKitParser, self).create(cursor, uid, ids, data, context) - if report_xml.report_type != 'webkit' : + if report_xml.report_type != 'webkit': return super(WebKitParser, self).create(cursor, uid, ids, data, context) result = self.create_source_pdf(cursor, uid, ids, data, report_xml, context) if not result: return (False,False) return result + def _sanitize_html(self, html): + """wkhtmltopdf expects the html page to declare a doctype. + """ + if html and html[:9].upper() != "\n" + html + return html + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po index 371b4ffb62f..71e87639253 100644 --- a/addons/resource/i18n/sv.po +++ b/addons/resource/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-04-01 06:46+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:32+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-02 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: resource #: help:resource.calendar.leaves,resource_id:0 @@ -61,6 +61,11 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Definiera arbetstid och tidtabell som skall utgöra underlag " +"för tidplaneringen för dina projektdeltagare.\n" +"

\n" +" " #. module: resource #: selection:resource.calendar.attendance,dayofweek:0 @@ -81,7 +86,7 @@ msgstr "Söndag" #. module: resource #: field:resource.resource,time_efficiency:0 msgid "Efficiency Factor" -msgstr "" +msgstr "Effektivitetsfaktor" #. module: resource #: view:resource.resource:0 @@ -109,7 +114,7 @@ msgstr "Se till att arbetstid har konfigurerats med riktiga veckodagar!" #: code:addons/resource/resource.py:373 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (kopia)" #. module: resource #: view:resource.calendar:0 @@ -143,7 +148,7 @@ msgstr "Fredag" #. module: resource #: view:resource.calendar.attendance:0 msgid "Hours" -msgstr "" +msgstr "Timmar" #. module: resource #: view:resource.calendar.leaves:0 @@ -169,12 +174,12 @@ msgstr "Sök arbetsperiodsfrånvaro" #. module: resource #: field:resource.calendar.attendance,date_from:0 msgid "Starting Date" -msgstr "" +msgstr "Startdatum" #. module: resource #: field:resource.calendar,manager:0 msgid "Workgroup Manager" -msgstr "" +msgstr "Gruppchef" #. module: resource #: field:resource.calendar.leaves,date_to:0 @@ -215,7 +220,7 @@ msgstr "Arbetstid" #. module: resource #: help:resource.calendar.attendance,hour_from:0 msgid "Start and End time of working." -msgstr "" +msgstr "Arbetstidens start och slut" #. module: resource #: view:resource.calendar.leaves:0 @@ -306,6 +311,10 @@ msgid "" "show a load of 100% for this phase by default, but if we put a efficiency of " "200%, then his load will only be 50%." msgstr "" +"Detta fält visar effektiviteten av resursen för att utföra uppgifter. t.ex. " +"resurs sattes på en etapp i 5 dagar med 5 uppgifter som tilldelats honom, " +"kommer att visa en 100% beläggning för denna etapp som standard, men om vi " +"lägger en verkningsgrad på 200%, då kommer hans beläggning endast vara 50%." #. module: resource #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree @@ -349,7 +358,7 @@ msgstr "Mänsklig" #. module: resource #: view:resource.calendar.leaves:0 msgid "Duration" -msgstr "" +msgstr "Varaktighet" #. module: resource #: field:resource.calendar.leaves,date_from:0 diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po index 2f5d6db4ab8..cb26b4654c0 100644 --- a/addons/sale/i18n/pl.po +++ b/addons/sale/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-22 18:59+0000\n" -"Last-Translator: Dariusz Żbikowski \n" +"PO-Revision-Date: 2014-04-12 15:03+0000\n" +"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-23 07:45+0000\n" -"X-Generator: Launchpad (build 16926)\n" +"X-Launchpad-Export-Date: 2014-04-13 06:20+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: sale #: model:ir.model,name:sale.model_account_config_settings @@ -305,7 +305,7 @@ msgstr "" " To jest lista pozycji do fakturowania. Możesz fakturować\n" " zamówienie sprzedaży częściowo po pozycjach. Nie\n" " potrzebujesz tej listy, jeśli fakturujesz z wydań\n" -" zewnętrznych lub całościowo z amówienia.\n" +" zewnętrznych lub całościowo z zamówienia.\n" "

\n" " " @@ -1758,7 +1758,7 @@ msgstr "Funkcjonalność magazynu" #. module: sale #: view:sale.order.line:0 msgid "Cancel Line" -msgstr "" +msgstr "Anuluj pozycję" #. module: sale #: field:sale.order,message_ids:0 diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po index 5a6e68d9ef3..1848dec5270 100644 --- a/addons/sale/i18n/sv.po +++ b/addons/sale/i18n/sv.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-04-03 10:44+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:33+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-04 07:07+0000\n" +"X-Generator: Launchpad (build 16976)\n" #. module: sale #: model:ir.model,name:sale.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: sale #: view:sale.order:0 @@ -36,7 +36,7 @@ msgstr "Försäljningsenhet" #: view:sale.report:0 #: field:sale.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Salesperson" #. module: sale #: help:sale.order,pricelist_id:0 @@ -59,33 +59,33 @@ msgstr "Avbryt order" #: code:addons/sale/wizard/sale_make_invoice_advance.py:101 #, python-format msgid "Incorrect Data" -msgstr "" +msgstr "Felaktiga data" #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:102 #, python-format msgid "The value of Advance Amount must be positive." -msgstr "" +msgstr "Värdet på förskotterat belopp måste vara positivt." #. module: sale #: help:sale.config.settings,group_discount_per_so_line:0 msgid "Allows you to apply some discount per sales order line." -msgstr "" +msgstr "Tillåter rabatt per orderrad" #. module: sale #: help:sale.order,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet" #. module: sale #: view:res.partner:0 msgid "False" -msgstr "" +msgstr "Falskt" #. module: sale #: report:sale.order:0 msgid "Tax" -msgstr "" +msgstr "Skatt" #. module: sale #: help:sale.order,state:0 @@ -97,13 +97,17 @@ msgid "" "The 'Waiting Schedule' status is set when the invoice is confirmed " " but waiting for the scheduler to run on the order date." msgstr "" +"Ger status för offert eller kundorder. Status Undantag ställs in automatiskt " +"när faktura- (Faktura i undantag) eller plockningsprocessen (Levarans i " +"undantag). Status 'Planerad väntan' \"ställs in när fakturan är bekräftad, " +"men väntar på planeringsscheduleringskörningen på orderdagen." #. module: sale #: view:sale.report:0 #: field:sale.report,analytic_account_id:0 #: field:sale.shop,project_id:0 msgid "Analytic Account" -msgstr "Objekt" +msgstr "Objektkonto" #. module: sale #: help:sale.order,message_summary:0 @@ -111,6 +115,8 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning " +"presenteras i html-format för att kunna sättas in i kanban vyer." #. module: sale #: view:sale.report:0 @@ -129,7 +135,7 @@ msgstr "Kundfakturor" #: view:sale.report:0 #: field:sale.report,partner_id:0 msgid "Partner" -msgstr "Partner" +msgstr "Företag" #. module: sale #: help:sale.config.settings,group_sale_pricelist:0 @@ -137,11 +143,14 @@ msgid "" "Allows to manage different prices based on rules per category of customers.\n" "Example: 10% for retailers, promotion of 5 EUR on this product, etc." msgstr "" +"Gör det möjligt att hantera olika priser som baseras på regler per " +"kundkategori.\n" +"Exempel: 10% för återförsäljare, kampanj på 5 EUR för den här produkten, etc." #. module: sale #: selection:sale.advance.payment.inv,advance_payment_method:0 msgid "Invoice the whole sales order" -msgstr "" +msgstr "Invoice the whole sales order" #. module: sale #: field:sale.shop,payment_default_id:0 @@ -151,12 +160,12 @@ msgstr "Standard betalningsvillkor" #. module: sale #: field:sale.config.settings,group_uom:0 msgid "Allow using different units of measures" -msgstr "" +msgstr "Tillåter användandet av flera mätenheter" #. module: sale #: selection:sale.advance.payment.inv,advance_payment_method:0 msgid "Percentage" -msgstr "" +msgstr "Procentandel" #. module: sale #: report:sale.order:0 @@ -167,7 +176,7 @@ msgstr "Rab.(%)" #: code:addons/sale/sale.py:764 #, python-format msgid "Please define income account for this product: \"%s\" (id:%d)." -msgstr "" +msgstr "Vänligen ange intäktskonto för denna produkt: \"%s\" (id:%d)." #. module: sale #: view:sale.report:0 @@ -178,7 +187,7 @@ msgstr "Totalt belopp" #. module: sale #: field:sale.config.settings,group_invoice_so_lines:0 msgid "Generate invoices based on the sales order lines" -msgstr "" +msgstr "Skapa fakturor baserat på kundorderrader" #. module: sale #: help:sale.make.invoice,grouped:0 @@ -194,6 +203,10 @@ msgid "" "user-wise as well as month wise.\n" " This installs the module account_analytic_analysis." msgstr "" +"Implementerar funktioner (avtal) för tjänsteföretag i objektredovisningen.\n" +" Du kan också se rapporten från objektredovisningen i " +"sammanfattning per användare samt månadsvis.\n" +" Detta installerar modulen account_analytic_analysis." #. module: sale #: selection:sale.order,invoice_quantity:0 @@ -217,17 +230,17 @@ msgstr "Övrig information" #: code:addons/sale/wizard/sale_make_invoice.py:55 #, python-format msgid "Warning!" -msgstr "" +msgstr "Varning!" #. module: sale #: view:sale.config.settings:0 msgid "Invoicing Process" -msgstr "" +msgstr "Faktureringsprocessen" #. module: sale #: view:sale.order:0 msgid "Sales Order done" -msgstr "" +msgstr "Kundorder klar" #. module: sale #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order @@ -239,7 +252,7 @@ msgstr "Offerter och order" #: help:sale.config.settings,group_uom:0 msgid "" "Allows you to select and maintain different units of measure for products." -msgstr "" +msgstr "Tillåter val och underhåll av flera enheter på produkt." #. module: sale #: model:ir.model,name:sale.model_sale_make_invoice @@ -260,7 +273,7 @@ msgstr "Rabatt (%)" #. module: sale #: view:sale.order.line.make.invoice:0 msgid "Create & View Invoice" -msgstr "" +msgstr "Skapa och visa faktura" #. module: sale #: view:board.board:0 @@ -271,18 +284,18 @@ msgstr "Mina offerter" #. module: sale #: field:sale.config.settings,module_warning:0 msgid "Allow configuring alerts by customer or products" -msgstr "" +msgstr "Tillåt automatiska larm knutna till kund och produkt" #. module: sale #: field:sale.shop,name:0 msgid "Shop Name" -msgstr "Butiksnamn" +msgstr "Namn på försäljningsställe" #. module: sale #: code:addons/sale/sale.py:598 #, python-format msgid "You cannot confirm a sales order which has no line." -msgstr "" +msgstr "Du kan inte bekräfta en kundorder som saknar rader." #. module: sale #: model:ir.actions.act_window,help:sale.action_order_line_tree2 @@ -298,27 +311,36 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Här är en lista på varje fakturerbar kundorderrad. Du kan\n" +" göra partiella faktureringar via kundorderrader. Denna " +"listan är onödig \n" +" i de fall du valt att fakturera med leveransorder som " +"underlag eller du alltid\n" +" fakturerar kundordern i sin helhet.\n" +" \n" +" " #. module: sale #: view:sale.order:0 msgid "Quotation " -msgstr "" +msgstr "Offert " #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:106 #, python-format msgid "Advance of %s %%" -msgstr "" +msgstr "Förskott %s %%" #. module: sale #: model:ir.actions.act_window,name:sale.action_orders_exception msgid "Sales in Exception" -msgstr "Kundorder med fel" +msgstr "Kundorder med undantag" #. module: sale #: help:sale.order.line,address_allotment_id:0 msgid "A partner to whom the particular product needs to be allotted." -msgstr "" +msgstr "A partner to whom the particular product needs to be allotted." #. module: sale #: view:sale.order:0 @@ -332,12 +354,12 @@ msgstr "Status" #. module: sale #: selection:sale.report,month:0 msgid "August" -msgstr "Augusti" +msgstr "augusti" #. module: sale #: field:sale.config.settings,module_sale_stock:0 msgid "Trigger delivery orders automatically from sales orders" -msgstr "" +msgstr "Utlös automatiska leveransorder från kundorder" #. module: sale #: model:ir.model,name:sale.model_sale_report @@ -352,7 +374,7 @@ msgstr "Kundorderns objektkonton." #. module: sale #: selection:sale.report,month:0 msgid "October" -msgstr "Oktober" +msgstr "oktober" #. module: sale #: model:ir.actions.act_window,help:sale.action_orders @@ -368,6 +390,16 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att skapa en offert som kan omvandlas till en " +"kundorder.\n" +" \n" +"

\n" +" OpenERP hjälper dig att effektivt hantera hela " +"försäljningsflödet:\n" +" offert, kundorder, leverans, fakturering och betalning.\n" +"

\n" +" " #. module: sale #: view:sale.order.line.make.invoice:0 @@ -381,19 +413,19 @@ msgstr "" #. module: sale #: field:sale.order,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Summering" #. module: sale #: view:sale.order:0 msgid "View Invoice" -msgstr "" +msgstr "Visa faktura" #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:113 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115 #, python-format msgid "Advance of %s %s" -msgstr "" +msgstr "Förskott från %s %s" #. module: sale #: model:ir.actions.act_window,name:sale.action_quotations @@ -413,7 +445,7 @@ msgstr "Antal" #. module: sale #: help:sale.order,partner_shipping_id:0 msgid "Delivery address for current sales order." -msgstr "" +msgstr "Leveransadress för aktuell kundorder." #. module: sale #: report:sale.order:0 @@ -423,17 +455,17 @@ msgstr "Moms :" #. module: sale #: model:res.groups,name:sale.group_invoice_so_lines msgid "Enable Invoicing Sales order lines" -msgstr "" +msgstr "Aktivera fakturering kundorderrader" #. module: sale #: selection:sale.report,month:0 msgid "September" -msgstr "September" +msgstr "september" #. module: sale #: field:sale.order,fiscal_position:0 msgid "Fiscal Position" -msgstr "Momshantering" +msgstr "Skatteområde" #. module: sale #: help:sale.advance.payment.inv,advance_payment_method:0 @@ -462,7 +494,7 @@ msgstr "" #. module: sale #: view:sale.order.line:0 msgid "Sales Order Lines ready to be invoiced" -msgstr "" +msgstr "Kundorderrader klara att fakturera" #. module: sale #: code:addons/sale/sale.py:308 @@ -487,12 +519,12 @@ msgstr "Fakturaadress för kundordern." #. module: sale #: model:ir.model,name:sale.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: sale #: selection:sale.order,order_policy:0 msgid "Before Delivery" -msgstr "" +msgstr "Före leverans" #. module: sale #: code:addons/sale/sale.py:781 @@ -505,7 +537,7 @@ msgstr "" #. module: sale #: field:sale.order,project_id:0 msgid "Contract / Analytic" -msgstr "" +msgstr "Avtal / objektkonto" #. module: sale #: view:sale.report:0 @@ -524,13 +556,13 @@ msgstr "Du kan inte gruppera försäljning med olika valutor på samma företag. #: view:sale.make.invoice:0 #: view:sale.order.line.make.invoice:0 msgid "or" -msgstr "" +msgstr "eller" #. module: sale #: model:mail.message.subtype,description:sale.mt_order_sent #: model:mail.message.subtype,name:sale.mt_order_sent msgid "Quotation sent" -msgstr "" +msgstr "Offert skickad" #. module: sale #: field:sale.order,invoice_exists:0 @@ -557,12 +589,12 @@ msgstr "Andelsföretag" #. module: sale #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv msgid "Invoice Order" -msgstr "" +msgstr "Fakturera order" #. module: sale #: selection:sale.report,month:0 msgid "March" -msgstr "Mars" +msgstr "mars" #. module: sale #: help:sale.order,amount_total:0 @@ -572,7 +604,7 @@ msgstr "Den totala summan." #. module: sale #: field:sale.config.settings,module_sale_journal:0 msgid "Allow batch invoicing of delivery orders through journals" -msgstr "" +msgstr "Tillåt batchfakturering av leveransorder via journal" #. module: sale #: field:sale.order.line,price_subtotal:0 @@ -587,12 +619,12 @@ msgstr "Fakturaadress :" #. module: sale #: field:sale.order.line,product_uom:0 msgid "Unit of Measure " -msgstr "" +msgstr "Enhet " #. module: sale #: field:sale.config.settings,time_unit:0 msgid "The default working time unit for services is" -msgstr "" +msgstr "Standard tidsenhet för tjänster är" #. module: sale #: field:sale.order,partner_invoice_id:0 @@ -607,18 +639,18 @@ msgstr "Orderrader med anknytning till mina kundorder" #. module: sale #: model:ir.actions.report.xml,name:sale.report_sale_order msgid "Quotation / Order" -msgstr "Quotation / Order" +msgstr "Offert / Order" #. module: sale #: view:sale.report:0 #: field:sale.report,nbr:0 msgid "# of Lines" -msgstr "rader" +msgstr "# av rader" #. module: sale #: view:sale.order:0 msgid "(update)" -msgstr "" +msgstr "(update)" #. module: sale #: model:ir.model,name:sale.model_sale_order_line @@ -628,12 +660,12 @@ msgstr "Orderrad" #. module: sale #: field:sale.config.settings,module_analytic_user_function:0 msgid "One employee can have different roles per contract" -msgstr "" +msgstr "En och samma anställd kan ha olika roller per avtal" #. module: sale #: view:sale.order:0 msgid "Print" -msgstr "" +msgstr "Utskrift" #. module: sale #: report:sale.order:0 @@ -649,7 +681,7 @@ msgstr "Kundorderrader" #. module: sale #: field:account.config.settings,module_sale_analytic_plans:0 msgid "Use multiple analytic accounts on sales" -msgstr "" +msgstr "Använd flera objektkonton på kundorder" #. module: sale #: help:sale.config.settings,module_sale_journal:0 @@ -668,7 +700,7 @@ msgstr "Skapad datum" #. module: sale #: model:res.groups,name:sale.group_delivery_invoice_address msgid "Addresses in Sales Orders" -msgstr "" +msgstr "Adresser på kundorder" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_line_tree3 @@ -683,7 +715,7 @@ msgstr "Totalt:" #. module: sale #: view:sale.report:0 msgid "My Sales" -msgstr "Min försäljning" +msgstr "Mina kundordrar" #. module: sale #: field:sale.order,pricelist_id:0 @@ -705,12 +737,20 @@ msgid "" " \n" "* The 'Cancelled' status is set when a user cancel the sales order related." msgstr "" +"* Status \"Utkast\" ställs in när den relaterade kundorder i utkast status.\n" +"* Status \"Bekräftat\" ställs in när den relaterade " +"försäljningsorderläggningen .\n" +"* Status \"Undantag\" ställs in när den relaterade kundorder in som " +"undantag.\n" +"* Status \"Klar\" ställs in när försäljningsorderraden har plockats.\n" +"* Status \"Inställd\" ställs in när en användare avbryter kundorder " +"relaterade." #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:92 #, python-format msgid "There is no income account defined as global property." -msgstr "" +msgstr "Globalt intäktskonto saknas." #. module: sale #: code:addons/sale/sale.py:960 @@ -718,17 +758,17 @@ msgstr "" #: code:addons/sale/wizard/sale_make_invoice_advance.py:95 #, python-format msgid "Configuration Error!" -msgstr "" +msgstr "Konfigurationsfel!" #. module: sale #: help:sale.order,invoice_exists:0 msgid "It indicates that sales order has at least one invoice." -msgstr "" +msgstr "Detta inderar att kundordern har minst en faktura." #. module: sale #: view:sale.order:0 msgid "Send by Email" -msgstr "" +msgstr "Skickat med e-post" #. module: sale #: code:addons/sale/res_config.py:97 @@ -749,17 +789,17 @@ msgstr "Levererad" #. module: sale #: view:sale.advance.payment.inv:0 msgid "Create and View Invoice" -msgstr "" +msgstr "Skapa och visa faktura" #. module: sale #: report:sale.order:0 msgid "Quotation Date" -msgstr "Quotation Date" +msgstr "Offertdatum" #. module: sale #: field:sale.order,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Valuta" #. module: sale #: code:addons/sale/sale.py:942 @@ -781,7 +821,7 @@ msgstr "Produktkategori" #: code:addons/sale/sale.py:564 #, python-format msgid "Cannot cancel this sales order!" -msgstr "" +msgstr "Kan inte avbryta denna kundorder!" #. module: sale #: view:sale.order:0 @@ -813,6 +853,21 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att skapa en offert eller kundorder för denna " +"kund.\n" +"

\n" +" OpenERP hjälper dig att effektivt hantera hela " +"försäljningsflödet:\n" +" offert, kundorder, leverans, fakturering och\n" +" betalning.\n" +"

\n" +" Den sociala funktionen hjälper dig att organisera " +"diskussioner om varje försäljning\n" +" beställa, och låta din kund att hålla reda på utvecklingen\n" +" av kundorder.\n" +" \n" +" " #. module: sale #: model:ir.actions.act_window,name:sale.action_orders @@ -824,7 +879,7 @@ msgstr "Kundorder" #. module: sale #: selection:sale.order,order_policy:0 msgid "On Demand" -msgstr "" +msgstr "På begäran" #. module: sale #: model:ir.actions.act_window,help:sale.action_shop_form @@ -839,11 +894,20 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att definiera ett nytt försäljningsställe.\n" +"

\n" +" Varje offert eller försäljningsorder måste kopplas till ett " +"försäljningsställe. Försäljningsstället\n" +" definierar också lagret som produkterna påverkar vid varje " +"enskild försäljningstransaktion.\n" +"

\n" +" " #. module: sale #: field:sale.order,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Är en följare" #. module: sale #: field:sale.order,date_order:0 @@ -864,7 +928,7 @@ msgstr "Undantag" #: model:ir.model,name:sale.model_sale_shop #: view:sale.shop:0 msgid "Sales Shop" -msgstr "Butik" +msgstr "Försäljningsställe" #. module: sale #: help:sale.advance.payment.inv,product_id:0 @@ -892,7 +956,7 @@ msgstr "Ingen korrekt prislista funnen!:" #. module: sale #: field:sale.config.settings,module_sale_margin:0 msgid "Display margins on sales orders" -msgstr "" +msgstr "Visa marginaler på kundordern" #. module: sale #: help:sale.order,invoice_ids:0 @@ -969,6 +1033,8 @@ msgid "" "${object.company_id.name} ${object.state in ('draft', 'sent') and " "'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" msgstr "" +"${object.company_id.name} ${object.state in ('draft', 'sent') and " +"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" #. module: sale #: report:sale.order:0 @@ -978,7 +1044,7 @@ msgstr "Pris" #. module: sale #: view:sale.order:0 msgid "Quotation Number" -msgstr "" +msgstr "Offertnummer" #. module: sale #: model:ir.actions.act_window,help:sale.action_quotations @@ -999,6 +1065,20 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicka för att skapa en offert, det första steget i en ny " +"kundorder.\n" +"

\n" +" OpenERP hjälper dig att hantera effektivt hela " +"försäljningsflödet:\n" +" från offert till kundordern,\n" +" leveransen, fakturering och betalningsflödet.\n" +"

\n" +" Den sociala funktionen hjälper dig att organisera " +"diskussioner om varje kundorder, och låta dina kunder att övervaka " +"utvecklingen av kundordern.\n" +"

\n" +" " #. module: sale #: selection:sale.order.line,type:0 @@ -1013,33 +1093,33 @@ msgstr "Leveransadress :" #. module: sale #: model:process.node,note:sale.process_node_quotation0 msgid "Draft state of sales order" -msgstr "Utkast status" +msgstr "Kundorder i utkast" #. module: sale #: help:sale.order,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Meddelanden och kommunikationshistorik" #. module: sale #: view:sale.order:0 msgid "New Copy of Quotation" -msgstr "" +msgstr "Ny kopia av offert" #. module: sale #: field:res.partner,sale_order_count:0 msgid "# of Sales Order" -msgstr "" +msgstr "# kundorder" #. module: sale #: code:addons/sale/sale.py:983 #, python-format msgid "Cannot delete a sales order line which is in state '%s'." -msgstr "" +msgstr "Kan inte rader orderrader som är i läget '%s'." #. module: sale #: model:res.groups,name:sale.group_mrp_properties msgid "Properties on lines" -msgstr "" +msgstr "Egenskaper på rader" #. module: sale #: code:addons/sale/sale.py:865 @@ -1048,6 +1128,8 @@ msgid "" "Before choosing a product,\n" " select a customer in the sales form." msgstr "" +"Innan val av produkt\n" +" välj en kund i orderforumläret." #. module: sale #: view:sale.order:0 @@ -1058,7 +1140,7 @@ msgstr "Inklusive moms" #: code:addons/sale/wizard/sale_make_invoice.py:42 #, python-format msgid "You cannot create invoice when sales order is not confirmed." -msgstr "" +msgstr "Du kan inte skapa faktura innan ordern är bekräftad." #. module: sale #: view:sale.report:0 @@ -1074,7 +1156,7 @@ msgstr "Godkänn offert" #: model:ir.actions.act_window,name:sale.action_order_line_tree2 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines msgid "Order Lines to Invoice" -msgstr "" +msgstr "Orderrader att fakturera" #. module: sale #: view:sale.order:0 @@ -1086,7 +1168,7 @@ msgstr "Gruppera på..." #. module: sale #: view:sale.config.settings:0 msgid "Product Features" -msgstr "" +msgstr "Produktfunktioner" #. module: sale #: selection:sale.order,state:0 @@ -1098,7 +1180,7 @@ msgstr "Schemalagd väntan" #: view:sale.order.line:0 #: field:sale.report,product_uom:0 msgid "Unit of Measure" -msgstr "" +msgstr "Enhet" #. module: sale #: field:sale.order.line,type:0 @@ -1109,17 +1191,17 @@ msgstr "Anskaffningsmetod" #: view:sale.order:0 #: field:sale.order,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Olästa meddelanden" #. module: sale #: model:mail.message.subtype,description:sale.mt_order_confirmed msgid "Quotation confirmed" -msgstr "" +msgstr "Bekräftade offerter" #. module: sale #: selection:sale.order,state:0 msgid "Draft Quotation" -msgstr "" +msgstr "Offerter i utkast" #. module: sale #: field:sale.order,amount_tax:0 @@ -1152,7 +1234,7 @@ msgstr "Datum då kundordern skapades." #. module: sale #: view:sale.order:0 msgid "Terms and conditions..." -msgstr "" +msgstr "Villkor..." #. module: sale #: view:sale.make.invoice:0 @@ -1166,7 +1248,7 @@ msgstr "Skapa fakturor" #: code:addons/sale/sale.py:983 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "Felaktig åtgärd!" #. module: sale #: report:sale.order:0 @@ -1176,7 +1258,7 @@ msgstr "Fax :" #. module: sale #: field:sale.advance.payment.inv,amount:0 msgid "Advance Amount" -msgstr "Förskott Belopp" +msgstr "Förskotterat belopp" #. module: sale #: selection:sale.order,invoice_quantity:0 @@ -1195,6 +1277,9 @@ msgid "" "invoice). You have to choose " "if you want your invoice based on ordered " msgstr "" +"The sales order will automatically create the invoice proposition (draft " +"invoice). You have to choose " +"if you want your invoice based on ordered " #. module: sale #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice @@ -1205,7 +1290,7 @@ msgstr "Skapa fakturor" #. module: sale #: help:account.config.settings,group_analytic_account_for_sales:0 msgid "Allows you to specify an analytic account on sales orders." -msgstr "" +msgstr "Tillåter angivande av objektkonto på kundorder" #. module: sale #: view:sale.order:0 @@ -1221,7 +1306,7 @@ msgstr "Kundorder innevarande år" #. module: sale #: selection:sale.report,month:0 msgid "July" -msgstr "Juli" +msgstr "juli" #. module: sale #: view:sale.advance.payment.inv:0 @@ -1233,7 +1318,7 @@ msgstr "" #. module: sale #: view:sale.order:0 msgid "Cancel Quotation" -msgstr "" +msgstr "Avbryt offert" #. module: sale #: selection:sale.order,state:0 @@ -1249,7 +1334,7 @@ msgstr "Gruppera fakturorna" #. module: sale #: view:sale.config.settings:0 msgid "Contracts Management" -msgstr "" +msgstr "Avtalsadministration" #. module: sale #: view:sale.report:0 @@ -1260,12 +1345,12 @@ msgstr "Månad" #. module: sale #: model:process.node,note:sale.process_node_invoice0 msgid "To be reviewed by the accountant." -msgstr "Skall granskas av revisorn." +msgstr "Skall granskas av bokföraren." #. module: sale #: view:sale.order:0 msgid "My Sales Orders" -msgstr "" +msgstr "Mina kundorder" #. module: sale #: view:sale.make.invoice:0 @@ -1316,23 +1401,23 @@ msgstr "" #. module: sale #: field:sale.config.settings,group_discount_per_so_line:0 msgid "Allow setting a discount on the sales order lines" -msgstr "" +msgstr "Tillåter rabatt per orderrad" #. module: sale #: field:sale.order,paypal_url:0 msgid "Paypal Url" -msgstr "" +msgstr "Paypal Url" #. module: sale #: field:sale.config.settings,group_sale_pricelist:0 msgid "Use pricelists to adapt your price per customers" -msgstr "" +msgstr "Använd prislistor för kundanpassade priser" #. module: sale #: code:addons/sale/sale.py:185 #, python-format msgid "There is no default shop for the current user's company!" -msgstr "" +msgstr "Standardförsäljningsställe saknas för användarens bolag!" #. module: sale #: code:addons/sale/sale.py:277 @@ -1359,6 +1444,10 @@ msgid "" "between the Unit Price and Cost Price.\n" " This installs the module sale_margin." msgstr "" +"This adds the 'Margin' on sales order.\n" +" This gives the profitability by calculating the difference " +"between the Unit Price and Cost Price.\n" +" This installs the module sale_margin." #. module: sale #: report:sale.order:0 @@ -1397,7 +1486,7 @@ msgstr "Att göra" #. module: sale #: view:sale.advance.payment.inv:0 msgid "Invoice Sales Order" -msgstr "" +msgstr "Fakturera kundorder" #. module: sale #: help:sale.order,amount_untaxed:0 @@ -1497,6 +1586,91 @@ msgid "" "\n" " " msgstr "" +"\n" +"
\n" +"\n" +"

Hej ${object.partner_id.name},

\n" +" \n" +"

Här kommer din ${object.state in ('draft', 'sent') and 'offert' or " +"'orderbekräftelse'} från ${object.company_id.name}:

\n" +"\n" +"

\n" +"   UPPGIFTER
\n" +"   Ordernummer: ${object.name}
\n" +"   Ordertotal: ${object.amount_total} " +"${object.pricelist_id.currency_id.name}
\n" +"   Orderdatum: ${object.date_order}
\n" +" % if object.origin:\n" +"   Orderreferens: ${object.origin}
\n" +" % endif\n" +" % if object.client_order_ref:\n" +"   Er referens: ${object.client_order_ref}
\n" +" % endif\n" +" % if object.user_id:\n" +"   Din kontaktperson: ${object.user_id.name}\n" +" % endif\n" +"

\n" +"\n" +" % if object.paypal_url:\n" +"
\n" +"

Det är även möjligt att betala direkt via Paypal:

\n" +" \n" +" \n" +" \n" +" % endif\n" +"\n" +"
\n" +"

Vid eventuella frågot, tveka inte att kontakta oss.

\n" +"

Tack för att ni väljer ${object.company_id.name or 'oss'}!

\n" +"
\n" +"
\n" +"
\n" +"

\n" +" ${object.company_id.name}

\n" +"
\n" +"
\n" +" \n" +" % if object.company_id.street:\n" +" ${object.company_id.street}
\n" +" % endif\n" +" % if object.company_id.street2:\n" +" ${object.company_id.street2}
\n" +" % endif\n" +" % if object.company_id.city or object.company_id.zip:\n" +" ${object.company_id.zip} ${object.company_id.city}
\n" +" % endif\n" +" % if object.company_id.country_id:\n" +" ${object.company_id.state_id and ('%s, ' % " +"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name " +"or ''}
\n" +" % endif\n" +" \n" +" % if object.company_id.phone:\n" +"
\n" +" Phone:  ${object.company_id.phone}\n" +"
\n" +" % endif\n" +" % if object.company_id.website:\n" +"
\n" +" Web : ${object.company_id.website}\n" +"
\n" +" %endif\n" +"

\n" +"
\n" +"
\n" +" " #. module: sale #: view:sale.order.line:0 @@ -1516,6 +1690,12 @@ msgid "" "Before delivery: A draft invoice is created from the sales order and must be " "paid before the products can be delivered." msgstr "" +"On demand: A draft invoice can be created from the sales order when needed. " +"\n" +"On delivery order: A draft invoice can be created from the delivery order " +"when the products have been delivered. \n" +"Before delivery: A draft invoice is created from the sales order and must be " +"paid before the products can be delivered." #. module: sale #: view:account.invoice.report:0 @@ -1532,7 +1712,7 @@ msgstr "Fakturera utgående från" #. module: sale #: selection:sale.advance.payment.inv,advance_payment_method:0 msgid "Fixed price (deposit)" -msgstr "" +msgstr "Fast pris (förbetalat)" #. module: sale #: report:sale.order:0 @@ -1542,7 +1722,7 @@ msgstr "Orderdatum" #. module: sale #: field:sale.order.line,product_uos:0 msgid "Product UoS" -msgstr "Produkt" +msgstr "Produkt (försäljningsenhet)" #. module: sale #: selection:sale.report,state:0 @@ -1557,7 +1737,7 @@ msgstr "Order" #. module: sale #: view:sale.order:0 msgid "Confirm Sale" -msgstr "" +msgstr "Bekräfta kundorder" #. module: sale #: model:process.transition,name:sale.process_transition_saleinvoice0 @@ -1584,17 +1764,17 @@ msgstr "" #. module: sale #: selection:sale.advance.payment.inv,advance_payment_method:0 msgid "Some order lines" -msgstr "" +msgstr "Några orderrader" #. module: sale #: view:res.partner:0 msgid "sale.group_delivery_invoice_address" -msgstr "" +msgstr "sale.group_delivery_invoice_address" #. module: sale #: model:res.groups,name:sale.group_discount_per_so_line msgid "Discount on lines" -msgstr "" +msgstr "Rabatt på rader" #. module: sale #: field:sale.order,client_order_ref:0 @@ -1614,16 +1794,19 @@ msgid "" " will create a draft invoice that can be modified\n" " before validation." msgstr "" +"Select how you want to invoice this order. This\n" +" will create a draft invoice that can be modified\n" +" before validation." #. module: sale #: view:board.board:0 msgid "Sales Dashboard" -msgstr "Kundorder infopanel" +msgstr "Anslagstavla för kundorder" #. module: sale #: view:sale.order.line:0 msgid "Sales Order Lines that are in 'done' state" -msgstr "" +msgstr "Kundorderrader som är 'klara'" #. module: sale #: help:sale.config.settings,module_account_analytic_analysis:0 @@ -1637,6 +1820,14 @@ msgid "" "invoice automatically.\n" " It installs the account_analytic_analysis module." msgstr "" +"Allows to define your customer contracts conditions: invoicing\n" +" method (fixed price, on timesheet, advance invoice), the exact " +"pricing\n" +" (650€/day for a developer), the duration (one year support " +"contract).\n" +" You will be able to follow the progress of the contract and " +"invoice automatically.\n" +" It installs the account_analytic_analysis module." #. module: sale #: model:email.template,report_name:sale.email_template_edi_sale @@ -1644,6 +1835,8 @@ msgid "" "${(object.name or '').replace('/','_')}_${object.state == 'draft' and " "'draft' or ''}" msgstr "" +"${(object.name or '').replace('/','_')}_${object.state == 'draft' and " +"'draft' or ''}" #. module: sale #: help:sale.order,date_confirm:0 @@ -1654,7 +1847,7 @@ msgstr "Datum när kundordern är bekräftad." #: code:addons/sale/sale.py:565 #, python-format msgid "First cancel all invoices attached to this sales order." -msgstr "" +msgstr "Börja med att avbryta alla fakturor knutna till denna kundorder." #. module: sale #: field:sale.order,company_id:0 @@ -1663,7 +1856,7 @@ msgstr "" #: field:sale.report,company_id:0 #: field:sale.shop,company_id:0 msgid "Company" -msgstr "Företag" +msgstr "Bolag" #. module: sale #: field:sale.make.invoice,invoice_date:0 @@ -1690,32 +1883,32 @@ msgstr "No Customer Defined !" #. module: sale #: field:sale.order,partner_shipping_id:0 msgid "Delivery Address" -msgstr "" +msgstr "Leveransadress" #. module: sale #: selection:sale.order,state:0 msgid "Sale to Invoice" -msgstr "" +msgstr "Kundorder att fakturera" #. module: sale #: view:sale.config.settings:0 msgid "Warehouse Features" -msgstr "" +msgstr "Lagerstyrningsfunktioner" #. module: sale #: view:sale.order.line:0 msgid "Cancel Line" -msgstr "" +msgstr "Avbryt rad" #. module: sale #: field:sale.order,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Meddelanden" #. module: sale #: field:sale.config.settings,module_project:0 msgid "Project" -msgstr "" +msgstr "Projekt" #. module: sale #: code:addons/sale/sale.py:185 @@ -1726,12 +1919,12 @@ msgstr "" #: code:addons/sale/sale.py:780 #, python-format msgid "Error!" -msgstr "" +msgstr "Fel!" #. module: sale #: report:sale.order:0 msgid "Net Total :" -msgstr "Netto total:" +msgstr "Nettototal:" #. module: sale #: help:sale.order.line,type:0 @@ -1740,28 +1933,31 @@ msgid "" "replenishment.\n" "On order: When needed, the product is purchased or produced." msgstr "" +"From stock: When needed, the product is taken from the stock or we wait for " +"replenishment.\n" +"On order: When needed, the product is purchased or produced." #. module: sale #: selection:sale.order,state:0 #: selection:sale.order.line,state:0 #: selection:sale.report,state:0 msgid "Cancelled" -msgstr "Cancelled" +msgstr "Avbruten" #. module: sale #: view:sale.order.line:0 msgid "Search Uninvoiced Lines" -msgstr "Sök ej fakturerade rader" +msgstr "Sök icke fakturerade rader" #. module: sale #: selection:sale.order,state:0 msgid "Quotation Sent" -msgstr "" +msgstr "Offert skickad" #. module: sale #: model:ir.model,name:sale.model_mail_compose_message msgid "Email composition wizard" -msgstr "" +msgstr "E-postredigeringsguide" #. module: sale #: model:ir.actions.act_window,name:sale.action_shop_form @@ -1769,23 +1965,23 @@ msgstr "" #: view:sale.report:0 #: field:sale.report,shop_id:0 msgid "Shop" -msgstr "Butik" +msgstr "Försäljningsställe" #. module: sale #: field:sale.report,date_confirm:0 msgid "Date Confirm" -msgstr "Bekräfta Datum" +msgstr "Bekräfta datum" #. module: sale #: code:addons/sale/sale.py:364 #, python-format msgid "Please define sales journal for this company: \"%s\" (id:%d)." -msgstr "" +msgstr "Vänligen ange försäljningsjournal för detta bolag: \"%s\" (id:%d)." #. module: sale #: view:sale.config.settings:0 msgid "Contract Features" -msgstr "" +msgstr "Avtalsfunktioner" #. module: sale #: code:addons/sale/sale.py:287 @@ -1804,7 +2000,7 @@ msgstr "Kundorder" #. module: sale #: field:sale.order.line,product_uos_qty:0 msgid "Quantity (UoS)" -msgstr "Antal" +msgstr "Antal (försäljningeenhet)" #. module: sale #: selection:sale.order.line,state:0 @@ -1814,7 +2010,7 @@ msgstr "Bekräftad" #. module: sale #: field:sale.order,note:0 msgid "Terms and conditions" -msgstr "" +msgstr "Villkor" #. module: sale #: model:process.transition.action,name:sale.process_transition_action_confirm0 @@ -1825,12 +2021,12 @@ msgstr "Bekräfta" #: code:addons/sale/sale.py:820 #, python-format msgid "You cannot cancel a sales order line that has already been invoiced." -msgstr "" +msgstr "Du kan inte avbryta en kundorderrad som redan är fakturerad." #. module: sale #: field:sale.order,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Följare" #. module: sale #: field:sale.order.line,invoice_lines:0 @@ -1847,17 +2043,17 @@ msgstr "Kundorderrader" #. module: sale #: view:sale.config.settings:0 msgid "Default Options" -msgstr "" +msgstr "Standardalternativ" #. module: sale #: field:account.config.settings,group_analytic_account_for_sales:0 msgid "Analytic accounting for sales" -msgstr "" +msgstr "Objektredovisning för kundorder" #. module: sale #: field:sale.order,invoiced_rate:0 msgid "Invoiced Ratio" -msgstr "" +msgstr "Faktureringsratio" #. module: sale #: code:addons/sale/edi/sale_order.py:140 @@ -1868,17 +2064,17 @@ msgstr "EDI-prislista (%s)" #. module: sale #: selection:sale.order,order_policy:0 msgid "On Delivery Order" -msgstr "" +msgstr "På leveransorder" #. module: sale #: view:sale.report:0 msgid "Reference Unit of Measure" -msgstr "" +msgstr "Referensenhet" #. module: sale #: view:sale.order.line:0 msgid "Sales order lines done" -msgstr "" +msgstr "Klara kundorderrader" #. module: sale #: code:addons/sale/wizard/sale_line_invoice.py:107 @@ -1906,13 +2102,13 @@ msgstr "Fakturor" #. module: sale #: selection:sale.report,month:0 msgid "December" -msgstr "December" +msgstr "december" #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:96 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)." -msgstr "" +msgstr "Intäktskonto saknas för denna produkt: \"%s\" (id:%d)." #. module: sale #: view:sale.order.line:0 @@ -1922,7 +2118,7 @@ msgstr "Ofakturerad" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_tree msgid "Old Quotations" -msgstr "Gamla offerters" +msgstr "Gamla offerter" #. module: sale #: field:sale.order,amount_untaxed:0 @@ -1932,33 +2128,33 @@ msgstr "Belopp ex. moms" #. module: sale #: model:res.groups,name:sale.group_analytic_accounting msgid "Analytic Accounting for Sales" -msgstr "" +msgstr "Objektredovisning för kundorder" #. module: sale #: model:ir.actions.client,name:sale.action_client_sale_menu msgid "Open Sale Menu" -msgstr "" +msgstr "Öppna kundordermenyn" #. module: sale #: selection:sale.report,month:0 msgid "June" -msgstr "Juni" +msgstr "juni" #. module: sale #: code:addons/sale/wizard/sale_make_invoice.py:55 #, python-format msgid "You shouldn't manually invoice the following sale order %s" -msgstr "" +msgstr "Du bör ej fakturerar följande kundorder %s manuellt" #. module: sale #: selection:sale.order.line,state:0 msgid "Draft" -msgstr "Utdrag" +msgstr "Utkast" #. module: sale #: help:sale.order,amount_tax:0 msgid "The tax amount." -msgstr "Momsen." +msgstr "Andelen moms." #. module: sale #: model:ir.actions.act_window,name:sale.action_email_templates @@ -1971,6 +2167,8 @@ msgid "" "To allow your salesman to make invoices for sales order lines using the menu " "'Lines to Invoice'." msgstr "" +"Om du vill att dina säljare att göra fakturor från kundorderrader med hjälp " +"av menyn 'Rader att fakturera'." #. module: sale #: view:sale.order.line:0 @@ -1978,11 +2176,13 @@ msgid "" "Sales Order Lines that are confirmed, done or in exception state and haven't " "yet been invoiced" msgstr "" +"Bekräftade kundorderrader, klara eller i undantagstillstånd och ännu ej " +"fakturerade" #. module: sale #: selection:sale.report,month:0 msgid "November" -msgstr "November" +msgstr "november" #. module: sale #: field:sale.advance.payment.inv,product_id:0 @@ -1992,12 +2192,12 @@ msgstr "Avancerad produkt" #. module: sale #: help:sale.order.line,sequence:0 msgid "Gives the sequence order when displaying a list of sales order lines." -msgstr "" +msgstr "Ger ordningsföljden när raderna på en order visas." #. module: sale #: selection:sale.report,month:0 msgid "January" -msgstr "Januari" +msgstr "januari" #. module: sale #: model:ir.actions.act_window,name:sale.action_orders_in_progress @@ -2007,7 +2207,7 @@ msgstr "Pågående kundorder" #. module: sale #: field:sale.config.settings,timesheet:0 msgid "Prepare invoices based on timesheets" -msgstr "" +msgstr "Lägg till rapporterad tid på fakturan" #. module: sale #: help:sale.order,origin:0 @@ -2024,12 +2224,12 @@ msgstr "Engagemangsfördröjning" #. module: sale #: field:sale.report,state:0 msgid "Order Status" -msgstr "" +msgstr "Orderstatus" #. module: sale #: view:sale.advance.payment.inv:0 msgid "Show Lines to Invoice" -msgstr "" +msgstr "Visa rader att fakturera" #. module: sale #: field:sale.report,date:0 @@ -2044,7 +2244,7 @@ msgstr "Bekräftade kundorder att fakturera" #. module: sale #: model:mail.message.subtype,name:sale.mt_order_confirmed msgid "Sales Order Confirmed" -msgstr "" +msgstr "Sales Order Confirmed" #. module: sale #: selection:sale.order.line,type:0 @@ -2060,12 +2260,12 @@ msgstr "Ingen prislista !: " #. module: sale #: view:sale.order:0 msgid "Sales Order " -msgstr "" +msgstr "Kundorder " #. module: sale #: field:sale.config.settings,module_account_analytic_analysis:0 msgid "Use contracts management" -msgstr "" +msgstr "Använd avtalshantering" #. module: sale #: help:sale.order,invoiced:0 @@ -2081,7 +2281,7 @@ msgstr "Beskrivning" #. module: sale #: selection:sale.report,month:0 msgid "May" -msgstr "Maj" +msgstr "maj" #. module: sale #: view:sale.make.invoice:0 @@ -2091,7 +2291,7 @@ msgstr "Vill du verkligen skapa fakturan/fakturorna ?" #. module: sale #: view:sale.order:0 msgid "Order Number" -msgstr "" +msgstr "Ordernummer" #. module: sale #: view:sale.order:0 @@ -2108,12 +2308,12 @@ msgstr "Förskott" #. module: sale #: selection:sale.report,month:0 msgid "February" -msgstr "Februari" +msgstr "februari" #. module: sale #: selection:sale.report,month:0 msgid "April" -msgstr "April" +msgstr "april" #. module: sale #: view:sale.config.settings:0 @@ -2123,6 +2323,8 @@ msgid "" "with\n" " your customer." msgstr "" +"Använd avtal för att kunna hantera dina tjänster med " +"löpande fakturering som en del av samma avtal med din kund." #. module: sale #: view:sale.order:0 @@ -2133,17 +2335,17 @@ msgstr "Sök kundorder" #. module: sale #: field:sale.advance.payment.inv,advance_payment_method:0 msgid "What do you want to invoice?" -msgstr "" +msgstr "Vad önskar du fakturera?" #. module: sale #: view:sale.order.line:0 msgid "Confirmed sales order lines, not yet delivered" -msgstr "" +msgstr "Bekräftar kundorderrader. ej ännu levererade" #. module: sale #: field:sale.order.line,sequence:0 msgid "Sequence" -msgstr "Sekvens" +msgstr "Nummerserie" #. module: sale #: report:sale.order:0 @@ -2154,7 +2356,7 @@ msgstr "Betalningsvillkor" #. module: sale #: help:account.config.settings,module_sale_analytic_plans:0 msgid "This allows install module sale_analytic_plans." -msgstr "" +msgstr "Detta tillåter installation av modulen sale_analytic_plans." #. module: sale #: model:ir.actions.act_window,help:sale.action_order_report_all @@ -2169,7 +2371,7 @@ msgstr "" "belyser dina försäljningsintäkter inom olika kriterier (säljare, partner, " "produkt, etc.) Använd den här rapporten för att utföra analyser på " "försäljningen som ännu inte har fakturerats. Om du vill analysera din " -"omsättning, bör du använda Fakturaanalysrapporten i Bokföringen." +"omsättning, bör du använda fakturaanalysrapporten i bokföringen." #. module: sale #: report:sale.order:0 diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 3bddf81ade8..4c229a00fcb 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -105,33 +105,8 @@ - [[repeatIn(objects,'o')]] [[ setLang(o.partner_id.lang) ]] - - -
- Description - - Tax - - Quantity - - Unit Price - - Disc.(%) - - Price -
+ Description + + VAT + + Quantity + + Unit Price + + Disc.(%) + + Price +
@@ -262,6 +262,7 @@
@@ -317,6 +318,5 @@ - diff --git a/addons/sale/sale.py b/addons/sale/sale.py index bdadc4489da..364ca36b1c2 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -515,7 +515,7 @@ class sale_order(osv.osv): lines.append(line.id) created_lines = obj_sale_order_line.invoice_line_create(cr, uid, lines) if created_lines: - invoices.setdefault(o.partner_id.id, []).append((o, created_lines)) + invoices.setdefault(o.partner_invoice_id.id or o.partner_id.id, []).append((o, created_lines)) if not invoices: for o in self.browse(cr, uid, ids, context=context): for i in o.invoice_ids: diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml index 428b586ffa8..f5566e68365 100644 --- a/addons/sale/sale_demo.xml +++ b/addons/sale/sale_demo.xml @@ -329,7 +329,6 @@ Thanks! service 150.0 100.0 - produce diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index f12cba6ac9f..16e9e2a6305 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -307,7 +307,7 @@ - + @@ -471,7 +471,7 @@ - + @@ -497,7 +497,7 @@ - + diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index d8a7d05a10e..5f979ead31e 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -101,7 +101,6 @@ class sale_order_line_make_invoice(osv.osv_memory): break if flag: wf_service.trg_validate(uid, 'sale.order', order.id, 'manual_invoice', cr) - sales_order_obj.write(cr, uid, [order.id], {'state': 'progress'}) if not invoices: raise osv.except_osv(_('Warning!'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!')) diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py index 47716018caa..4405349b064 100644 --- a/addons/sale/wizard/sale_make_invoice.py +++ b/addons/sale/wizard/sale_make_invoice.py @@ -20,6 +20,7 @@ from openerp.osv import fields, osv from openerp.tools.translate import _ +from openerp import netsvc class sale_make_invoice(osv.osv_memory): _name = "sale.make.invoice" @@ -46,6 +47,7 @@ class sale_make_invoice(osv.osv_memory): order_obj = self.pool.get('sale.order') mod_obj = self.pool.get('ir.model.data') act_obj = self.pool.get('ir.actions.act_window') + wf_service = netsvc.LocalService("workflow") newinv = [] if context is None: context = {} @@ -55,11 +57,13 @@ class sale_make_invoice(osv.osv_memory): raise osv.except_osv(_('Warning!'), _("You shouldn't manually invoice the following sale order %s") % (sale_order.name)) order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_invoice=data['invoice_date']) - - for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context): + orders = order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context) + for o in orders: for i in o.invoice_ids: newinv.append(i.id) - + # Dummy call to workflow, will not create another invoice but bind the new invoice to the subflow + for id in [o.id for o in orders if o.order_policy == 'manual']: + wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr) result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1') id = result and result[1] or False result = act_obj.read(cr, uid, [id], context=context)[0] diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po index 62aedeae231..6b616132401 100644 --- a/addons/sale_analytic_plans/i18n/sv.po +++ b/addons/sale_analytic_plans/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 20:31+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:33+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: sale_analytic_plans #: field:sale.order.line,analytics_id:0 @@ -25,7 +25,7 @@ msgstr "Objektfördelning" #. module: sale_analytic_plans #: model:ir.model,name:sale_analytic_plans.model_sale_order msgid "Sales Order" -msgstr "" +msgstr "Kundorder" #. module: sale_analytic_plans #: model:ir.model,name:sale_analytic_plans.model_sale_order_line diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po index 3e082219548..bdb334a7f34 100644 --- a/addons/sale_crm/i18n/sv.po +++ b/addons/sale_crm/i18n/sv.po @@ -8,46 +8,46 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 20:39+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:92 #, python-format msgid "Insufficient Data!" -msgstr "" +msgstr "Otillräcklig data!" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:113 #, python-format msgid "Opportunity has been converted to the quotation %s." -msgstr "" +msgstr "Affärsmöjlighet har omvandlats till offerten %s." #. module: sale_crm #: model:ir.model,name:sale_crm.model_crm_lead msgid "Lead/Opportunity" -msgstr "" +msgstr "Kundämnen/affärsmöjligheter" #. module: sale_crm #: model:ir.model,name:sale_crm.model_account_invoice_report msgid "Invoices Statistics" -msgstr "" +msgstr "Fakturastatistik" #. module: sale_crm #: field:crm.make.sale,close:0 msgid "Mark Won" -msgstr "" +msgstr "Märk vinst" #. module: sale_crm #: field:res.users,default_section_id:0 msgid "Default Sales Team" -msgstr "" +msgstr "Standardsäljlaget" #. module: sale_crm #: view:sale.order:0 @@ -57,23 +57,24 @@ msgstr "Mina säljteam" #. module: sale_crm #: model:ir.model,name:sale_crm.model_res_users msgid "Users" -msgstr "" +msgstr "Användare" #. module: sale_crm #: help:crm.make.sale,close:0 msgid "" "Check this to close the opportunity after having created the sales order." msgstr "" +"Kryssa här för att stänga affärsmöjligheten efter att ha skapat kundordern." #. module: sale_crm #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent msgid "Quotation Send" -msgstr "" +msgstr "Offert skickad" #. module: sale_crm #: field:sale.order,categ_ids:0 msgid "Categories" -msgstr "" +msgstr "Kategorier" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:127 @@ -100,7 +101,7 @@ msgstr "Skapa försäljning" #. module: sale_crm #: model:ir.model,name:sale_crm.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Faktura" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:95 @@ -123,12 +124,12 @@ msgstr "Butik" #: code:addons/sale_crm/wizard/crm_make_sale.py:92 #, python-format msgid "No addresse(s) defined for this customer." -msgstr "" +msgstr "Adressuppgifter saknas för denna kund." #. module: sale_crm #: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed msgid "Sales Order Confirmed" -msgstr "" +msgstr "Kundorder bekräftad" #. module: sale_crm #: view:account.invoice:0 @@ -142,7 +143,7 @@ msgstr "Säljteam" #. module: sale_crm #: view:crm.lead:0 msgid "Create Quotation" -msgstr "" +msgstr "Skapa offert" #. module: sale_crm #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale @@ -162,4 +163,4 @@ msgstr "Kundorder" #. module: sale_crm #: view:crm.make.sale:0 msgid "or" -msgstr "" +msgstr "eller" diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po index eacbe890a18..5368fa81e4e 100644 --- a/addons/sale_journal/i18n/sv.po +++ b/addons/sale_journal/i18n/sv.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.14\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2014-03-31 20:36+0000\n" +"Last-Translator: Anders Wallenquist \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: 2013-11-21 06:34+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: sale_journal #: field:sale_journal.invoice.type,note:0 @@ -31,6 +31,8 @@ msgstr "Faktureringstyp" msgid "" "This invoicing type will be used, by default, to invoice the current partner." msgstr "" +"Denna faktureringstyp kommer att användas som standard för att fakturera det " +"aktuella företaget." #. module: sale_journal #: view:res.partner:0 @@ -45,7 +47,7 @@ msgstr "Fakturering" #. module: sale_journal #: model:ir.model,name:sale_journal.model_stock_picking_in msgid "Incoming Shipments" -msgstr "" +msgstr "Inkommande leveranser" #. module: sale_journal #: help:sale_journal.invoice.type,active:0 @@ -101,7 +103,7 @@ msgstr "" #. module: sale_journal #: help:sale.order,invoice_type_id:0 msgid "Generate invoice based on the selected option." -msgstr "" +msgstr "Skapa fakturor baserat på valda alternativ." #. module: sale_journal #: view:sale.order:0 @@ -135,4 +137,4 @@ msgstr "Kundorder" #. module: sale_journal #: model:ir.model,name:sale_journal.model_stock_picking_out msgid "Delivery Orders" -msgstr "" +msgstr "Leveransorder" diff --git a/addons/sale_margin/i18n/sv.po b/addons/sale_margin/i18n/sv.po index c1e10227fb6..1f51b3defff 100644 --- a/addons/sale_margin/i18n/sv.po +++ b/addons/sale_margin/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 20:30+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: sale_margin #: field:sale.order.line,purchase_price:0 @@ -44,3 +44,5 @@ msgid "" "It gives profitability by calculating the difference between the Unit Price " "and the cost price." msgstr "" +"Beräknar lönsamhet genom skillnaden mellan enhetspris och " +"självkostnadspriset." diff --git a/addons/sale_mrp/i18n/sv.po b/addons/sale_mrp/i18n/sv.po index 1ccffd62157..63749485b1f 100644 --- a/addons/sale_mrp/i18n/sv.po +++ b/addons/sale_mrp/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-27 13:31+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: sale_mrp #: model:ir.model,name:sale_mrp.model_mrp_production @@ -35,9 +35,9 @@ msgstr "Indikerar kundreferense från kundorder" #. module: sale_mrp #: field:mrp.production,sale_ref:0 msgid "Sale Reference" -msgstr "" +msgstr "Försäljningsreferens" #. module: sale_mrp #: field:mrp.production,sale_name:0 msgid "Sale Name" -msgstr "" +msgstr "Säljare" diff --git a/addons/sale_order_dates/i18n/sv.po b/addons/sale_order_dates/i18n/sv.po index 1ca937885a5..001dc4e68d7 100644 --- a/addons/sale_order_dates/i18n/sv.po +++ b/addons/sale_order_dates/i18n/sv.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-27 13:34+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-03-28 06:44+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: sale_order_dates #: view:sale.order:0 msgid "Dates" -msgstr "" +msgstr "Datum" #. module: sale_order_dates #: field:sale.order,commitment_date:0 @@ -40,7 +40,7 @@ msgstr "Plockningsdatum" #. module: sale_order_dates #: help:sale.order,requested_date:0 msgid "Date requested by the customer for the sale." -msgstr "" +msgstr "Kundens önskade leveransdatum" #. module: sale_order_dates #: field:sale.order,requested_date:0 @@ -55,4 +55,4 @@ msgstr "Kundorder" #. module: sale_order_dates #: help:sale.order,commitment_date:0 msgid "Committed date for delivery." -msgstr "" +msgstr "Bekräftat leveransdatum" diff --git a/addons/sale_stock/i18n/sv.po b/addons/sale_stock/i18n/sv.po index ffb05e1e6df..036a3e90704 100644 --- a/addons/sale_stock/i18n/sv.po +++ b/addons/sale_stock/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 20:29+0000\n" +"Last-Translator: Anders Wallenquist \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:34+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: sale_stock #: help:sale.config.settings,group_invoice_deli_orders:0 @@ -33,7 +33,7 @@ msgstr "Leveransorder" #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice msgid "Deliveries to Invoice" -msgstr "" +msgstr "Leveranser att fakturera" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:570 @@ -79,7 +79,7 @@ msgstr "Validera" #. module: sale_stock #: view:sale.order:0 msgid "Cancel Order" -msgstr "" +msgstr "Avbryt order" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:209 @@ -131,12 +131,12 @@ msgstr "Lagertransaktion" #: code:addons/sale_stock/sale_stock.py:163 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "Ogiltig åtgärd!" #. module: sale_stock #: field:sale.config.settings,module_project_timesheet:0 msgid "Project Timesheet" -msgstr "" +msgstr "Projekt tidrapport" #. module: sale_stock #: field:sale.config.settings,group_sale_delivery_address:0 @@ -148,7 +148,7 @@ msgstr "" #: code:addons/sale_stock/sale_stock.py:623 #, python-format msgid "Configuration Error!" -msgstr "" +msgstr "Konfigurationsfel!" #. module: sale_stock #: model:process.node,name:sale_stock.process_node_saleprocurement0 @@ -158,7 +158,7 @@ msgstr "Inköpsorder" #. module: sale_stock #: model:ir.actions.act_window,name:sale_stock.res_partner_rule_children msgid "Contact Details" -msgstr "" +msgstr "Kontaktuppgifter" #. module: sale_stock #: selection:sale.config.settings,default_order_policy:0 @@ -174,7 +174,7 @@ msgstr "Kundorder" #. module: sale_stock #: model:ir.model,name:sale_stock.model_stock_picking_out msgid "Delivery Orders" -msgstr "" +msgstr "Leveransorder" #. module: sale_stock #: model:ir.model,name:sale_stock.model_sale_order_line @@ -288,22 +288,22 @@ msgstr "" #. module: sale_stock #: help:sale.config.settings,group_mrp_properties:0 msgid "Allows you to tag sales order lines with properties." -msgstr "" +msgstr "Tillåter märkning av kundorderrader med egenskaper" #. module: sale_stock #: field:sale.config.settings,group_invoice_deli_orders:0 msgid "Generate invoices after and based on delivery orders" -msgstr "" +msgstr "Skapa fakturor ned leveransorder som underlag" #. module: sale_stock #: field:sale.config.settings,module_delivery:0 msgid "Allow adding shipping costs" -msgstr "" +msgstr "Tillåter att lägga till transportkostnader" #. module: sale_stock #: view:sale.order:0 msgid "days" -msgstr "" +msgstr "dagar" #. module: sale_stock #: field:sale.order.line,product_packaging:0 diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py index 50e0112fec2..11f3e0225fe 100644 --- a/addons/sale_stock/sale_stock.py +++ b/addons/sale_stock/sale_stock.py @@ -351,7 +351,6 @@ class sale_order(osv.osv): } def ship_recreate(self, cr, uid, order, line, move_id, proc_id): - # FIXME: deals with potentially cancelled shipments, seems broken (specially if shipment has production lot) """ Define ship_recreate for process after shipping exception param order: sales order to which the order lines belong @@ -360,16 +359,25 @@ class sale_order(osv.osv): param proc_id: the ID of procurement """ move_obj = self.pool.get('stock.move') - if order.state == 'shipping_except': - for pick in order.picking_ids: - for move in pick.move_lines: - if move.state == 'cancel': - mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)]) - if mov_ids: - for mov in move_obj.browse(cr, uid, mov_ids): - # FIXME: the following seems broken: what if move_id doesn't exist? What if there are several mov_ids? Shouldn't that be a sum? - move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty}) - self.pool.get('procurement.order').write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty}) + proc_obj = self.pool.get('procurement.order') + if move_id and order.state == 'shipping_except': + current_move = move_obj.browse(cr, uid, move_id) + moves = [] + for picking in order.picking_ids: + if picking.id != current_move.picking_id.id and picking.state != 'cancel': + moves.extend(move for move in picking.move_lines if move.state != 'cancel' and move.sale_line_id.id == line.id) + if moves: + product_qty = current_move.product_qty + product_uos_qty = current_move.product_uos_qty + for move in moves: + product_qty -= move.product_qty + product_uos_qty -= move.product_uos_qty + if product_qty > 0 or product_uos_qty > 0: + move_obj.write(cr, uid, [move_id], {'product_qty': product_qty, 'product_uos_qty': product_uos_qty}) + proc_obj.write(cr, uid, [proc_id], {'product_qty': product_qty, 'product_uos_qty': product_uos_qty}) + else: + current_move.unlink() + proc_obj.unlink(cr, uid, [proc_id]) return True def _get_date_planned(self, cr, uid, order, line, start_date, context=None): diff --git a/addons/sale_stock/sale_stock_demo.xml b/addons/sale_stock/sale_stock_demo.xml index 15b1e60b829..356f6a8fa38 100644 --- a/addons/sale_stock/sale_stock_demo.xml +++ b/addons/sale_stock/sale_stock_demo.xml @@ -38,6 +38,10 @@ make_to_order + + produce + + diff --git a/addons/share/res_users.py b/addons/share/res_users.py index 25fd25c234f..fb0dd163b6e 100644 --- a/addons/share/res_users.py +++ b/addons/share/res_users.py @@ -19,6 +19,15 @@ # ############################################################################## from openerp.osv import fields, osv +from openerp import SUPERUSER_ID + +class res_users(osv.osv): + _name = 'res.users' + _inherit = 'res.users' + _columns = { + 'share': fields.boolean('Share User', readonly=True, + help="External user with limited access, created only for the purpose of sharing data.") + } class res_groups(osv.osv): _name = "res.groups" @@ -28,21 +37,18 @@ class res_groups(osv.osv): help="Group created to set access rights for sharing data with some users.") } + def init(self, cr): + # force re-generation of the user groups view without the shared groups + self.update_user_groups_view(cr, SUPERUSER_ID) + parent_class = super(res_groups, self) + if hasattr(parent_class, 'init'): + parent_class.init(cr) + def get_application_groups(self, cr, uid, domain=None, context=None): if domain is None: domain = [] domain.append(('share', '=', False)) return super(res_groups, self).get_application_groups(cr, uid, domain=domain, context=context) -res_groups() - -class res_users(osv.osv): - _name = 'res.users' - _inherit = 'res.users' - _columns = { - 'share': fields.boolean('Share User', readonly=True, - help="External user with limited access, created only for the purpose of sharing data.") - } -res_users() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index b5072f243f6..e9d83be85cb 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -925,7 +925,7 @@ class share_result_line(osv.osv_memory): 'login': fields.related('user_id', 'login', string='Login', type='char', size=64, required=True, readonly=True), 'password': fields.char('Password', size=64, readonly=True), 'share_url': fields.function(_share_url, string='Share URL', type='char', size=512), - 'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True), + 'share_wizard_id': fields.many2one('share.wizard', 'Share Wizard', required=True, ondelete='cascade'), 'newly_created': fields.boolean('Newly created', readonly=True), } _defaults = { diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index b3d7e30f1ce..dd2a996f6dd 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -59,7 +59,6 @@ Dashboard / Reports for Warehouse Management will include: 'sequence': 16, 'demo': [ 'stock_demo.xml', -# 'stock_demo.yml', ], 'data': [ 'security/stock_security.xml', @@ -91,9 +90,11 @@ Dashboard / Reports for Warehouse Management will include: 'res_config_view.xml', ], 'test': [ -# 'test/opening_stock.yml', -# 'test/shipment.yml', -# 'test/stock_report.yml', + 'test/stock_users.yml', + 'stock_demo.yml', + 'test/opening_stock.yml', + 'test/shipment.yml', + 'test/stock_report.yml', ], 'installable': True, 'application': True, diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po index 44b5bf2fb06..5cbaf07a8aa 100644 --- a/addons/stock/i18n/de.po +++ b/addons/stock/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-01-19 19:19+0000\n" -"Last-Translator: Ralf Hilgenstock \n" +"PO-Revision-Date: 2014-04-22 17:33+0000\n" +"Last-Translator: Rudolf Schnapka \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-07 07:11+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-23 06:58+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -3589,7 +3589,7 @@ msgstr "" #. module: stock #: view:stock.picking.in:0 msgid "Confirm & Receive" -msgstr "Bestätigen & Empfangen" +msgstr "Bestätigen & Vereinnahmen" #. module: stock #: field:stock.picking,origin:0 diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po index d6848dc6210..df2f8c94110 100644 --- a/addons/stock/i18n/es.po +++ b/addons/stock/i18n/es.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-02-07 10:10+0000\n" +"PO-Revision-Date: 2014-04-23 06:39+0000\n" "Last-Translator: Pedro Manuel Baeza \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-08 07:16+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-24 06:32+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -259,12 +259,12 @@ msgstr "¡No puede eliminar ningún registro!" #. module: stock #: view:stock.picking:0 msgid "Delivery orders to invoice" -msgstr "Ordenes de envío a facturar" +msgstr "Albaranes de salida a facturar" #. module: stock #: view:stock.picking:0 msgid "Assigned Delivery Orders" -msgstr "Ordenes de envío asignadas" +msgstr "Albaranes de salida asignados" #. module: stock #: code:addons/stock/wizard/stock_change_standard_price.py:107 @@ -1527,7 +1527,7 @@ msgstr "Movimiento consumo" #: report:stock.picking.list.in:0 #: report:stock.picking.list.out:0 msgid "Delivery Order :" -msgstr "Orden de entrega :" +msgstr "Albarán de salida :" #. module: stock #: help:stock.location,chained_delay:0 @@ -2407,7 +2407,7 @@ msgstr "Precio" #: field:stock.config.settings,module_stock_invoice_directly:0 msgid "Create and open the invoice when the user finish a delivery order" msgstr "" -"Crear y abrir la factura cuando el usuario finalice la orden de entrega" +"Crear y abrir la factura cuando el usuario finalice el albarán de salida" #. module: stock #: model:ir.model,name:stock.model_stock_return_picking_memory @@ -4215,7 +4215,7 @@ msgstr "Cancelado" #. module: stock #: view:stock.picking:0 msgid "Confirmed Delivery Orders" -msgstr "Órdenes de entrega confirmadas" +msgstr "Albaranes de salida confirmados" #. module: stock #: view:stock.move:0 @@ -4302,7 +4302,7 @@ msgstr "¡Error, no hay empresa!" #. module: stock #: view:stock.picking:0 msgid "Delivery orders already processed" -msgstr "Ordenes de entrega ya procesadas" +msgstr "Albaranes de salida ya procesados" #. module: stock #: field:product.template,loc_case:0 @@ -4768,7 +4768,7 @@ msgid "" "Adds a Claim link to the delivery order.\n" " This installs the module claim_from_delivery." msgstr "" -"Añade un enlace de una reclamación a la orden de entrega.\n" +"Añade un enlace de una reclamación al albarán de salida.\n" "Esto instala el módulo 'claim_from_delivery'." #. module: stock @@ -4902,9 +4902,9 @@ msgid "" " " msgstr "" "

\n" -"Pulse para añadir una orden de entrega para este producto.\n" +"Pulse para añadir un albarán de salida para este producto.\n" "

\n" -"Aquí podrá encontrar el historial de todos las entregas pasadas relativas a " +"Aquí podrá encontrar el historial de todos los albaranes pasados relativos a " "este producto, así como todos los productos que debe entregar a los " "clientes.\n" "

\n" @@ -5232,9 +5232,9 @@ msgid "" " " msgstr "" "

\n" -"Pulse para crear una orden de entrega.\n" +"Pulse para crear un albarán de salida.\n" "

\n" -"Ésta es la lista de todas las órdenes de entrega que deben ser preparadas, " +"Ésta es la lista de todas los albaranes de salida que deben ser preparadas, " "de acuerdo a los diferentes pedidos de venta y reglas logísticas.\n" "

\n" " " diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po index 28386e20ed9..c8aa04e8c11 100644 --- a/addons/stock/i18n/fr.po +++ b/addons/stock/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-01-03 09:46+0000\n" -"Last-Translator: Florian Hatat \n" +"PO-Revision-Date: 2014-03-17 13:11+0000\n" +"Last-Translator: Lionel Sausin - Numérigraphe \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-07 07:11+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-03-18 06:21+0000\n" +"X-Generator: Launchpad (build 16963)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -5364,7 +5364,7 @@ msgstr "Optionnel : mouvement de stock suivant quand il est enchainé." #. module: stock #: view:stock.picking.out:0 msgid "Print Delivery Slip" -msgstr "Imprimer le bordereau de livraison" +msgstr "Imprimer le bon de préparation" #. module: stock #: view:report.stock.inventory:0 diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po index ef719dd5117..5e5ef8c7e4c 100644 --- a/addons/stock/i18n/ja.po +++ b/addons/stock/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-03-08 03:50+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-03-31 08:44+0000\n" +"Last-Translator: hiro TAKADA \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-09 06:03+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -1933,7 +1933,7 @@ msgstr "現在の在庫" msgid "" "This stock location will be used, instead of the default one, as the source " "location for stock moves generated by manufacturing orders." -msgstr "" +msgstr "この在庫場所は、製造オーダーで生成される在庫移動の元の場所として、デフォルトの代わりに使用されます。" #. module: stock #: help:stock.move,date_expected:0 @@ -3370,7 +3370,7 @@ msgstr "全体処理" msgid "" "This stock location will be used, instead of the default one, as the source " "location for stock moves generated by procurements." -msgstr "" +msgstr "この在庫場所は、調達で生成される在庫移動の元の場所として、デフォルトの代わりに使用されます。" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_inventory_report @@ -4898,7 +4898,7 @@ msgstr "連鎖移動を含む集荷リストの出荷タイプ（元の場所と msgid "" "This stock location will be used, instead of the default one, as the source " "location for stock moves generated when you do an inventory." -msgstr "" +msgstr "この在庫場所は、棚卸しの実行で生成される在庫移動の元の場所として、デフォルトの代わりに使用されます。" #. module: stock #: help:stock.move,move_dest_id:0 diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po index 111173c7ead..fad13a46836 100644 --- a/addons/stock/i18n/sv.po +++ b/addons/stock/i18n/sv.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-03-31 20:11+0000\n" +"Last-Translator: Peter Jildén \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-07 07:12+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-01 06:53+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -1563,7 +1563,7 @@ msgstr "" #: view:stock.move:0 #: view:stock.picking:0 msgid "Ready" -msgstr "Klar" +msgstr "Redo" #. module: stock #: selection:report.stock.inventory,state:0 @@ -2494,7 +2494,7 @@ msgstr "" #. module: stock #: view:stock.inventory:0 msgid "Set to Draft" -msgstr "" +msgstr "Sätt till utkast" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_journal_form diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po index ac0bbd6899f..afdd99135c5 100644 --- a/addons/stock/i18n/tr.po +++ b/addons/stock/i18n/tr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-03-05 10:43+0000\n" -"Last-Translator: Ediz Duman \n" +"PO-Revision-Date: 2014-03-30 09:58+0000\n" +"Last-Translator: Ayhan KIZILTAN \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-06 06:15+0000\n" -"X-Generator: Launchpad (build 16948)\n" +"X-Launchpad-Export-Date: 2014-03-31 06:40+0000\n" +"X-Generator: Launchpad (build 16967)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -2746,6 +2746,8 @@ msgid "" "The unit of measure rounding does not allow you to ship \"%s %s\", only " "rounding of \"%s %s\" is accepted by the Unit of Measure." msgstr "" +"Ölçü birimini yuvarlamanız \"%s %s\" sevkiyatına izin vermez, yuvarlama " +"yalnızca \"%s %s\" in ölçü birimince kabul edilmesini sağlar." #. module: stock #: report:lot.stock.overview:0 @@ -4236,6 +4238,7 @@ msgstr "Bu alım listesi faturalandırma gerektirmez." msgid "" "You have manually created product lines, please delete them to proceed" msgstr "" +"El ile ürün kalemleri oluşturdunuz, ilerlemek için lütfen onları silin" #. module: stock #: model:stock.location,name:stock.stock_location_shop0 diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index d8117d175fa..18785a58b5e 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-02-06 15:56+0000\n" -"PO-Revision-Date: 2014-03-11 08:04+0000\n" +"PO-Revision-Date: 2014-04-17 04:26+0000\n" "Last-Translator: Andy Cheng \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-03-12 05:26+0000\n" -"X-Generator: Launchpad (build 16963)\n" +"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -400,7 +400,7 @@ msgstr "伙伴" #. module: stock #: field:stock.config.settings,module_claim_from_delivery:0 msgid "Allow claim on deliveries" -msgstr "" +msgstr "允許在出貨單上有索賠選項" #. module: stock #: selection:stock.return.picking,invoice_state:0 @@ -920,7 +920,7 @@ msgstr "編號必須在同一公司內唯一！" #: code:addons/stock/product.py:448 #, python-format msgid "Future Receptions" -msgstr "" +msgstr "日後收貨" #. module: stock #: selection:stock.move,priority:0 @@ -1209,7 +1209,7 @@ msgstr "檢視" #. module: stock #: field:stock.location,parent_left:0 msgid "Left Parent" -msgstr "" +msgstr "左父項" #. module: stock #: field:product.category,property_stock_valuation_account_id:0 @@ -2404,7 +2404,7 @@ msgstr "總值" msgid "" "Inventory Journal in which the chained move will be written, if the Chaining " "Type is not Transparent (no journal is used if left empty)" -msgstr "" +msgstr "如果連鎖類型並不是Transparent，連動調撥時會寫入庫存日記帳簿。 (如果保持空白，日記簿則不使用)" #. module: stock #: selection:report.stock.inventory,location_type:0 @@ -3506,6 +3506,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊開始進行盤點。 \n" +"

\n" +" 定期盤點是使用在計算每個倉位的可用產品數量。\n" +" 您可每年執行年度盤點時使用或在您需要調整某 一\n" +" 產品的庫存水平的時候。\n" +"

\n" +" " #. module: stock #: view:stock.return.picking:0 @@ -3552,7 +3560,7 @@ msgstr "消耗產品" #. module: stock #: field:stock.location,parent_right:0 msgid "Right Parent" -msgstr "" +msgstr "右父項" #. module: stock #: report:lot.stock.overview:0 @@ -3649,6 +3657,20 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊新增倉位。\n" +"

\n" +" 依您的倉庫架構及公司組織定義您的倉位。 OpenERP 能夠管理實\n" +" 際倉位 (倉庫、貨架、箱等等)、業務夥伴倉位(客戶、供應商。)及\n" +" 作為庫存作業對應的虛擬庫位，例如生產製造消耗、盤點作業等\n" +" 等。\n" +"

\n" +" 在 OpenERP 中的每一個庫存作業都是將產品從一個倉位移動到另\n" +" 外一個。舉例來說，假如您由供應商收到產品， OpenERP 會將產\n" +" 品由供應商倉位移動到庫存倉位。每張報表都能在實際、夥伴或虛\n" +" 擬倉位完成。\n" +"

\n" +" " #. module: stock #: field:stock.fill.inventory,recursive:0 @@ -3722,6 +3744,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊以開立收貨單。 \n" +"

\n" +" 收貨單是您從供應商收到的所有訂單的清單。\n" +" 收貨單包含了依原始採購訂單收貨的產品列表。\n" +"

\n" +" " #. module: stock #: view:stock.move:0 @@ -3839,7 +3868,7 @@ msgstr "產品度量單位" #. module: stock #: view:stock.move:0 msgid "Put in current pack" -msgstr "" +msgstr "放入目前的包裹" #. module: stock #: view:stock.inventory:0 @@ -3870,12 +3899,12 @@ msgstr "批次存貨" #: field:stock.report.prodlots,prodlot_id:0 #: field:stock.return.picking.memory,prodlot_id:0 msgid "Serial Number" -msgstr "" +msgstr "序號" #. module: stock #: model:ir.model,name:stock.model_stock_partial_picking msgid "Partial Picking Processing Wizard" -msgstr "" +msgstr "分批提貨處理精靈" #. module: stock #: field:stock.location,icon:0 @@ -3894,7 +3923,7 @@ msgstr "公司間轉移的中途倉位" #: field:stock.partial.picking,hide_tracking:0 #: field:stock.partial.picking.line,tracking:0 msgid "Tracking" -msgstr "" +msgstr "追蹤" #. module: stock #: view:stock.inventory.line.split:0 @@ -3902,7 +3931,7 @@ msgstr "" #: view:stock.move.scrap:0 #: view:stock.split.into:0 msgid "Ok" -msgstr "" +msgstr "確定" #. module: stock #: help:product.category,property_stock_account_output_categ:0 @@ -3920,7 +3949,7 @@ msgstr "" #: field:stock.picking.in,message_ids:0 #: field:stock.picking.out,message_ids:0 msgid "Messages" -msgstr "" +msgstr "訊息" #. module: stock #: model:stock.location,name:stock.stock_location_8 @@ -3963,6 +3992,10 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊定義一個新的倉庫。\n" +"

\n" +" " #. module: stock #: selection:report.stock.inventory,state:0 @@ -3978,7 +4011,7 @@ msgstr "取消" #. module: stock #: view:stock.picking:0 msgid "Confirmed Delivery Orders" -msgstr "" +msgstr "確認出貨單" #. module: stock #: view:stock.move:0 @@ -3999,12 +4032,12 @@ msgstr "本次提貨無須發票" #, python-format msgid "" "You have manually created product lines, please delete them to proceed" -msgstr "" +msgstr "您有手動建立產品細項，請先刪除以繼續處理。" #. module: stock #: model:stock.location,name:stock.stock_location_shop0 msgid "Your Company, Chicago shop" -msgstr "" +msgstr "您的公司，芝加哥分店" #. module: stock #: selection:report.stock.move,type:0 @@ -4014,7 +4047,7 @@ msgstr "" #: selection:stock.picking.in,type:0 #: selection:stock.picking.out,type:0 msgid "Getting Goods" -msgstr "" +msgstr "收貨" #. module: stock #: help:stock.location,chained_location_type:0 @@ -4030,6 +4063,13 @@ msgid "" "* Fixed Location: The chained location is taken from the next field: Chained " "Location if Fixed." msgstr "" +"Determines whether this location is chained to another location, i.e. any " +"incoming product in this location \n" +"決定這個倉位是否鏈結到另外一個倉位，也就是說任何在這個的倉位入庫產品下一步會被移到連鎖倉位。連\n" +"鎖倉位是根據類別決定：\n" +"* 無：無連鎖倉位。\n" +"* 客戶：連鎖倉位將設為提貨單上的業務夥伴的「客戶倉位」欄位。\n" +"* 固定庫位：連鎖倉位為下一個欄位「如果連鎖庫位為固定」的設定。" #. module: stock #: code:addons/stock/stock.py:1882 @@ -4037,23 +4077,23 @@ msgstr "" msgid "" "By changing this quantity here, you accept the new quantity as complete: " "OpenERP will not automatically generate a back order." -msgstr "" +msgstr "通過修改此處的數量，視新的數量為已完成： OpenERP 不會自動建立延期交貨單。" #. module: stock #: view:stock.production.lot.revision:0 msgid "Serial Number Revisions" -msgstr "" +msgstr "序號版本" #. module: stock #: code:addons/stock/stock.py:1134 #, python-format msgid "Error, no partner!" -msgstr "" +msgstr "錯誤，沒有業務夥伴！" #. module: stock #: view:stock.picking:0 msgid "Delivery orders already processed" -msgstr "" +msgstr "出貨單已處理" #. module: stock #: field:product.template,loc_case:0 @@ -4076,12 +4116,12 @@ msgstr "確認" #. module: stock #: help:stock.location,icon:0 msgid "Icon show in hierarchical tree view" -msgstr "" +msgstr "以階層樹狀檢視時顯示圖示" #. module: stock #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories msgid "Merge inventories" -msgstr "" +msgstr "合併實地盤點" #. module: stock #: view:stock.location:0 @@ -4092,32 +4132,32 @@ msgstr "庫存地點" #: help:stock.location,scrap_location:0 msgid "" "Check this box to allow using this location to put scrapped/damaged goods." -msgstr "" +msgstr "勾選選項以允許此倉位存放報廢/損壞貨物。" #. module: stock #: field:stock.picking,message_follower_ids:0 #: field:stock.picking.in,message_follower_ids:0 #: field:stock.picking.out,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "關注者" #. module: stock #: code:addons/stock/stock.py:2634 #, python-format msgid "Cannot consume a move with negative or zero quantity." -msgstr "" +msgstr "調動數量不能為負值或零。" #. module: stock #: help:stock.config.settings,decimal_precision:0 msgid "" "As an example, a decimal precision of 2 will allow weights like: 9.99 kg, " "whereas a decimal precision of 4 will allow weights like: 0.0231 kg." -msgstr "" +msgstr "例如10進位精準度為2將允許重量如9.99公斤，而10進位精準度為4，將允許重量如0.0231公斤。" #. module: stock #: view:report.stock.move:0 msgid "Total outgoing quantity" -msgstr "" +msgstr "總出庫數量" #. module: stock #: field:stock.move,backorder_id:0 @@ -4125,12 +4165,12 @@ msgstr "" #: field:stock.picking.in,backorder_id:0 #: field:stock.picking.out,backorder_id:0 msgid "Back Order of" -msgstr "" +msgstr "延期交貨清單 -" #. module: stock #: model:ir.model,name:stock.model_action_traceability msgid "Action traceability " -msgstr "" +msgstr "動作追溯性 " #. module: stock #: help:stock.partial.move.line,cost:0 @@ -4150,17 +4190,17 @@ msgstr "產品分類" #. module: stock #: view:stock.move:0 msgid "Serial Number" -msgstr "" +msgstr "序號" #. module: stock #: view:stock.invoice.onshipping:0 msgid "Create invoice" -msgstr "" +msgstr "開立發票" #. module: stock #: view:stock.picking:0 msgid "Confirmed Internal Moves" -msgstr "" +msgstr "確認內部調動" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_configuration @@ -4170,7 +4210,7 @@ msgstr "配置" #. module: stock #: model:res.groups,name:stock.group_locations msgid "Manage Multiple Locations and Warehouses" -msgstr "" +msgstr "管理多個倉位與倉庫" #. module: stock #: help:stock.change.standard.price,new_price:0 @@ -4181,6 +4221,8 @@ msgid "" "If cost price is decreased, stock variation account will be creadited and " "stock input account will be debited." msgstr "" +"如果成本價格增加，庫存變動科目為借方，出庫科目為貸方，其值等於 ( 差異金額 * 存貨數量)。\n" +"如果成本價格減少，庫存變動科目為貸方，入庫科目為借方。" #. module: stock #: code:addons/stock/stock.py:2860 @@ -4195,11 +4237,14 @@ msgid "" " to be invoiced when you send or deliver goods.\n" " This installs the module stock_invoice_directly." msgstr "" +"如果設為寄出或交付貨物時開立發票時，允許自動執行開立發票精靈。\n" +" to be invoiced when you send or deliver goods.\n" +" 這將安裝 stock_invoice_directly 模組。" #. module: stock #: field:stock.location,chained_journal_id:0 msgid "Chaining Journal" -msgstr "" +msgstr "連鎖倉位日記帳" #. module: stock #: code:addons/stock/stock.py:782 @@ -4245,7 +4290,7 @@ msgstr "未來交貨" #: field:stock.move,tracking_id:0 #: view:stock.tracking:0 msgid "Pack" -msgstr "" +msgstr "包裹" #. module: stock #: view:stock.move:0 @@ -4261,7 +4306,7 @@ msgstr "自動檢驗" #: code:addons/stock/stock.py:1850 #, python-format msgid "Insufficient Stock for Serial Number !" -msgstr "" +msgstr "該序號的庫存不足！" #. module: stock #: model:ir.model,name:stock.model_product_template @@ -4295,7 +4340,7 @@ msgstr "退貨" #. module: stock #: view:stock.inventory:0 msgid "Validate Inventory" -msgstr "" +msgstr "審核盤點結果" #. module: stock #: help:stock.move,price_currency_id:0 @@ -4307,24 +4352,24 @@ msgstr "" #. module: stock #: help:stock.production.lot,name:0 msgid "Unique Serial Number, will be displayed as: PREFIX/SERIAL [INT_REF]" -msgstr "" +msgstr "唯一序號將顯示為 前綴字元/序號 [整數參考號]" #. module: stock #: code:addons/stock/product.py:142 #, python-format msgid "Please define stock input account for this product: \"%s\" (id: %d)." -msgstr "" +msgstr "請定義入庫會計科目給這個產品：「%s」（id: %d）。" #. module: stock #: model:ir.actions.act_window,name:stock.action_reception_picking_move #: model:ir.ui.menu,name:stock.menu_action_pdct_in msgid "Incoming Products" -msgstr "" +msgstr "入庫產品" #. module: stock #: view:product.product:0 msgid "update" -msgstr "" +msgstr "更新" #. module: stock #: view:stock.change.product.qty:0 @@ -4343,7 +4388,7 @@ msgstr "" #: view:stock.return.picking:0 #: view:stock.split.into:0 msgid "or" -msgstr "" +msgstr "或" #. module: stock #: selection:stock.picking,invoice_state:0 @@ -4363,14 +4408,14 @@ msgstr "資訊" #: code:addons/stock/stock.py:1213 #, python-format msgid "You cannot remove the picking which is in %s state!" -msgstr "" +msgstr "您不能移除 %s 狀態的提貨單" #. module: stock #: help:res.partner,property_stock_customer:0 msgid "" "This stock location will be used, instead of the default one, as the " "destination location for goods you send to this partner" -msgstr "" +msgstr "此倉位將會替代預設倉位，作為當您送貨至此業務夥伴的目標倉位。" #. module: stock #: view:stock.change.product.qty:0 @@ -4383,7 +4428,7 @@ msgstr "套用(_A)" #: field:stock.picking.in,max_date:0 #: field:stock.picking.out,max_date:0 msgid "Max. Expected Date" -msgstr "" +msgstr "最大預計日期" #. module: stock #: field:stock.picking,auto_picking:0 @@ -4397,12 +4442,12 @@ msgstr "自動提貨" #: report:stock.picking.list.in:0 #: report:stock.picking.list.out:0 msgid "Customer Address :" -msgstr "" +msgstr "客戶地址：" #. module: stock #: field:stock.location,chained_auto_packing:0 msgid "Chaining Type" -msgstr "" +msgstr "倉位鏈結類型" #. module: stock #: view:report.stock.inventory:0 @@ -4428,7 +4473,7 @@ msgstr "行事曆檢視" #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move #: report:stock.inventory.move:0 msgid "Stock Inventory" -msgstr "" +msgstr "庫存盤點" #. module: stock #: help:report.stock.inventory,state:0 @@ -4448,12 +4493,12 @@ msgstr "" #. module: stock #: view:stock.inventory.merge:0 msgid "Do you want to merge theses inventories?" -msgstr "" +msgstr "您想要合併這些庫存盤點？" #. module: stock #: view:stock.picking.out:0 msgid "Date of Delivery" -msgstr "" +msgstr "出貨日期" #. module: stock #: field:stock.location,posy:0 @@ -4466,18 +4511,18 @@ msgstr "貨架 (Y)" msgid "" "Please define inventory valuation account on the product category: \"%s\" " "(id: %d)" -msgstr "" +msgstr "請設定此產品分類的庫存估價科目：「%s」（id: %d）" #. module: stock #: model:ir.model,name:stock.model_stock_production_lot_revision msgid "Serial Number Revision" -msgstr "" +msgstr "序號版本" #. module: stock #: code:addons/stock/product.py:100 #, python-format msgid "Specify valuation Account for Product Category: %s." -msgstr "" +msgstr "為產品分類指定估價科目：%s" #. module: stock #: help:stock.config.settings,module_claim_from_delivery:0 @@ -4485,12 +4530,14 @@ msgid "" "Adds a Claim link to the delivery order.\n" " This installs the module claim_from_delivery." msgstr "" +"為送貨單添加一個索賠鏈接。\n" +"這將會安裝 claim_from_delivery 模組，" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:212 #, python-format msgid "Please specify at least one non-zero quantity." -msgstr "" +msgstr "請指定至少一個不為零的數量" #. module: stock #: field:stock.fill.inventory,set_stock_zero:0 @@ -4500,7 +4547,7 @@ msgstr "設為零" #. module: stock #: model:res.groups,name:stock.group_stock_user msgid "User" -msgstr "" +msgstr "使用者" #. module: stock #: field:stock.config.settings,module_stock_location:0 @@ -4528,12 +4575,12 @@ msgstr "未計劃量" #. module: stock #: field:stock.location,chained_company_id:0 msgid "Chained Company" -msgstr "" +msgstr "連動公司" #. module: stock #: view:stock.picking:0 msgid "Check Availability" -msgstr "" +msgstr "檢查可用數量" #. module: stock #: selection:report.stock.inventory,month:0 @@ -4544,7 +4591,7 @@ msgstr "一月" #. module: stock #: constraint:stock.move:0 msgid "You cannot move products from or to a location of the type view." -msgstr "" +msgstr "不能將類型檢視的倉位作為調動的來源或目標倉位" #. module: stock #: help:stock.config.settings,group_stock_production_lot:0 @@ -4552,14 +4599,14 @@ msgid "" "This allows you to manage products by using serial numbers. When you select " "a serial number on product moves, you can get the upstream or downstream " "traceability of that product." -msgstr "" +msgstr "這裡允許您透過使用序號管理存貨。當您在存貨調動選擇一個序號時，您將看到該產品的上下游回溯情形。" #. module: stock #: code:addons/stock/wizard/stock_fill_inventory.py:128 #, python-format msgid "" "No product in this location. Please select a location in the product form." -msgstr "" +msgstr "該倉位沒有產品。請由產品表單選擇倉位。" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open @@ -4611,6 +4658,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊新增此產品的出貨單。\n" +"

\n" +" 您將在此找到所有此產品相關的送貨記錄，以及所有需出貨給\n" +" 客戶的產品。\n" +"

\n" +" " #. module: stock #: model:ir.actions.act_window,name:stock.action_location_form @@ -4646,7 +4700,7 @@ msgstr "前綴" #: view:stock.move:0 #: view:stock.move.split:0 msgid "Split in Serial Numbers" -msgstr "" +msgstr "序號分拆" #. module: stock #: help:product.template,property_stock_account_input:0 @@ -4679,13 +4733,13 @@ msgstr "目的地點" #. module: stock #: model:ir.actions.report.xml,name:stock.report_picking_list msgid "Picking Slip" -msgstr "" +msgstr "提貨單" #. module: stock #: help:stock.move,product_packaging:0 msgid "" "It specifies attributes of packaging like type, quantity of packaging,etc." -msgstr "" +msgstr "指定包裝的屬性，例如類型、產品數量等等。" #. module: stock #: view:product.product:0 diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index 10ae6a16d59..e51f20c67c9 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -10,7 +10,7 @@ Manager - + diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 02fd28611e6..9a1c93f436e 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -718,7 +718,6 @@ class stock_picking(osv.osv): default = {} default = default.copy() picking_obj = self.browse(cr, uid, id, context=context) - move_obj = self.pool.get('stock.move') if ('name' not in default) or (picking_obj.name == '/'): seq_obj_name = 'stock.picking.' + picking_obj.type default['name'] = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name) @@ -727,10 +726,6 @@ class stock_picking(osv.osv): if 'invoice_state' not in default and picking_obj.invoice_state == 'invoiced': default['invoice_state'] = '2binvoiced' res = super(stock_picking, self).copy(cr, uid, id, default, context) - if res: - picking_obj = self.browse(cr, uid, res, context=context) - for move in picking_obj.move_lines: - move_obj.write(cr, uid, [move.id], {'tracking_id': False, 'prodlot_id': False, 'move_history_ids2': [(6, 0, [])], 'move_history_ids': [(6, 0, [])]}) return res def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False): @@ -1806,12 +1801,15 @@ class stock_move(osv.osv): _('Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).')) return super(stock_move, self).write(cr, uid, ids, vals, context=context) - def copy(self, cr, uid, id, default=None, context=None): + def copy_data(self, cr, uid, id, default=None, context=None): if default is None: default = {} default = default.copy() - default.update({'move_history_ids2': [], 'move_history_ids': []}) - return super(stock_move, self).copy(cr, uid, id, default, context=context) + default.setdefault('tracking_id', False) + default.setdefault('prodlot_id', False) + default.setdefault('move_history_ids', []) + default.setdefault('move_history_ids2', []) + return super(stock_move, self).copy_data(cr, uid, id, default, context=context) def _auto_init(self, cursor, context=None): res = super(stock_move, self)._auto_init(cursor, context=context) @@ -2082,41 +2080,46 @@ class stock_move(osv.osv): if context is None: context = {} seq_obj = self.pool.get('ir.sequence') - for picking, todo in self._chain_compute(cr, uid, moves, context=context).items(): - ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0]) - if picking: - # name of new picking according to its type - if ptype == 'internal': - new_pick_name = seq_obj.get(cr, uid,'stock.picking') - else : - new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype) - pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context) - # Need to check name of old picking because it always considers picking as "OUT" when created from Sales Order - old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id) - if old_ptype != picking.type: - old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype) - self.pool.get('stock.picking').write(cr, uid, [picking.id], {'name': old_pick_name, 'type': old_ptype}, context=context) - else: - pickid = False - for move, (loc, dummy, delay, dummy, company_id, ptype, invoice_state) in todo: - new_id = move_obj.copy(cr, uid, move.id, { - 'location_id': move.location_dest_id.id, - 'location_dest_id': loc.id, - 'date': time.strftime('%Y-%m-%d'), - 'picking_id': pickid, - 'state': 'waiting', - 'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context) , - 'move_history_ids': [], - 'date_expected': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'), - 'move_history_ids2': []} - ) - move_obj.write(cr, uid, [move.id], { - 'move_dest_id': new_id, - 'move_history_ids': [(4, new_id)] - }) - new_moves.append(self.browse(cr, uid, [new_id])[0]) - if pickid: - wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr) + for picking, chained_moves in self._chain_compute(cr, uid, moves, context=context).items(): + # We group the moves by automatic move type, so it creates different pickings for different types + moves_by_type = {} + for move in chained_moves: + moves_by_type.setdefault(move[1][1], []).append(move) + for todo in moves_by_type.values(): + ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0]) + if picking: + # name of new picking according to its type + if ptype == 'internal': + new_pick_name = seq_obj.get(cr, uid,'stock.picking') + else : + new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype) + pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context) + # Need to check name of old picking because it always considers picking as "OUT" when created from Sales Order + old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id) + if old_ptype != picking.type: + old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype) + self.pool.get('stock.picking').write(cr, uid, [picking.id], {'name': old_pick_name, 'type': old_ptype}, context=context) + else: + pickid = False + for move, (loc, dummy, delay, dummy, company_id, ptype, invoice_state) in todo: + new_id = move_obj.copy(cr, uid, move.id, { + 'location_id': move.location_dest_id.id, + 'location_dest_id': loc.id, + 'date': time.strftime('%Y-%m-%d'), + 'picking_id': pickid, + 'state': 'waiting', + 'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context) , + 'move_history_ids': [], + 'date_expected': (datetime.strptime(move.date, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'), + 'move_history_ids2': []} + ) + move_obj.write(cr, uid, [move.id], { + 'move_dest_id': new_id, + 'move_history_ids': [(4, new_id)] + }) + new_moves.append(self.browse(cr, uid, [new_id])[0]) + if pickid: + wf_service.trg_validate(uid, 'stock.picking', pickid, 'button_confirm', cr) if new_moves: new_moves += self.create_chained_picking(cr, uid, new_moves, context) return new_moves @@ -2245,15 +2248,15 @@ class stock_move(osv.osv): if move.picking_id: pickings.add(move.picking_id.id) if move.move_dest_id and move.move_dest_id.state == 'waiting': - self.write(cr, uid, [move.move_dest_id.id], {'state': 'confirmed'}) + self.write(cr, uid, [move.move_dest_id.id], {'state': 'confirmed'}, context=context) if context.get('call_unlink',False) and move.move_dest_id.picking_id: wf_service = netsvc.LocalService("workflow") wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr) - self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False}) + self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False}, context=context) if not context.get('call_unlink',False): for pick in self.pool.get('stock.picking').browse(cr, uid, list(pickings), context=context): if all(move.state == 'cancel' for move in pick.move_lines): - self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'}) + self.pool.get('stock.picking').write(cr, uid, [pick.id], {'state': 'cancel'}, context=context) wf_service = netsvc.LocalService("workflow") for id in ids: @@ -3017,6 +3020,9 @@ class stock_picking_in(osv.osv): def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'): return self.pool.get('stock.picking').read(cr, uid, ids, fields=fields, context=context, load=load) + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + return self.pool['stock.picking'].read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby) + def check_access_rights(self, cr, uid, operation, raise_exception=True): #override in order to redirect the check of acces rights on the stock.picking object return self.pool.get('stock.picking').check_access_rights(cr, uid, operation, raise_exception=raise_exception) @@ -3087,6 +3093,9 @@ class stock_picking_out(osv.osv): def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'): return self.pool.get('stock.picking').read(cr, uid, ids, fields=fields, context=context, load=load) + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + return self.pool['stock.picking'].read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby) + def check_access_rights(self, cr, uid, operation, raise_exception=True): #override in order to redirect the check of acces rights on the stock.picking object return self.pool.get('stock.picking').check_access_rights(cr, uid, operation, raise_exception=raise_exception) diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml index 99565f0c08c..d925ba4dc8e 100644 --- a/addons/stock/stock_demo.yml +++ b/addons/stock/stock_demo.yml @@ -1,99 +1,107 @@ - - !record {model: stock.location, id: location_refrigerator}: - name: Refrigerator + Only stock manager can create location,warehouse and product, so let's check data with giving the access rights of manager +- + !context + uid: 'res_users_stock_manager' +- + !record {model: stock.location, id: location_monitor}: + name: chicago shop usage: internal - - !record {model: stock.location, id: location_delivery_counter}: - name: Delivery Counter + !record {model: stock.location, id: stock_location_output}: + name: Output usage: internal - - !record {model: stock.location, id: location_refrigerator_small}: - name: Small Refrigerator + !record {model: stock.location, id: location_monitor_small}: + name: Small chicago shop usage: internal - location_id: location_refrigerator + location_id: location_monitor - !record {model: stock.location, id: location_opening}: name: opening usage: inventory - - !record {model: stock.location, id: location_convenience_shop}: - name: Convenient Store + !record {model: stock.location, id: stock_location_3}: + name: IT Suppliers usage: supplier - - !record {model: stock.warehouse, id: warehouse_icecream}: - name: Ice Cream Shop - lot_input_id: location_refrigerator - lot_stock_id: location_refrigerator - lot_output_id: location_delivery_counter + !record {model: stock.warehouse, id: stock_warehouse_shop0}: + name: Chicago Warehouse + lot_input_id: location_monitor + lot_stock_id: location_monitor + lot_output_id: stock_location_output - - !record {model: product.product, id: product_icecream}: - default_code: 001 - name: Ice Cream - type: product - categ_id: product.product_category_1 - list_price: 100.0 - standard_price: 70.0 - uom_id: product.product_uom_kgm - uom_po_id: product.product_uom_kgm - procure_method: make_to_stock + !record {model: product.product, id: product_product_6}: + default_code: LCD15 + name: 15” LCD Monitor + type: consu + categ_id: product.product_category_8 + list_price: 1200.0 + standard_price: 800.0 + uom_id: product.product_uom_unit + uom_po_id: product.product_uom_unit property_stock_inventory: location_opening valuation: real_time cost_method: average - property_stock_account_input: account.o_expense - property_stock_account_output: account.o_income - description: Ice cream can be mass-produced and thus is widely available in developed parts of the world. Ice cream can be purchased in large cartons (vats and squrounds) from supermarkets and grocery stores, in smaller quantities from ice cream shops, convenience stores, and milk bars, and in individual servings from small carts or vans at public events. - + property_stock_account_input: account.conf_o_income + property_stock_account_output: account.a_expense - - !record {model: stock.production.lot, id: lot_icecream_0}: - name: Lot0 for Ice cream - product_id: product_icecream + Stock user can handled production lot,inventory and picking, so let's check data with giving the access rights of user - - !record {model: stock.production.lot, id: lot_icecream_1}: - name: Lot1 for Ice cream - product_id: product_icecream + !context + uid: 'res_users_stock_user' - - !record {model: stock.inventory, id: stock_inventory_icecream}: - name: Inventory for icecream + !record {model: stock.production.lot, id: lot_monitor_0}: + name: Lot0 for LCD Monitor + product_id: product_product_6 - - !record {model: stock.inventory.line, id: stock_inventory_line_icecream_lot0}: - product_id: product_icecream - product_uom: product.product_uom_kgm - inventory_id: stock_inventory_icecream + !record {model: stock.production.lot, id: lot_monitor_1}: + name: Lot1 for LCD Monitor + product_id: product_product_6 +- + !record {model: stock.inventory, id: stock_inventory_0}: + name: Starting Inventory + state: draft +- + !record {model: stock.inventory.line, id: stock_inventory_line_3}: + product_id: product_product_6 + product_uom: product.product_uom_unit + inventory_id: stock_inventory_0 product_qty: 50.0 - prod_lot_id: lot_icecream_0 - location_id: location_refrigerator + prod_lot_id: lot_monitor_0 + location_id: location_monitor - - !record {model: stock.inventory.line, id: stock_inventory_line_icecream_lot1}: - product_id: product_icecream - product_uom: product.product_uom_kgm - inventory_id: stock_inventory_icecream + !record {model: stock.inventory.line, id: stock_inventory_line_monitor}: + product_id: product_product_6 + product_uom: product.product_uom_unit + inventory_id: stock_inventory_0 product_qty: 40.0 - prod_lot_id: lot_icecream_1 - location_id: location_refrigerator + prod_lot_id: lot_monitor_1 + location_id: location_monitor - !record {model: stock.picking, id: outgoing_shipment}: type: out - location_dest_id: location_delivery_counter + location_dest_id: stock_location_output - - !record {model: stock.move, id: outgoing_shipment_icecream}: + !record {model: stock.move, id: outgoing_shipment_monitor}: picking_id: outgoing_shipment - product_id: product_icecream - product_uom: product.product_uom_kgm + product_id: product_product_6 + product_uom: product.product_uom_unit product_qty: 130.0 - location_id: location_refrigerator - location_dest_id: location_delivery_counter + location_id: location_monitor + location_dest_id: stock_location_output - !record {model: stock.picking, id: incomming_shipment}: type: in invoice_state: 2binvoiced partner_id: base.res_partner_address_9 - location_dest_id: location_refrigerator + location_dest_id: location_monitor - - !record {model: stock.move, id: incomming_shipment_icecream}: + !record {model: stock.move, id: incomming_shipment_monitor}: picking_id: incomming_shipment - product_id: product_icecream - product_uom: product.product_uom_kgm + product_id: product_product_6 + product_uom: product.product_uom_unit product_qty: 50.0 - location_id: location_convenience_shop - location_dest_id: location_refrigerator + location_id: stock_location_3 + location_dest_id: location_monitor diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 72adde4ef20..3baee26c883 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -776,7 +776,7 @@ - + @@ -910,7 +910,7 @@ - +
@@ -1037,7 +1037,7 @@ - +
@@ -1255,7 +1255,7 @@ + groups="stock.group_tracking_lot,stock.group_production_lot">