[MERGE]: with trunk

bzr revid: aja@tinyerp.com-20131111053926-a7rrnmoy95j07dd6

addons/account_bank_statement_extensions/i18n/bs.po

@@ -0,0 +1,363 @@
+# Bosnian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-10-29 18:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Informacije o pokretaču i korisniku"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Glob. Id"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Šifra nadređenog"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Duguje"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Otkaži odabrane stavke izvoda"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Value Date"
+msgstr "Datum vrijednovanja"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupiši po..."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "U pripremi"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Izvod"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Potvrdi odabrane stavke izvoda"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Izvještaj stanja izvoda"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Otkaži stavke"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informacije grupnog plaćanja"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid ""
+"Delete operation not allowed.             Please go to the associated bank "
+"statement in order to delete and/or modify bank statement line."
+msgstr ""
+"Operacija brisanja nije dozvoljena. Molimo otiđite na povezanu stavku izvoda "
+"da bi ste obrisali ili uredili stavku izvoda."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "or"
+msgstr "ili"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Potvrdi stavke"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transakcije"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Potvrđene stavke izvoda"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Potražne transakcije"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "otkaži odabrane stavke izvoda."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Broj protupartije"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Završni saldo"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Glob. vrijednost"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Dugovne transakcije"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Napredni filteri..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Potvrđene stavke se ne mogu više mjenjati."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Da li ste sigurni da želite otkazati odabrane stavke izvoda iz banke ?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr "JIB/JBMG"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Zabilješke"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Ručno"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Bank Transaction"
+msgstr "Bankovne transakcije"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Potražuje"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Iznos"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.konto"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Valuta protupartije"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC protupartije"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Šifre podređenih"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Pretraži izvode banke"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Da li ste sigurni da želite potvrditi odabrane stavke izvoda iz banke?"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Šifra za identifikaciju transakcije koja pripada nekom globalizacijskom "
+"nivou sa grupnim plaćanjima"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Stavke izvoda u toku."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob. Vrij."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Stavka bankovnog izvoda"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Šifra"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Naziv protupartije"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Računi banke"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Izvod banke"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Stavka izvoda"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Šifra mora biti jedinstvena !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Stavke izvoda iz banke"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid "Warning!"
+msgstr "Upozorenje!"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Podređena grupna plaćanja"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Stavke izvoda"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Ukupan Iznos"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "Globalizacijski ID"

addons/account_payment/account_payment_view.xml

@@ -93,7 +93,7 @@
                             <notebook>
                                 <page string="Payment">
                                     <group col="4">
-                                        <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_residual','>',0)] "/>
+                                        <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0), ('account_id.reconcile', '=', True)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
                                         <label for="amount_currency" groups="base.group_multi_currency"/>
@@ -219,7 +219,7 @@
                         <page string="Payment">
                             <group col="4">
                                 <field name="order_id"/>
-                                <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_residual','>',0)]"/>
+                                <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0), ('account_id.reconcile', '=', True)]"/>
                                 <separator colspan="4" string="Transaction Information"/>
                                 <field name="date"/>
                                 <label for="amount_currency" groups="base.group_multi_currency"/>

addons/account_sequence/i18n/bs.po

@@ -0,0 +1,155 @@
+# Bosnian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-10-29 21:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr "Konfiguracija primjene računovodstvenih sekvenci"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Broj internih sekvenci"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Sljedeći broj ove sekvence"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Sljedeći broj"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Broj uvećanja"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "Sljedeći broj sekvence će biti uvećan za ovaj broj"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Konfigurišite primjenu vaših sekvenci računovodstva"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Konfiguriši"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Sufiks (poslije brojača) za ovu sekvencu"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Kompanija"
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Dužina cifre"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Stavke dnevnika"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Interni broj"
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP će automatski dodati nekoliko '0' sa lijeve strane 'Sljedećeg broja' "
+"da bi se dobio odgovarajuća dužina broja"
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Naziv"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Interna sekvenca"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Prefiks vrijednost zapisa za sekvencu"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Računovodstveni zapis"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Sufiks"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "naslov"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefiks"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+"Ova sekvenca će se koristiti za održavanje internog broja za dnevničke "
+"zapise povezane sa ovim dnevnikom."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Dnevnik"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+"Možete da unapredite primjenu računovodstvenih sekvenci instaliranjem."

addons/account_test/i18n/da.po

@@ -0,0 +1,244 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-11-08 21:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-10 05:54+0000\n"
+"X-Generator: Launchpad (build 16820)\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 ""
+
+#. 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 ""
+"Tjek om udlignede købs-/salgsfakturaer har udlignede posteringer på debitor "
+"og kreditor konti."
+
+#. 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 "Tjek om flytte linier er i balance og har samme dato og periode"
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr "Test navn"
+
+#. module: account_test
+#: report:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr "Regnskabs test aktiveret"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr "Test 1: Generel balance"
+
+#. 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 "Tjek at de betalte/udlignede fakturaer ikke er i\" Åben\" status"
+
+#. 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 "Tests"
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr "Test beskrivelse"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. 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 "Test 9 : Konti og partner på kontobevægelser"
+
+#. 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 "Bogførings tests"
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:74
+#, python-format
+msgid "The test was passed successfully"
+msgstr "Testen blev gennemført med succes"
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6 : Invoices status"
+msgstr "Test 6 : Fakturaers status"
+
+#. 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 "Udtryk"
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr "Test 4: Fuldt udlignede bevægelser"
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr "Tjek om de fuldt udlignede bevægelser er i balance"
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr "Rækkefølge"
+
+#. 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 ""
+"Tjek om det nyåbnede regnskabsårs balance stemmer med sidste års balance"
+
+#. 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 ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create Accounting Test.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr "Tjek balancen: Debet sum = Kredit sum"
+
+#. 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 "Tjek at konti og partnere på bevægelser er aktive"
+
+#. 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 ""

addons/analytic_contract_hr_expense/i18n/da.po

@@ -0,0 +1,72 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-11-08 21:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-10 05:54+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "Eller se"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Intet at fakturere, opret"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "Udgifter"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analyse konto"
+
+#. 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 "Udgifter til fakturering %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 "Udgifter %s"
+
+#. 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 "ukendt"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Estimering af udgifter til fakturering"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Fakturér udgifter"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Faktura"

addons/auth_crypt/i18n/pl.po

@@ -1,37 +1,28 @@
 # Polish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-03-28 14:21+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-11-02 19:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2013-11-03 05:21+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Szyfrowane hasło"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
 msgid "Users"
-msgstr ""
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Nie może być dwóch użytkowników o tym samym loginie !"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Błąd"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
-
-#, python-format
-#~ msgid "Please specify the password !"
-#~ msgstr "Proszę podać hasło!"
+msgstr "Użytkownicy"

addons/auth_signup/i18n/zh_CN.po

@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-07-02 08:11+0000\n"
-"Last-Translator: DWXXX <Unknown>\n"
+"PO-Revision-Date: 2013-11-07 09:32+0000\n"
+"Last-Translator: dengwei <250100785@qq.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 #. module: auth_signup
 #: field:res.partner,signup_type:0
 msgid "Signup Token Type"
-msgstr ""
+msgstr "注册令牌（Token）类型"
 
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
@@ -97,7 +97,7 @@ msgstr "新建"
 #: code:addons/auth_signup/res_users.py:258
 #, python-format
 msgid "Mail sent to:"
-msgstr ""
+msgstr "收件人"
 
 #. module: auth_signup
 #: field:res.users,state:0
@@ -116,6 +116,12 @@ msgid ""
 "\n"
 "<p>Note: If you do not expect this, you can safely ignore this email.</p>"
 msgstr ""
+"\n"
+"<p>您收到这封邮件是因为绑定该邮件的openerp用户申请了密码重置</p><br/>\n"
+"\n"
+"<p><a href=\"${object.signup_url}\">点我</a>重置密码.</p><br/>\n"
+"\n"
+"<p>注意: 如果该邮件不是你想要的，请忽略掉.</p>"
 
 #. module: auth_signup
 #. openerp-web
@@ -144,7 +150,7 @@ msgstr "请输入您的用户名"
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
-msgstr "启用"
+msgstr "激活"
 
 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:270
@@ -153,6 +159,8 @@ msgid ""
 "Cannot send email: no outgoing email server configured.\n"
 "You can configure it under Settings/General Settings."
 msgstr ""
+"无法发送邮件: 没有设置发送邮件服务器信息.\n"
+"请到菜单栏  Settings/General Settings 设置."
 
 #. module: auth_signup
 #. openerp-web
@@ -195,7 +203,7 @@ 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 ""
+msgstr "用户可以在登录页点击来重置密码"
 
 #. module: auth_signup
 #. openerp-web
@@ -220,21 +228,21 @@ msgstr "注册令牌（ Token  ）是有效的"
 #: code:addons/auth_signup/static/src/js/auth_signup.js:173
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "用户名"
 
 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:97
 #, python-format
 msgid "Invalid signup token"
-msgstr ""
+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 ""
+msgstr "密码错误，请重新输入"
 
 #. module: auth_signup
 #. openerp-web
@@ -242,7 +250,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "请选择一个数据库"
 
 #. module: auth_signup
 #: view:res.users:0
@@ -252,7 +260,7 @@ msgstr "重置密码"
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
 msgid "Enable password reset from Login page"
-msgstr ""
+msgstr "允许在登录页开启密码重置功能"
 
 #. module: auth_signup
 #. openerp-web

addons/contacts/i18n/fi.po

@@ -0,0 +1,37 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-11-10 09:24+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-11 05:17+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Yhteystiedot"

addons/crm/i18n/zh_CN.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-08-06 09:41+0000\n"
-"Last-Translator: fanvil <fanvil@hotmail.com>\n"
+"PO-Revision-Date: 2013-11-08 09:14+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:18+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-11-10 05:53+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -43,7 +43,7 @@ msgstr "线索"
 #: view:crm.lead:0
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "标题"
+msgstr "称谓"
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_lead
@@ -55,16 +55,16 @@ msgid ""
 "            "
 msgstr ""
 "警告收到的新线索已超过5天未处理\n"
-"名称：[[object.name]]\n"
-"编号：[[object.id]]\n"
-"描述：[[object.description]]\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
 "            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,action:0
 #: field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr "动作"
+msgstr "操作"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_set_team_sales_department
@@ -117,7 +117,7 @@ msgstr "日"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr "公司名"
+msgstr "公司名称"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
@@ -140,12 +140,12 @@ msgstr "预计结束日期"
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "如果要求你关注新消息，勾选此项"
+msgstr "如果勾选此项，有新消息会提醒你"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr "报告日期"
+msgstr "创建日期"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -208,20 +208,20 @@ msgstr "警告!"
 #: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr "业务伙伴"
+msgstr "合作伙伴"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr "安排其它电话拜访"
+msgstr "安排其它电话呼叫"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:209
 #: view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
-msgstr "电话访问"
+msgstr "电话呼叫"
 
 #. module: crm
 #: field:crm.lead,opt_out:0
@@ -232,7 +232,7 @@ msgstr "不参与（自动订阅邮件）"
 #: view:crm.lead:0
 #: field:crm.lead,state_id:0
 msgid "State"
-msgstr "状态"
+msgstr "省/ 州"
 
 #. module: crm
 #: field:res.partner,meeting_count:0
@@ -247,7 +247,7 @@ msgstr "提醒用户"
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "规则"
+msgstr "条件"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -283,7 +283,7 @@ msgstr "营销活动"
 #: field:crm.lead,categ_ids:0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
 msgid "Categories"
-msgstr "分类"
+msgstr "归类"
 
 #. module: crm
 #: help:crm.lead,opt_out:0
@@ -295,7 +295,7 @@ msgstr "如果选择退订，这联系人将不再向其发送邮件或取消订
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr "潜在业务伙伴"
+msgstr "潜在合作伙伴"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:1002
@@ -346,13 +346,13 @@ msgstr ""
 #: field:crm.phonecall,partner_id:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr "联系方式"
+msgstr "联系人"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the salesman with the team leader."
-msgstr "升级时用团队领导覆盖销售人员"
+msgstr "提升时用团队领导覆盖销售人员"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -413,7 +413,7 @@ msgstr "失去"
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr "未读信息"
+msgstr "未读消息"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -427,7 +427,7 @@ msgstr "细分"
 #: selection:crm.lead2opportunity.partner.mass,action:0
 #: selection:crm.partner.binding,action:0
 msgid "Link to an existing customer"
-msgstr "链接到存在的客户"
+msgstr "链接到现有客户"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -454,7 +454,7 @@ msgstr "这默认百分比描述业务在这阶段的平均的成功概率"
 #: field:crm.phonecall.report,categ_id:0
 #: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
-msgstr "分类"
+msgstr "类别"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -476,7 +476,7 @@ msgstr "分配给我锁管理的某个销售队伍，或给我的线索。"
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr "合作伙伴邮箱"
+msgstr "合作伙伴联系电邮"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -518,7 +518,7 @@ msgstr "状态"
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
 msgid "Create Opportunity"
-msgstr "建立商机"
+msgstr "创建商机"
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -538,14 +538,14 @@ msgstr "邮件"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_stage
 msgid "Stage changed"
-msgstr "任务阶段已改变"
+msgstr "阶段已改变"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr "6月"
+msgstr "六月"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -567,12 +567,12 @@ msgstr "预期收益"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr "10月"
+msgstr "十月"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr "包括答案:"
+msgstr "包括的答案:"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -605,12 +605,12 @@ msgstr "商机${object.name | h})"
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "业务分类"
+msgstr "案子分类"
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr "联系人姓名"
+msgstr "合作伙伴联系姓名"
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -629,7 +629,7 @@ msgstr "特征选项"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "电话访问"
+msgstr "电话呼叫"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
@@ -695,7 +695,7 @@ msgstr "业务伙伴细分明细"
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr "电话访问分析"
+msgstr "电话呼叫分析"
 
 #. module: crm
 #: view:crm.lead:0
@@ -706,7 +706,7 @@ msgstr "线索表单"
 #: view:crm.segmentation:0
 #: model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "业务伙伴细分"
+msgstr "合作伙伴细分"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
@@ -716,17 +716,17 @@ msgstr "币种"
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr "可能收入"
+msgstr "可能收益"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr "报告月份"
+msgstr "创建月份"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr "细分的名称"
+msgstr "细分名称"
 
 #. module: crm
 #: field:crm.case.stage,probability:0
@@ -741,12 +741,12 @@ msgstr "这笔交易达成的概率应该在0%到100%之间！"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr "产生线索"
+msgstr "线索产生"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr "统计控制台"
+msgstr "统计仪表盘"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:878
@@ -790,7 +790,7 @@ msgstr "别名"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "查询电话访问"
+msgstr "搜索电话呼叫"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -806,13 +806,13 @@ msgstr "事件类型"
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr "唯一的"
+msgstr "排它的"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:600
 #, python-format
 msgid "From %s : %s"
-msgstr "发自: %s:%s"
+msgstr "来自: %s:%s"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -860,7 +860,7 @@ msgstr "邮政编码"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr "未分配的沟通电话"
+msgstr "未分配的电话呼叫"
 
 #. module: crm
 #: view:crm.lead:0
@@ -873,12 +873,12 @@ msgstr "未分配的沟通电话"
 #: model:process.node,name:crm.process_node_opportunities0
 #: view:res.partner:0
 msgid "Opportunities"
-msgstr "商机列表"
+msgstr "商机"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "业务伙伴分类"
+msgstr "业务伙伴类别"
 
 #. module: crm
 #: field:crm.lead,probability:0
@@ -908,7 +908,7 @@ msgstr "来自USA的线索"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr "失去标记"
+msgstr "标记失去"
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
@@ -920,7 +920,7 @@ msgstr "线索草稿"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr "3月"
+msgstr "三月"
 
 #. module: crm
 #: view:crm.lead:0
@@ -959,7 +959,7 @@ msgstr "分配给我或者我管理的某个销售团队的商机。"
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr "用于计算开放天数"
+msgstr "用于计算开启天数"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
@@ -992,7 +992,7 @@ msgstr "草稿"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "业务伙伴细分"
+msgstr "合作伙伴细分"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1072,7 +1072,7 @@ msgstr "创建日期"
 #: code:addons/crm/crm_lead.py:715
 #, python-format
 msgid "Lead <b>converted into an Opportunity</b>"
-msgstr "线索 <b>已转换成商机</b>"
+msgstr "线索 <b>已转成商机</b>"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1082,7 +1082,7 @@ msgstr "采购金额"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr "沟通电话年份"
+msgstr "电话呼叫年份"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1096,17 +1096,17 @@ msgstr "阶段"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr "指派给我的电话沟通"
+msgstr "指派给我的电话呼叫"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr "用户账户"
+msgstr "用户登录"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr "在暂停状态的沟通电话"
+msgstr "在暂停状态的电话呼叫"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1145,7 +1145,7 @@ msgstr "í"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr "9月"
+msgstr "九月"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -1177,7 +1177,7 @@ msgstr ""
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "处理的最大业务伙伴ID"
+msgstr "已处理的最大业务伙伴ID"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
@@ -1222,7 +1222,7 @@ msgstr "预期结束日期"
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr "如果有效字段设为true，它将允许你忽略销售团队在外面删除它。"
+msgstr "如果active字段设为true，它将允许你隐藏销售团队而不用删除它。"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
@@ -1259,7 +1259,7 @@ msgstr "执行状态"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Log call"
-msgstr "记录通话日志"
+msgstr "记录呼叫"
 
 #. module: crm
 #: field:crm.lead,day_close:0
@@ -1297,12 +1297,12 @@ msgstr "在线支持"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr "扩展过滤器..."
+msgstr "扩展的过滤器..."
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr "已关闭的通话记录"
+msgstr "已关闭的呼叫"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1339,7 +1339,7 @@ msgstr "发送邮件的时候，默认的邮件地址来自销售团队。"
 msgid ""
 "Phone Calls Assigned to the current user or with a team having the current "
 "user as team leader"
-msgstr "被分配给当前用户或者当前用户领导的销售团队的电话沟通任务。"
+msgstr "被分配给当前用户或者当前用户领导的销售团队的电话呼叫任务。"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1355,7 +1355,7 @@ msgstr "销售线索描述"
 #: code:addons/crm/crm_lead.py:581
 #, python-format
 msgid "Merged opportunities"
-msgstr "合并商机"
+msgstr "合并的商机"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
@@ -1375,12 +1375,12 @@ msgstr "特性"
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr "子"
+msgstr "子团队"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr "待处理通话记录"
+msgstr "待处理的呼叫"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
@@ -1415,7 +1415,7 @@ msgstr "资料"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr "线索/暂缓的商机"
+msgstr "暂缓的线索/商机"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -1425,7 +1425,7 @@ msgstr "待办事项"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr "丢掉的商机"
+msgstr "失去的商机"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -1449,7 +1449,7 @@ msgstr "线索/商机"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr "合并线索与商机"
+msgstr "合并线索/商机"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
@@ -1459,12 +1459,12 @@ msgstr "用于阶段的排序，数字越小越好。"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr "电话访问分类"
+msgstr "电话访问类别"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr "线索/正在处理的商机"
+msgstr "待处理的线索/商机"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
@@ -1490,7 +1490,7 @@ msgstr "错误！你不能创建递归的销售团队"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr "记录通话日志"
+msgstr "记录呼叫"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1501,7 +1501,7 @@ msgstr "销售金额"
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr "电话访问"
+msgstr "电话呼叫"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1535,14 +1535,14 @@ msgstr "结束日期"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "My Case(s)"
-msgstr "我的业务"
+msgstr "我的案子"
 
 #. module: crm
 #: help:crm.case.section,message_ids:0
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr "信息和通信历史记录"
+msgstr "消息和通信历史记录"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1576,7 +1576,7 @@ msgstr "CRM 付款模式"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr "线索/已完结的商机"
+msgstr "已完结的线索/商机"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1645,7 +1645,7 @@ msgstr "合作伙伴已<b>创建</b>"
 #. 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
@@ -1703,12 +1703,12 @@ msgstr "显示"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "商机的阶段"
+msgstr "商机 按阶段"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr "潜在客户转换为业务伙伴"
+msgstr "潜在客户正转换为商业伙伴"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1724,7 +1724,7 @@ msgstr "渠道"
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Held"
-msgstr "保留"
+msgstr "已挂起"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1744,7 +1744,7 @@ msgstr "编辑..."
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr "google"
+msgstr "Google Adwords"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1765,7 +1765,7 @@ msgstr "优先级(0=紧急)"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "线索转换为业务伙伴或商机"
+msgstr "线索转换为合作伙伴或商机"
 
 #. module: crm
 #: help:crm.lead,partner_id:0
@@ -1782,7 +1782,7 @@ msgstr "付款方式"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr "批量转换线索为商机业务伙伴"
+msgstr "批量转换线索为商机或合作伙伴"
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -1799,7 +1799,7 @@ msgstr "CRM"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Contacts Segmentation"
-msgstr "联系人分类"
+msgstr "联系人细分"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -1830,7 +1830,7 @@ msgstr "计划日期"
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr "预期收入"
+msgstr "预期收益"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1848,7 +1848,7 @@ msgstr "类型用于区分销售线索和商机"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr "7月"
+msgstr "七月"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1885,13 +1885,13 @@ msgstr "团队"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr "线索/新建的商机"
+msgstr "新建的线索/商机"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0
 msgid "Not Held"
-msgstr "不保留"
+msgstr "未挂起"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -1986,7 +1986,7 @@ msgstr "打开商机"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Email Campaign - Services"
-msgstr "邮件营销 - 服务"
+msgstr "电邮营销 - 服务"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2013,7 +2013,7 @@ msgstr "完整抄送"
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
 msgid "Phone Calls"
-msgstr "电话访问"
+msgstr "电话呼叫"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -2046,7 +2046,7 @@ msgstr "有效"
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr "强制的表达式1"
+msgstr "强制的表达式"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2176,7 +2176,7 @@ msgstr "延迟开启"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr "准备电话联系"
+msgstr "准备电话呼叫"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -2328,7 +2328,7 @@ msgstr "对象名"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr "指派给我和我的团队的电话沟通"
+msgstr "指派给我和我的团队的电话呼叫"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2356,7 +2356,7 @@ msgstr "联系方式（电子邮件，面谈，电话等）"
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr "电话访问摘要"
+msgstr "呼叫摘要"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2394,7 +2394,7 @@ msgstr "相关状态"
 #. module: crm
 #: field:crm.phonecall,name:0
 msgid "Call Summary"
-msgstr "电话访问摘要"
+msgstr "电话呼叫摘要"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2405,7 +2405,7 @@ msgstr "运算符"
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr "计划/电话访问的记录"
+msgstr "计划/记录呼叫"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -2509,7 +2509,7 @@ msgstr "途径"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule Call"
-msgstr "计划的电话访问"
+msgstr "计划的电话呼叫"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2577,7 +2577,7 @@ msgstr "第一次与新的潜在客户接触"
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr "通话"
+msgstr "呼叫"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2587,7 +2587,7 @@ msgstr "自动修改概率"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr "我的电话沟通"
+msgstr "我的电话呼叫"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
@@ -2706,7 +2706,7 @@ msgstr "团队成员"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr "计划/记录一个电话"
+msgstr "计划/记录一个呼叫"
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
@@ -2730,7 +2730,7 @@ msgstr "这些邮件地址将添加到之前发送记录的发送和接收邮件
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr "通话日志"
+msgstr "呼叫记录"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_won
@@ -2859,7 +2859,7 @@ msgstr "归类"
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
-msgstr "记录通话日志"
+msgstr "记录通话"
 
 #. module: crm
 #: help:sale.config.settings,group_fund_raising:0

addons/crm_helpdesk/i18n/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-06-07 05:02+0000\n"
-"Last-Translator: PeterGao <306739889@qq.com>\n"
+"PO-Revision-Date: 2013-11-07 09:48+0000\n"
+"Last-Translator: dengwei <250100785@qq.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:26+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-11-08 05:42+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -442,6 +442,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击创建新的请求. \n"
+"              </p><p>\n"
+"                服务台和支持服务允许您跟踪自己的的操作。\n"
+"              </p><p>\n"
+"                使用openerp的问题系统来管理你的服务活动。\n"
+"                所有问题都可以通过邮件服务器连接: 所有新的问题都会创建邮件, 这些邮件自动获取用户的交流记录.\n"
+"              </p>\n"
+"            "
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,planned_revenue:0

addons/email_template/i18n/zh_CN.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 18:31+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2013-11-07 09:37+0000\n"
+"Last-Translator: dengwei <250100785@qq.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:17+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-11-08 05:41+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -74,7 +74,7 @@ msgstr "发送者地址"
 #. module: email_template
 #: view:email.template:0
 msgid "Remove context action"
-msgstr ""
+msgstr "去掉context action"
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -281,7 +281,7 @@ msgstr ""
 #: field:email.template,copyvalue:0
 #: field:email_template.preview,copyvalue:0
 msgid "Placeholder Expression"
-msgstr ""
+msgstr "占位符表达式"
 
 #. module: email_template
 #: field:email.template,sub_object:0
@@ -327,18 +327,18 @@ msgstr "模型"
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "邮件向导"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add context action"
-msgstr ""
+msgstr "添加 context action"
 
 #. module: email_template
 #: help:email.template,model_id:0
 #: help:email_template.preview,model_id:0
 msgid "The kind of document with with this template can be used"
-msgstr ""
+msgstr "使用该模版的这种类型的文档都是可选的"
 
 #. module: email_template
 #: field:email.template,email_recipients:0
@@ -376,7 +376,7 @@ msgstr "地址"
 #: help:email_template.preview,email_recipients:0
 msgid ""
 "Comma-separated ids of recipient partners (placeholders may be used here)"
-msgstr ""
+msgstr "客户容器（请使用逗号分隔客户ids,可以使用占位符）"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0

addons/event/i18n/zh_CN.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-11-29 11:10+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
+"PO-Revision-Date: 2013-10-30 10:49+0000\n"
+"Last-Translator: dengwei <250100785@qq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:10+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-10-31 05:17+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 #. module: event
 #: view:event.event:0
@@ -572,6 +572,8 @@ msgid ""
 "status is set to 'Done'.If event is cancelled the status is set to "
 "'Cancelled'."
 msgstr ""
+"一个事件创建成功后，初始状态为草稿，如果某一天该事件被确认了，其状态会相应变为确认。如果该事件结束了，状态就会显示为已结束。当该事件被取消了，状态就显示为"
+"已取消。"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -626,7 +628,7 @@ msgstr "如果你设定了邮件模板，每个参与者将收到邮件公告确
 #. module: event
 #: view:board.board:0
 msgid "Events Filling By Status"
-msgstr ""
+msgstr "按照状态过滤"
 
 #. module: event
 #: selection:report.event.registration,event_state:0
@@ -728,6 +730,13 @@ msgid ""
 "        <p>Thank you for your participation!</p>\n"
 "        <p>Best regards</p>"
 msgstr ""
+"\n"
+"        &nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>你好，${object.name},</p>\n"
+"&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>你注册的活动${object.event_id.name} "
+"已经被确认了，举办时间定在${object.event_id.date_begin} ~ ${object.event_id.date_end}之间.\n"
+"&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:详细信息,请联系我们的活动组织部门.</p>\n"
+"&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>谢谢参与!</p>\n"
+"&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>此致敬礼</p>"
 
 #. module: event
 #: field:event.event,message_is_follower:0
@@ -796,7 +805,7 @@ msgstr "确认登记记录"
 msgid ""
 "You have already set a registration for this event as 'Attended'. Please "
 "reset it to draft if you want to cancel this event."
-msgstr ""
+msgstr "鉴于你已经注册该事件为“参加”。如果你想取消这次活动。请首先将其状态改为草稿。"
 
 #. module: event
 #: view:res.partner:0
@@ -829,7 +838,7 @@ msgstr "活动类型"
 msgid ""
 "This field contains the template of the mail that will be automatically sent "
 "each time a registration for this event is confirmed."
-msgstr ""
+msgstr "活动一旦被确认，这个字段包含的模板会自动发送的邮件。"
 
 #. module: event
 #: view:event.event:0
@@ -1022,7 +1031,7 @@ msgstr "4月"
 msgid ""
 "It will select this default confirmation event mail value when you choose "
 "this event"
-msgstr ""
+msgstr "当你选择了这个活动，它将选择这个默认确认事件邮件价值"
 
 #. module: event
 #: view:report.event.registration:0
@@ -1088,6 +1097,13 @@ msgid ""
 "        <p>Thank you for your participation!</p>\n"
 "        <p>Best regards</p>"
 msgstr ""
+"\n"
+"        &nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>你好，${object.name},</p>\n"
+"&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>你注册的活动${object.event_id.name} "
+"已经被正式记录了，一旦活动确认\n"
+"你将自动接收电子邮件提供您更多的实用信息(如进度、议程…)。\n"
+"&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>谢谢参与!</p>\n"
+"&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:&nbsp:<p>此致敬礼</p>"
 
 #. module: event
 #: help:event.event,reply_to:0
@@ -1097,6 +1113,7 @@ msgid ""
 "registrations confirmation. You can also put the email address of your mail "
 "gateway if you use one."
 msgstr ""
+"在这里添写组织者的邮件地址,当活动或注册确认时，它会自动出现在在邮件的‘回复给’一栏里。如果你电子邮件地址使用的不是默认网关的话，则需要添写邮件网关。"
 
 #. module: event
 #: view:event.event:0

addons/l10n_multilang/i18n/da.po

@@ -0,0 +1,163 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:06+0000\n"
+"PO-Revision-Date: 2013-11-08 22:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-10 05:54+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "Skabelon for regnskabs position"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "Kontokoden skal være unik pr. firma !"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "Analytisk journal"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Fejl ! Du kan ikke oprette rekursive konto skabeloner."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Skabeloner for kontoplan"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "Beskrivelsen skal være unik pr. firma !"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Fejl ! Du kan ikke oprette rekursive moms koder."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "Konto.moms.skabelon"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "Konto.moms"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "Konto"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Skabeloner for konti"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Fejl ! Du kan ikke oprette rekursive konti."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Journalens navn skal være unik pr. firma !"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analyse konto"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalens kode skal være unik pr. firma !"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "Regnskabs position"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Fejl ! Du kan ikke oprette rekursive analyse konti."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Momskode skabelon"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "Talte sprog"

addons/product_expiry/i18n/bs.po

@@ -0,0 +1,164 @@
+# Bosnian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-10-29 22:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Šunka"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Kravlje mlijeko"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product Life Time"
+msgstr "Vrijeme trajanja proizvoda"
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number should be "
+"removed from the stock."
+msgstr ""
+"Ovo je datum kada roba sa ovim serijskim brojem bi trebala biti uklonjena sa "
+"zalihe."
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods should be removed from the stock."
+msgstr ""
+"Kada je novi serijski broj izdan, ovo je broj dana prije nego bi roba "
+"trebala biti uklonjena sa zalihe."
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product Use Time"
+msgstr "Vrijeme korišćenja proizvoda"
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_product_product
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods starts deteriorating, without being dangerous yet."
+msgstr ""
+"Kada je novi serijski broj izdan, ovo je broj dana prije nego će roba početi "
+"da propada, a da još nije opasno."
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product Removal Time"
+msgstr "Vrijeme uklanjanja proizvoda"
+
+#. module: product_expiry
+#: help:stock.production.lot,alert_date:0
+msgid ""
+"This is the date on which an alert should be notified about the goods with "
+"this Serial Number."
+msgstr ""
+"Ovo je datum kada bi trebalo obavjestiti alarmom o robi sa ovim serijskim "
+"brojem."
+
+#. module: product_expiry
+#: model:ir.model,name:product_expiry.model_stock_production_lot
+msgid "Serial Number"
+msgstr "Serijski broj"
+
+#. module: product_expiry
+#: help:product.product,alert_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before an "
+"alert should be notified."
+msgstr ""
+"Kada je novi serijski broj izdan, ovo je broj dana prije obavjesti alarma."
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr "Datum uklanjanja"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Hljeb"
+
+#. module: product_expiry
+#: view:product.product:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr "Kraj života proizvoda"
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr "Najbolje prije"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr "Francuski sir Camembert"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"When a new a Serial Number is issued, this is the number of days before the "
+"goods may become dangerous and must not be consumed."
+msgstr ""
+"Kada je novi serijski broj izdan, ovo je broj dana prije nego roba postane "
+"opasna i ne smije se konzumirati."
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr "Datum alarma"
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number start "
+"deteriorating, without being dangerous yet."
+msgstr ""
+"Ovo je datum kada roba sa ovim serijskim brojem počinje da propada, ali još "
+"nije opasna."
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid ""
+"This is the date on which the goods with this Serial Number may become "
+"dangerous and must not be consumed."
+msgstr ""
+"Ovo je datum kada roba sa ovim serijskim brojem može postati opasna i ne "
+"smije biti konzumirana."
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product Alert Time"
+msgstr "Vrijeme alarma proizvoda"

addons/product_manufacturer/i18n/bs.po

@@ -0,0 +1,72 @@
+# Bosnian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-10-30 00:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-31 05:17+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer Product Code"
+msgstr "Proizvođačka šifra artikla"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_product
+#: field:product.manufacturer.attribute,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+msgid "Product Template Name"
+msgstr "Naziv predloška proizvoda"
+
+#. module: product_manufacturer
+#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
+msgid "Product attributes"
+msgstr "Atributi proizvoda"
+
+#. module: product_manufacturer
+#: view:product.manufacturer.attribute:0
+#: view:product.product:0
+msgid "Product Attributes"
+msgstr "Atributi proizvoda"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,name:0
+msgid "Attribute"
+msgstr "Atribut"
+
+#. module: product_manufacturer
+#: field:product.manufacturer.attribute,value:0
+msgid "Value"
+msgstr "Vrijednost"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Atributi"
+
+#. module: product_manufacturer
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer Product Name"
+msgstr "Proizvođački naziv proizvoda"
+
+#. module: product_manufacturer
+#: view:product.product:0
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Proizvođač"

addons/product_visible_discount/i18n/bs.po

@@ -0,0 +1,62 @@
+# Bosnian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-10-30 00:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-31 05:17+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:149
+#, python-format
+msgid "No Sale Pricelist Found!"
+msgstr "Nije pronađen prodajni cijenovnik!"
+
+#. module: product_visible_discount
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Vidljiv popust"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:141
+#, python-format
+msgid "No Purchase Pricelist Found!"
+msgstr "Nije pronađen nabavni cijenovnik!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Stavka fakture"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Cjenovnik"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:141
+#, python-format
+msgid "You must first define a pricelist on the supplier form!"
+msgstr "Prvo morate definisati cijenovnik na formi dobavljača!"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Stavka prodajne narudžbe"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:149
+#, python-format
+msgid "You must first define a pricelist on the customer form!"
+msgstr "Prvo definišite cijenovnik na formi kupca!"

addons/purchase/i18n/zh_CN.po

@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-28 14:29+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2013-11-08 09:30+0000\n"
+"Last-Translator: jeffery chen fan <jeffery9@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 05:08+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
+"X-Launchpad-Export-Date: 2013-11-10 05:53+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -530,7 +530,7 @@ msgstr "询价单批准"
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
-msgstr "接受"
+msgstr "应用"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1418,7 +1418,7 @@ msgstr "3月"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Receive Invoice"
-msgstr "收到的发票"
+msgstr "接收传票"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1731,7 +1731,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoice Received"
-msgstr "收到的发票"
+msgstr "已收传票"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0

addons/web_shortcuts/i18n/fi.po

@@ -0,0 +1,25 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-11-08 21:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-10 05:54+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Lisää / Poista pikavalinta..."