[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121129130433-wbcix78s6tdwc3r0

146 files changed, 3236 insertions, 1500 deletions

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5c5a25880cb..48fec608195 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -435,7 +435,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 449810103b2..460104fe4bc 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-25 23:52+0000\n"
-"Last-Translator: Sergio Corato <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:42+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -26,6 +26,7 @@ msgstr "Sistema di pagamento"
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
+"Una posizione fiscale può essere definita una sola volta per lo stesso conto."
 
 #. module: account
 #: view:account.unreconcile:0
@@ -85,7 +86,7 @@ msgstr "Importa da fatture o pagamenti"
 #: code:addons/account/account_move_line.py:1303
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Conto Errato!"
 
 #. module: account
 #: view:account.move:0
@@ -242,7 +243,7 @@ msgstr "Sezionale: %s"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "N. di cifre da usare per il codice conto"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -394,7 +395,7 @@ msgstr "Annulla Riconciliazione"
 #. module: account
 #: field:account.config.settings,module_account_budget:0
 msgid "Budget management"
-msgstr ""
+msgstr "Gestione Budget"
 
 #. module: account
 #: view:product.template:0
@@ -416,7 +417,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Consenti valute multiple"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
@@ -437,12 +438,12 @@ msgstr "Giugno"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Devi selezionare i conti da riconciliare."
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Abilita la contabilità analitica."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -462,7 +463,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Commerciale"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -685,12 +686,12 @@ msgstr "Il contabile conferma la registrazione"
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
 #, python-format
 msgid "Nothing to reconcile"
-msgstr ""
+msgstr "Nulla da riconciliare"
 
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Accuratezza decimale nelle registrazioni sezionale"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -725,6 +726,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
+"Il sezionale specificato non ha registrazioni in stato bozza per questo "
+"periodo."
 
 #. module: account
 #: view:account.fiscal.position:0
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 73b1e82e244..0a8b6e23ad5 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-27 20:06+0000\n"
+"PO-Revision-Date: 2012-11-28 13:31+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5220,7 +5220,7 @@ msgstr "Fakturaer"
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Kryss av denne boksen hvis dette selskapet er en juridisk enhet."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5453,7 +5453,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Finansiell ledelse."
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5469,7 +5469,7 @@ msgstr "Bevegelser"
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Kontontboks linjer."
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
@@ -5515,6 +5515,8 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Det er ingen periode definert for denne datoen:% s.\n"
+"Vennligst opprette en."
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5616,7 +5618,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1326
 #, python-format
 msgid "%s <b>paid</b>."
-msgstr ""
+msgstr "%s <b>Betalt</b>."
 
 #. module: account
 #: view:account.financial.report:0
@@ -5759,7 +5761,7 @@ msgstr "Beregningskode (dersom type=kode)"
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "Kan ikke finne en kontoplan for dette selskapet, du bør opprette en."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5894,7 +5896,7 @@ msgstr "Inkludert i basisbeløpet"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Leverandør faktura nummer."
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5915,6 +5917,8 @@ msgstr "Beregning"
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"Du kan ikke legge til / endre oppføringer i en lukket periode% s av "
+"tidsskriftet% s."
 
 #. module: account
 #: view:account.journal:0
@@ -5939,7 +5943,7 @@ msgstr "Periodestart"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Eiendel Vis."
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -6012,12 +6016,12 @@ msgstr "Årsavslutningsjournal"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Utkast refusjon. "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Fyll ut dette skjemaet hvis du setter penger i kasse apparatet:"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -6094,7 +6098,7 @@ msgstr "Kundefakturaer og kreditnotaer"
 #: code:addons/account/wizard/account_move_journal.py:161
 #, python-format
 msgid "This period is already closed."
-msgstr ""
+msgstr "Denne perioden er allerede lukket."
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -6107,7 +6111,7 @@ msgstr "Valutabeløp"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Runde per. linje."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -6168,7 +6172,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Du må angi en periode lengde større enn 0."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6179,7 +6183,7 @@ msgstr "Regnskapsstatus Mal"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Utkast refusjon."
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6216,7 +6220,7 @@ msgstr "Avstem med nedskriving"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en konto av typen visning."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6291,7 +6295,7 @@ msgstr "Flytt navn (id): %s (%s)"
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard Entries"
-msgstr ""
+msgstr "Standard oppføringer."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6364,7 +6368,7 @@ msgstr "Avgiftskartlegging"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Velg Firma."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6438,7 +6442,7 @@ msgstr "Antall linjer"
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(Oppdatering)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6480,7 +6484,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Tap konto."
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -6742,7 +6746,7 @@ msgstr ""
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Bank og kontant."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6828,7 +6832,7 @@ msgstr "Fordring"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Du kan ikke opprette journal enmer i en lukker konto."
 
 #. module: account
 #: code:addons/account/account_invoice.py:594
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 51633c9e660..365e5f20596 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-25 13:43+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 21:53+0000\n"
+"Last-Translator: Thomas Pot (Open2bizz) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:41+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #, python-format
 #~ msgid "Integrity Error !"
@@ -155,6 +155,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om de zichtbare kolommen van een dagboek te "
+"specificeren.\n"
+"              </p><p>\n"
+"                Dagboekweergaves bepalen de manier waarop boekingen \n"
+"                ingevoerd kunnen worden. Selecteer de velden welke zichtbaar "
+"\n"
+"                moeten zijn en bepaald de volgorde daarvan.\n"
+"              </p><p>\n"
+"                In de dagboekinstellingen kan bepaald worden welke gegevens\n"
+"                zichtbaar zijn bij boekingen in het betreffende dagboek.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -205,6 +218,8 @@ msgid ""
 "which is set after generating opening entries from 'Generate Opening "
 "Entries'."
 msgstr ""
+"U dient het 'Jaarafsluiting dagboek' te definiëren voor het fiscale jaar, "
+"nadat u een openingsbalans heeft gemaakt"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -223,6 +238,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                klik hier om een fiscale periode toe te voegen.\n"
+"              </p><p>\n"
+"                Een fiscale periode is vaak een maand of een kwartaal. "
+"Normaal\n"
+"                zal dit gelijk zijn met de periode van uw Belasting "
+"aangifte.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -243,7 +267,7 @@ msgstr "Dagboek: %s"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Aantal cijfers voor de rekening code"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -263,6 +287,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Geef de kostenplaats welke standaard gebruikt moet worden bij BTW factuur "
+"regels. Als u dit veld niet invuld, wordt er standaard geen kostenplaats "
+"gebruikt."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -298,7 +325,7 @@ msgstr "Belgische overzichten"
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
-msgstr ""
+msgstr "View opbrengsten"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -314,7 +341,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
 msgid "Next credit note number"
-msgstr ""
+msgstr "Volgend nummer creditnota"
 
 #. module: account
 #: help:account.config.settings,module_account_voucher:0
@@ -323,6 +350,10 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Deze module bevat alle voorzieningen voor registratie van "
+"(bank)afschriften.\n"
+"                                                                          "
+"hiermee installeert u de module 'account_voucher'"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -361,6 +392,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik hier om een creditnota te maken. \n"
+"              </p><p>\n"
+"                Een creditnota is een factuur, waarbij u een bestaande "
+"factuur volledig of gedeeltelijk \n"
+"                crediteert.\n"
+"              </p><p>\n"
+"                In plaats van handmatig kunt u hiermee een creditnota maken "
+"\n"
+"                direct vanaf de originele factuur.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -426,12 +469,12 @@ msgstr "Juni"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Selecteer de grootboekrekeningen die afgeletterd moeten worden."
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "stelt u in staat kostenplaatsen te gebruiken"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -531,6 +574,18 @@ 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 ""
+"Als u 'afronden per regel' selecteert: voor elke BTW rekening , wordt het "
+"BTW bedrag eerst berekend en afgerond voor elke  factuur regel en vervolgens "
+"worden deze afgeronde bedragen opgeteld, wat leidt tot het totale bedrag "
+"voor deze belasting. \r\n"
+"\r\n"
+"Als u 'afronden globaal' selecteert: voor elke BTW rekening wordt het BTW "
+"bedrag berekend voor elke factuur regel. vervolgens zullen deze bedragen "
+"worden opgeteld en uiteindelijk wordt dit totale BTW bedrag afgerond. \r\n"
+"\r\n"
+"Als u verkoopt met BTW inbegrepen, moet u kiezen voor 'afronden per regel', "
+"omdat U zeker wil zijn dat de subtotalen van \r\n"
+"uw (BTW inbegrepen) regels gelijk zijn aan het totale bedrag met BTW."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -600,7 +655,7 @@ msgstr "Bovenliggend doel"
 #. module: account
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Geeft de volgorde van de factuur regel bij het tonen van de factuur"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -679,7 +734,7 @@ msgstr "Niets af te letteren"
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Aantal decimalen van journaalposten"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -713,7 +768,7 @@ msgstr "Rapport waarde"
 msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
-msgstr ""
+msgstr "Geselecteerd dagboek heeft geen 'concept'boekingen"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -768,12 +823,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Geen journaalposten gevonden.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1606
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "U kunt geen boeking doen met een andere valuta dan ..."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 55d61f5c611..c95e3919012 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-01 08:44+0000\n"
+"PO-Revision-Date: 2012-11-28 07:22+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:01+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -776,7 +776,7 @@ msgstr "账簿的会计期间"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "在每个会计期间，你不可以创建1个以上的总分类凭证"
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -784,7 +784,7 @@ msgid ""
 "Set the analytic account that will be used by default on the invoice tax "
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
-msgstr ""
+msgstr "设置辅助核算项，用于退款时发票上默认税科目。如果默认不要在发票的税上 使用辅助核算项，留空。"
 
 #. module: account
 #: view:account.account:0
@@ -6098,7 +6098,7 @@ msgstr "固定金额"
 #: code:addons/account/account_move_line.py:1151
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
-msgstr ""
+msgstr "你不能修改税，你需要删去并且重建这一行"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index db12ba122d0..2436e754e50 100644
--- a/addons/account_accountant/i18n/it.po
+++ b/addons/account_accountant/i18n/it.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-11-24 02:51+0000\n"
-"PO-Revision-Date: 2011-01-17 07:34+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:50+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Apri Menù Contabilità"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabile"
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
index bf7c124bb91..4c6bde2bcf6 100644
--- a/addons/account_analytic_analysis/i18n/es_MX.po
+++ b/addons/account_analytic_analysis/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index fef85e92608..4a446cf3fb7 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-08-23 11:12+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 13:42+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:06+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "No order to invoice, create"
-msgstr ""
+msgstr "Ingen ordre til å fakturere, opprett."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -30,12 +30,12 @@ msgstr "Grupper etter ..."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Å fakturere."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "Gjenstår."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -74,7 +74,7 @@ msgstr ""
 #. 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
@@ -109,12 +109,12 @@ msgstr "Beregnet ved hjelp av formelen: Fakturert beløp / Total tid"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Kontrakter som ikke er tilordnet."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -162,7 +162,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "Forventet."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -185,7 +185,7 @@ msgstr "Fakturert tid"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -209,18 +209,18 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Ikke noe å fakturere, opprett."
 
 #. 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 "Template of Contract"
-msgstr ""
+msgstr "Mal av kontrakt."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Totalt arbeids tid."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -240,7 +240,7 @@ msgstr "Beregnet etter formelen: (Virkelig margin / Totale kostnader) * 100"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "Eller vis."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -257,7 +257,7 @@ msgstr "Måned"
 #: 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 og materialer til å fakturere."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -268,7 +268,7 @@ msgstr "Kontrakter"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdato."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -296,13 +296,13 @@ msgstr "Ventende kontrakter til å fornye med dine kunder"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Timelister."
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
 #, python-format
 msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "Salgs ordre linjer av %s."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -317,7 +317,7 @@ msgstr "Forfalt Antall"
 #. 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
@@ -339,7 +339,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Salgsordre."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -391,7 +391,7 @@ msgstr "Kontrakt"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturert."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -426,12 +426,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Totalt å fakturere."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Sale Orders"
-msgstr ""
+msgstr "Salgs ordre."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -441,7 +441,7 @@ msgstr "Åpen"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Totalt fakturert."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -451,7 +451,7 @@ msgstr "Beregnet med formelen: Maks. fakturapris - fakturert beløp"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarlig."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -504,7 +504,7 @@ msgstr "Kontrakter til å fornye"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summen av alt som kunne blitt fakturert for denne kontrakten."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -514,7 +514,7 @@ msgstr "Teoretisk margin"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Totalt gjenværende."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -529,7 +529,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "Fikset pris."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index a331655d94c..51c94655542 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 02:53+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 02:09+0000\n"
+"Last-Translator: digitalsatori <digisatori@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: 2012-11-25 06:06+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -29,12 +29,12 @@ msgstr "分组..."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "开票"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "剩余"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -111,7 +111,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
diff --git a/addons/account_analytic_default/i18n/es_MX.po b/addons/account_analytic_default/i18n/es_MX.po
index b49ba52c5ec..3e6c5ce6837 100644
--- a/addons/account_analytic_default/i18n/es_MX.po
+++ b/addons/account_analytic_default/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
diff --git a/addons/account_analytic_plans/i18n/es_MX.po b/addons/account_analytic_plans/i18n/es_MX.po
index e2f05df843c..0e6ac25281b 100644
--- a/addons/account_analytic_plans/i18n/es_MX.po
+++ b/addons/account_analytic_plans/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index 3b59a5409be..80ab2d4a4c8 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 04:10+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:38+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:07+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -95,7 +95,7 @@ msgstr "项 ID"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -136,7 +136,7 @@ msgstr "BBA传输结构有误！"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "没有辅助核算计划定义"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -187,7 +187,7 @@ msgstr "百分比"
 #: 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 "没有辅助核算行关联到科目%s."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -229,7 +229,7 @@ msgstr "辅助核算方案明细"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement:0
@@ -257,7 +257,7 @@ msgstr "币别"
 #. module: account_analytic_plans
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -272,7 +272,7 @@ msgstr "项5 ID"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建账目项目"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -294,7 +294,7 @@ msgstr "日期到"
 #: 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 "你必须在'%s' 分类账定义一个辅助核算分类账"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -408,7 +408,7 @@ msgstr "项4 ID"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "总计在  %s 和 %s 之间。"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -461,7 +461,7 @@ msgstr "账簿"
 msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
-msgstr ""
+msgstr "配置错误"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
@@ -481,19 +481,19 @@ msgstr "分摊模型"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "用户错误！"
 
 #. module: account_analytic_plans
 #: 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 "保存模型前请输入名称和代码"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
@@ -505,7 +505,7 @@ msgstr "开始日期"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -521,13 +521,13 @@ msgstr "每个公司的账簿名称必须唯一！"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "这个名称和代码的模型已经存在。"
 
 #~ msgid "Select Information"
 #~ msgstr "选择信息"
diff --git a/addons/account_anglo_saxon/i18n/es_MX.po b/addons/account_anglo_saxon/i18n/es_MX.po
index ae8e2eb2dee..48ca0408128 100644
--- a/addons/account_anglo_saxon/i18n/es_MX.po
+++ b/addons/account_anglo_saxon/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po
index 7684caf86dc..5caeb5db1b1 100644
--- a/addons/account_asset/i18n/es_MX.po
+++ b/addons/account_asset/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_MX.po b/addons/account_bank_statement_extensions/i18n/es_MX.po
index 2abefb1cd5d..20e10de3af1 100644
--- a/addons/account_bank_statement_extensions/i18n/es_MX.po
+++ b/addons/account_bank_statement_extensions/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/zh_CN.po b/addons/account_bank_statement_extensions/i18n/zh_CN.po
index cff59afe339..9ff4a317ead 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_CN.po
+++ b/addons/account_bank_statement_extensions/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 14:55+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:46+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -59,7 +59,7 @@ msgstr "取消所选的表行"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "起息日"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -109,7 +109,7 @@ msgstr "批量付款信息"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -117,12 +117,12 @@ msgstr ""
 msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
-msgstr ""
+msgstr "不允许删除。为了删除和(或)修改银行对账单行，请到关联的银行对账单操作。"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -234,7 +234,7 @@ msgstr "手工"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "银行交易"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -303,7 +303,7 @@ msgstr "编号"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
@@ -351,7 +351,7 @@ msgstr "银行单据行"
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po
index 556834afe50..a8db4b573ea 100644
--- a/addons/account_budget/i18n/es_MX.po
+++ b/addons/account_budget/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index a3a3d2c11fc..3b90c1fdf50 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-09-09 07:05+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-28 16:01+0000\n"
+"Last-Translator: Andrius Preimantas <andrius.preimantas@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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -27,7 +27,7 @@ msgstr ""
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Atsakingas naudotojas"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -38,12 +38,12 @@ msgstr "Patvirtinta"
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr ""
+msgstr "Biudžeto pozicija"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Atspausdinta:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -53,17 +53,17 @@ msgstr "Patvirtinti"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "Patvirtinti vartotoją"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "Spausdinti suvestinę"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "Apmokėjimo data"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_to:0
@@ -82,7 +82,7 @@ msgstr "Juodraštis"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr ""
+msgstr "ties"
 
 #. module: account_budget
 #: view:account.budget.report:0
@@ -104,12 +104,12 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Patvirtintas"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procentai"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
@@ -120,7 +120,7 @@ msgstr "Būsena"
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "Biudžetui '%s' nepriskirtos sąskaitos!"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -131,24 +131,24 @@ msgstr "Aprašas"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Valiuta"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Total :"
-msgstr ""
+msgstr "Iš viso:"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Klaida! Negalima kurti rekursivių analitinių sąskaitų"
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Įmonė"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -158,20 +158,20 @@ msgstr "iki"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Atstatyti į juodraštį"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "Suplanuota suma"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Procentai (%)"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -183,7 +183,7 @@ msgstr "Atlikta"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Praktinė suma"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -191,7 +191,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "Praktinė suma"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
@@ -203,12 +203,12 @@ msgstr "Pabaigos data"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr ""
+msgstr "Biudžeto ataskaita analitinei sąskaitai"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "Teorinė suma"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -219,7 +219,7 @@ msgstr "Pavadinimas"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Biudžeto eilutė"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -234,12 +234,12 @@ msgstr "Biudžetas"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve Budgets"
-msgstr ""
+msgstr "Patvirtinti biudžetą"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Trukmė"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -251,7 +251,7 @@ msgstr "Kodas"
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "Šis vedlys naudojamas atspausdinti biudžetui"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -267,7 +267,7 @@ msgstr "Biudžetai"
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "Šis vedlys naudojamas atspausdinti biudžetų suvestinei"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -277,19 +277,19 @@ msgstr "Nutrauktas"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr ""
+msgstr "Biudžeto pozicija"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_from:0
@@ -308,13 +308,13 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Teorinė suma"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Klaida!"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -329,7 +329,7 @@ msgstr "Spausdinti"
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "Teorinė suma"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -337,7 +337,7 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "arba"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -348,7 +348,7 @@ msgstr "Analitinė sąskaita"
 #. module: account_budget
 #: report:account.budget:0
 msgid "Budget :"
-msgstr ""
+msgstr "Biudžetas:"
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -377,7 +377,7 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Planuojama suma"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -397,7 +397,7 @@ msgstr "Sąskaitos"
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr ""
+msgstr "Biudžeto eilutės"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -418,12 +418,12 @@ msgstr "Pradžios data"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "Analizė nuo"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr ""
+msgstr "Nepatvirtinti biudžetai"
 
 #~ msgid "% performance"
 #~ msgstr "% vykdymas"
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 34c4352185f..e8c99e31e4c 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:50+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:47+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "合计:"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能递归创建辅助核算项"
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "待审核的预算"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "理论金额"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_cancel/i18n/it.po b/addons/account_cancel/i18n/it.po
index 153dc063447..fcd3aecdb5b 100644
--- a/addons/account_cancel/i18n/it.po
+++ b/addons/account_cancel/i18n/it.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-11-21 07:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:46+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
 
 #~ msgid "Account Cancel"
 #~ msgstr "Account Cancel"
diff --git a/addons/account_check_writing/i18n/zh_CN.po b/addons/account_check_writing/i18n/zh_CN.po
index b91e5204fbc..9f0ab53eca6 100644
--- a/addons/account_check_writing/i18n/zh_CN.po
+++ b/addons/account_check_writing/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:58+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -110,6 +110,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 创建一个新的支票。\n"
+"              </p><p>\n"
+"                支票支付表单允许跟踪用支票支付给供应商的过程。\n"
+"                当年选择了一个供应商，Openerp 将自动提供 支付\n"
+"                方法和支付金额，用于核销待支付的供应商发票和\n"
+"               单据。\n"
+"              </p>\n"
+"            "
 
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
@@ -131,7 +140,7 @@ msgstr "用预先打印的支票"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
 msgid "Print Check (Bottom)"
-msgstr ""
+msgstr "打印支票（底部）"
 
 #. module: account_check_writing
 #: sql_constraint:res.company:0
@@ -148,14 +157,14 @@ msgstr "到期日期"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
 msgid "Print Check (Middle)"
-msgstr ""
+msgstr "打印支票（中间）"
 
 #. module: account_check_writing
 #: constraint:account.journal:0
 msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
-msgstr ""
+msgstr "配置错误！"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
@@ -171,7 +180,7 @@ msgstr "截止余额"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
 msgid "Print Check (Top)"
-msgstr ""
+msgstr "打印支票（顶部）"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
diff --git a/addons/account_sequence/i18n/zh_CN.po b/addons/account_sequence/i18n/zh_CN.po
index 30711dedc44..e27fb65f3a5 100644
--- a/addons/account_sequence/i18n/zh_CN.po
+++ b/addons/account_sequence/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 04:00+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:24+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建账目项目"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -112,14 +112,14 @@ msgstr "名称"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
 
 #. module: account_sequence
 #: constraint:account.journal:0
 msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
-msgstr ""
+msgstr "配置错误"
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
@@ -130,7 +130,7 @@ msgstr "错误的分录"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "在每个会计期间，你不可以创建1个以上的总分类凭证"
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
@@ -140,7 +140,7 @@ msgstr "内部序列"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
 
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 323be77f334..284632b9b5f 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,9 +8,9 @@
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_open'][last()]" position="after">
                     <button name="invoice_pay_customer" type="object" string="Register Payment"
-                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}"/>
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}" groups="base.group_user"/>
                     <button name="invoice_pay_customer" type="object" string="Register Payment"
-                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight"/>
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight" groups="base.group_user"/>
                 </xpath>
             </field>
         </record>
@@ -20,7 +20,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_open'][last()]" position="after">
-                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" class="oe_highlight"/>
+                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" class="oe_highlight" groups="base.group_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/anonymization/i18n/zh_CN.po b/addons/anonymization/i18n/zh_CN.po
index 6ad6b0c1016..0ba47de11c4 100644
--- a/addons/anonymization/i18n/zh_CN.po
+++ b/addons/anonymization/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-02 09:55+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:50+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -25,17 +25,17 @@ msgstr "ir.model.fields.anonymize.wizard"
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
-msgstr ""
+msgstr "ir.model.fields.anonymization.migration.fix"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,target_version:0
 msgid "Target Version"
-msgstr ""
+msgstr "目标版本"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "sql"
-msgstr ""
+msgstr "sql"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
@@ -62,7 +62,7 @@ msgstr "ir.model.fields.anonymization"
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,direction:0
@@ -135,7 +135,7 @@ msgstr "隐藏数据库"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "python"
-msgstr ""
+msgstr "python"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
@@ -189,7 +189,7 @@ msgstr "隐藏日志"
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,model_name:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
@@ -201,7 +201,7 @@ msgstr "ir.model.fields.anonymization.history"
 msgid ""
 "This is the file created by the anonymization process. It should have the "
 "'.pickle' extention."
-msgstr ""
+msgstr "这个文件有匿名进程创建，他没有 '.pickle' 扩展名"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -217,7 +217,7 @@ msgstr "文件名"
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "编号"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
@@ -238,7 +238,7 @@ msgstr "完成"
 #: field:ir.model.fields.anonymization.migration.fix,query:0
 #: field:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "Query"
-msgstr ""
+msgstr "查询"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 79468fdf936..344c8a6bdd9 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-26 05:10+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 06:31+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -44,7 +44,7 @@ msgstr "已订阅"
 #: code:addons/audittrail/audittrail.py:408
 #, python-format
 msgid "'%s' Model does not exist..."
-msgstr ""
+msgstr "'%s' 模型不存在..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -61,7 +61,7 @@ msgstr "审计跟踪规则"
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -215,7 +215,7 @@ msgstr "选择您要生成审计日志的对象"
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "审核"
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
@@ -294,7 +294,7 @@ msgstr "记录删除操作"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -335,7 +335,7 @@ msgstr "新值"
 #: code:addons/audittrail/audittrail.py:223
 #, python-format
 msgid "'%s' field does not exist in '%s' model"
-msgstr ""
+msgstr "字段 '%s' 不存在于模型 '%s'"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -387,7 +387,7 @@ msgstr "日志明细"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
diff --git a/addons/auth_ldap/i18n/zh_CN.po b/addons/auth_ldap/i18n/zh_CN.po
index ae4574e298f..3cd6d465fa5 100644
--- a/addons/auth_ldap/i18n/zh_CN.po
+++ b/addons/auth_ldap/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:35+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 07:07+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: auth_ldap
 #: constraint:res.company:0
@@ -30,7 +30,7 @@ msgstr "选择的用户组不在这用允许的用户组"
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
 msgid "Template User"
-msgstr ""
+msgstr "用户模版"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -71,7 +71,7 @@ msgstr "LDAP 服务器端口"
 msgid ""
 "Automatically create local user accounts for new users authenticating via "
 "LDAP"
-msgstr ""
+msgstr "通过LDAP，为新用户自动创建本地用户账户。"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -96,7 +96,7 @@ msgstr "LDAP 密码"
 #. module: auth_ldap
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者唯一的"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_company
@@ -116,7 +116,7 @@ msgstr "res.company.ldap"
 #. module: auth_ldap
 #: help:res.company.ldap,user:0
 msgid "User to copy when creating new users"
-msgstr ""
+msgstr "当创建新用户时，复制用户"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_tls:0
@@ -164,12 +164,12 @@ msgstr "LDAP 服务器上的用户帐号密码，用于查询该目录服务。"
 #. module: auth_ldap
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_binddn:0
diff --git a/addons/auth_oauth/i18n/zh_CN.po b/addons/auth_oauth/i18n/zh_CN.po
new file mode 100644
index 00000000000..f8c15e694f9
--- /dev/null
+++ b/addons/auth_oauth/i18n/zh_CN.po
@@ -0,0 +1,150 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 14:27+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,validation_endpoint:0
+msgid "Validation URL"
+msgstr "验证  URL"
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,auth_endpoint:0
+msgid "Authentication URL"
+msgstr "身份验证URL"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_oauth
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,scope:0
+msgid "Scope"
+msgstr "作用域"
+
+#. module: auth_oauth
+#: field:res.users,oauth_provider_id:0
+msgid "OAuth Provider"
+msgstr "OAuth Provider"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,css_class:0
+msgid "CSS class"
+msgstr "CSS class"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,body:0
+msgid "Body"
+msgstr "正文"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,sequence:0
+msgid "unknown"
+msgstr "未知"
+
+#. module: auth_oauth
+#: field:res.users,oauth_access_token:0
+msgid "OAuth Access Token"
+msgstr "OAuth  访问令牌"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,client_id:0
+#: field:base.config.settings,auth_oauth_facebook_client_id:0
+#: field:base.config.settings,auth_oauth_google_client_id:0
+msgid "Client ID"
+msgstr "Client ID"
+
+#. module: auth_oauth
+#: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers
+msgid "OAuth Providers"
+msgstr "OAuth Providers"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_auth_oauth_provider
+msgid "OAuth2 provider"
+msgstr "OAuth2 provider"
+
+#. module: auth_oauth
+#: field:res.users,oauth_uid:0
+msgid "OAuth User ID"
+msgstr "OAuth User ID"
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_facebook_enabled:0
+msgid "Allow users to sign in with Facebook"
+msgstr "允许用户用Facebook登录"
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
+
+#. module: auth_oauth
+#: help:res.users,oauth_uid:0
+msgid "Oauth Provider user_id"
+msgstr "Oauth Provider user_id"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,data_endpoint:0
+msgid "Data URL"
+msgstr "数据URL"
+
+#. module: auth_oauth
+#: view:auth.oauth.provider:0
+msgid "arch"
+msgstr "arch"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,name:0
+msgid "Provider name"
+msgstr "Provider 名称"
+
+#. module: auth_oauth
+#: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
+msgid "Providers"
+msgstr "Providers"
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_google_enabled:0
+msgid "Allow users to sign in with Google"
+msgstr "允许用户通过google登录"
+
+#. module: auth_oauth
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,enabled:0
+msgid "Allowed"
+msgstr "允许"
diff --git a/addons/auth_reset_password/i18n/it.po b/addons/auth_reset_password/i18n/it.po
new file mode 100644
index 00000000000..c330056fe66
--- /dev/null
+++ b/addons/auth_reset_password/i18n/it.po
@@ -0,0 +1,74 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 19:58+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non è possibile avere due utenti con lo stesso login!"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "Utenti"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "il UID OAuth deve essere unico per provider"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Reimposta Password"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "Ripristino password"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Errore: codice EAN non valido"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "L'azienda scelta non è fra le aziende abilitate per questo utente"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "Reimposta password"
diff --git a/addons/auth_reset_password/i18n/zh_CN.po b/addons/auth_reset_password/i18n/zh_CN.po
new file mode 100644
index 00000000000..ee06973b4c6
--- /dev/null
+++ b/addons/auth_reset_password/i18n/zh_CN.po
@@ -0,0 +1,78 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 07:14+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+"\n"
+"一个关联到这个Email地址的Openerp帐号请求复位密码。\n"
+"你可以修改你的密码通过下面这个链接  <a href=\"${object.signup_url}\">。\n"
+"提醒：如果你没请求复位密码，请忽略这封邮件。"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者唯一的"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "重置密码"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "重置密码"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "重设密码"
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
new file mode 100644
index 00000000000..20b4ca05e9c
--- /dev/null
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -0,0 +1,170 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 16:52+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. 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:15
+#, python-format
+msgid "Confirm Password"
+msgstr "确认密码"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. 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
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#, python-format
+msgid "Sign Up"
+msgstr "注册"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr "新建"
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+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 "注册 URL"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:20
+#, python-format
+msgid "Sign in"
+msgstr "登录"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+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
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:11
+#, python-format
+msgid "Username"
+msgstr "用户名"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:7
+#, python-format
+msgid "Name"
+msgstr "姓名"
+
+#. module: auth_signup
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username (Email)"
+msgstr "用户名(Email)"
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr "注册过期"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Log in"
+msgstr "登录"
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr "注册令牌（ Token  ）是有效的"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr "复位密码"
+
+#. module: auth_signup
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "错误，您不能创建循环引用的会员用户"
+
+#. module: auth_signup
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#, python-format
+msgid "Back to Login"
+msgstr "返回登录页面"
+
+#. module: auth_signup
+#: constraint:res.partner:0
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. 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 "注册令牌（ Token ）"
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index a6b401a4c7b..241c2406d56 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -52,6 +52,8 @@ openerp.auth_signup = function(instance) {
             if (result.token) {
                 // switch to signup mode, set user name and login
                 this.$el.addClass("oe_login_signup");
+                self.$(".oe_signup_show").show();
+                self.$(".oe_signup_hide").hide();
                 this.$("form input[name=name]").val(result.name).attr("readonly", "readonly");
                 if (result.login) {
                     this.$("form input[name=login]").val(result.login).attr("readonly", "readonly");
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 8590bcb8b49..84c03d68dbd 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -5,7 +5,7 @@
     <!-- Read/Unread actions -->
 
     <record id="actions_server_crm_meeting_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">CRM Meeting: Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
@@ -23,7 +23,7 @@
     </record>
 
     <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">CRM Meeting: Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index 4fb5c3afbca..8d5d3f545f1 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/i18n/zh_CN.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 16:50+0000\n"
+"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "事件开始时"
+msgstr "活动开始"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr "我的事件"
+msgstr "我的活动"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -40,14 +40,14 @@ msgstr "这属性定义循环日程的日期/时间异常列表。"
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "用户无权操作所选择公司数据"
+msgstr "选择的公司不属于此用户允许访问的公司。"
 
 #. module: base_calendar
 #: field:calendar.event,we:0
 #: field:calendar.todo,we:0
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr "周三"
+msgstr "星期三"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
@@ -64,13 +64,13 @@ msgstr "定期会议"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet5
 msgid "Feedback Meeting"
-msgstr ""
+msgstr "会议反馈"
 
 #. module: base_calendar
 #: code:addons/base_calendar/crm_meeting.py:117
 #, python-format
 msgid "Meeting <b>completed</b>."
-msgstr ""
+msgstr "会议<b>完成</b>."
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -83,7 +83,7 @@ msgstr "提醒"
 #: selection:calendar.todo,week_list:0
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "周日"
+msgstr "星期天"
 
 #. module: base_calendar
 #: field:calendar.attendee,role:0
@@ -147,14 +147,14 @@ msgstr "指定类型的邀请"
 #: view:crm.meeting:0
 #: field:crm.meeting,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "周五"
+msgstr "星期五"
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
@@ -182,12 +182,12 @@ msgstr "空闲"
 #. module: base_calendar
 #: help:crm.meeting,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr "标明是否要求答复赞成"
+msgstr "标明是否要求答复"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
@@ -209,7 +209,7 @@ msgstr "事件"
 #: field:calendar.todo,tu:0
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "周二"
+msgstr "星期二"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -222,7 +222,7 @@ msgstr "第三个"
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "这事件结束时"
+msgstr "这活动结束时"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -234,12 +234,12 @@ msgstr "最近"
 #. module: base_calendar
 #: help:crm.meeting,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: base_calendar
 #: field:crm.meeting,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -266,7 +266,7 @@ msgstr "主席"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "我的会议"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
@@ -303,12 +303,12 @@ msgstr ""
 #. module: base_calendar
 #: field:crm.meeting,name:0
 msgid "Meeting Subject"
-msgstr ""
+msgstr "会议主题"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of Recurrence"
-msgstr ""
+msgstr "循环结束"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -329,7 +329,7 @@ msgstr "选择重复会议的日子"
 #: view:crm.meeting:0
 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
 msgid "Meetings"
-msgstr ""
+msgstr "会议"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
@@ -342,19 +342,19 @@ msgstr "循环日期"
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "事件结束日期"
+msgstr "活动结束日期"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr "可参与"
+msgstr "可选择参与"
 
 #. module: base_calendar
 #: help:crm.meeting,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: base_calendar
 #: code:addons/base_calendar/base_calendar.py:388
diff --git a/addons/base_crypt/i18n/it.po b/addons/base_crypt/i18n/it.po
index 1425a8c7924..e82a13db711 100644
--- a/addons/base_crypt/i18n/it.po
+++ b/addons/base_crypt/i18n/it.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-28 19:47+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Errore: codice EAN non valido"
 
 #. module: base_crypt
 #: constraint:res.users:0
@@ -30,12 +30,12 @@ msgstr "L'azienda scelta non è fra le aziende abilitate per questo utente"
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "il UID OAuth deve essere unico per provider"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po
index 200f04f2971..25cb55361b9 100644
--- a/addons/base_crypt/i18n/zh_CN.po
+++ b/addons/base_crypt/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-06-22 08:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-28 06:30+0000\n"
+"Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: base_crypt
 #: constraint:res.users:0
@@ -30,17 +30,17 @@ msgstr "用户无权操作所选择公司数据"
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者唯一的"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "你不能同时登录两个用户！"
+msgstr "两个用户不能使用相同的用户名！"
 
 #, python-format
 #~ msgid "Error"
diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
index c831ffd229d..b926c6b2782 100644
--- a/addons/base_import/controllers.py
+++ b/addons/base_import/controllers.py
@@ -14,7 +14,7 @@ class ImportController(openerp.addons.web.http.Controller):
             'file': file.read(),
             'file_name': file.filename,
             'file_type': file.content_type,
-        }, req.session.eval_context(req.context))
+        }, req.context)
 
         return 'window.top.%s(%s)' % (
             jsonp, simplejson.dumps({'result': written}))
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 981a8d63301..514223d74e0 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:17+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:53+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -180,7 +180,7 @@ msgstr "Annulla"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 85494807d9c..7fa74452b03 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-10 03:32+0000\n"
+"PO-Revision-Date: 2012-11-28 16:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Emails Integration"
-msgstr ""
+msgstr "Email 集成"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -29,18 +29,18 @@ msgstr "访客"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "联系人"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+msgstr "使用OpenID登陆(Google, Facebook...)"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -63,24 +63,24 @@ msgstr "会员"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "门户访问"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "身份验证"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "报价和销售订单"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "常规设置"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -90,12 +90,12 @@ msgstr "捐助者"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -105,12 +105,12 @@ msgstr "病人"
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "允许导入CSV数据"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "允许多公司操作"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
@@ -120,17 +120,17 @@ msgstr ""
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
-msgstr ""
+msgstr "在邮件客户端"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "自动获取LinkedIn联系人"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
 msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "允许 Thunderbird 插件"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -140,22 +140,22 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "客户特性"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "导入/导出"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "销售特性"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
 msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "允许 Outlook 插件"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -172,7 +172,7 @@ msgstr "承租人"
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "分享或者嵌入任意Openerp屏幕"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -193,6 +193,8 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"工作在多公司环境，公司之间适当地安全访问\n"
+"               为此安装模块multi_company。"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -204,7 +206,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -224,7 +226,7 @@ msgstr "客户"
 #. module: base_setup
 #: help:base.config.settings,module_auth_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "启用Openerp的公共部分，Openerp成为一个公共的web站点"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -237,6 +239,9 @@ msgid ""
 "                Partner from the selected emails.\n"
 "                This installs the module plugin_thunderbird."
 msgstr ""
+"插件允许把你的email和附件存档到Openerp对象。你能选择一个业务伙伴、或者线索，并 选择邮件存为 .eml 文件 附加到在选中记录的附件中。\n"
+"\n"
+"为此要安装模块 plugin_thunderbird."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -252,7 +257,7 @@ msgstr "称呼客户的另一种方式"
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "销售模块配置"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -265,36 +270,39 @@ msgid ""
 "                email into an OpenERP mail message with attachments.\n"
 "                This installs the module plugin_outlook."
 msgstr ""
+"Outlook 插件允许你把 邮件和它附件添加到你选择对象里。 你能选择一个业务伙伴或者线索 对象，并且把选择的邮件存档到一个带附件的 Openerp "
+"邮件消息中。\n"
+"为此要安装模块plugin_outlook."
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer/supplier portal"
-msgstr ""
+msgstr "开启合作伙伴Portal"
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "允许分享单据"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "启用公共门户"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "配置邮箱发件服务器"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "集成社交网络"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -306,7 +314,7 @@ msgstr "取消"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "应用"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -317,12 +325,12 @@ msgstr "指定贵公司所用的术语"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "配置公司信息"
 
 #~ msgid "Report Header"
 #~ msgstr "报表页眉"
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 67c6354fd3b..9858a7fe0cc 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -41,12 +41,10 @@ class base_stage(object):
         """
         if context is None:
             context = {}
-        if not context or not context.get('portal'):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if hasattr(user, 'partner_address_id') and user.partner_address_id:
-            return user.partner_address_id
-        return user.company_id.partner_id.id
+        if context.get('portal'):
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            return user.partner_id.id
+        return False
 
     def _get_default_email(self, cr, uid, context=None):
         """ Gives default email address for current user
@@ -54,10 +52,10 @@ class base_stage(object):
         """
         if context is None:
             context = {}
-        if not context or not context.get('portal'):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.email
+        if context.get('portal'):
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            return user.email
+        return False        
 
     def _get_default_user(self, cr, uid, context=None):
         """ Gives current user id
@@ -65,7 +63,7 @@ class base_stage(object):
         """
         if context is None:
             context = {}
-        if not context or not context.get('portal'):
+        if not context or context.get('portal'):
             return False
         return uid
 
diff --git a/addons/base_status/i18n/zh_CN.po b/addons/base_status/i18n/zh_CN.po
new file mode 100644
index 00000000000..bfb2e6fcebf
--- /dev/null
+++ b/addons/base_status/i18n/zh_CN.po
@@ -0,0 +1,88 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 07:43+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "错误！"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:333
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been <b>opened</b>."
+msgstr "%s 已经被 <b>打开</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:357
+#: code:addons/base_status/base_state.py:220
+#, python-format
+msgid "%s has been <b>renewed</b>."
+msgstr "%s 已经被 <b>更新</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid "Error!"
+msgstr "错误!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr "不能上报，你已经在您销售团队类别中的最高级了。"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:351
+#: code:addons/base_status/base_state.py:214
+#, python-format
+msgid "%s is now <b>pending</b>."
+msgstr "%s 现在 <b>待定</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:345
+#, python-format
+msgid "%s has been <b>cancelled</b>."
+msgstr "%s 已经被 <b>取消</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:208
+#, python-format
+msgid "%s has been <b>canceled</b>."
+msgstr "%s 已经被 <b>取消</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"你已经在您销售团队类别中的最高级了。\n"
+"因此，你不能再上报了。"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:339
+#: code:addons/base_status/base_state.py:202
+#, python-format
+msgid "%s has been <b>closed</b>."
+msgstr "%s 已经被 <b>关闭</b>."
diff --git a/addons/board/controllers.py b/addons/board/controllers.py
index 81557f64fa3..3bdebe1ef26 100644
--- a/addons/board/controllers.py
+++ b/addons/board/controllers.py
@@ -2,7 +2,6 @@
 from xml.etree import ElementTree
 
 import openerp
-from openerp.addons.web import nonliterals
 from openerp.addons.web.controllers.main import load_actions_from_ir_values
 
 class Board(openerp.addons.web.http.Controller):
@@ -11,16 +10,8 @@ class Board(openerp.addons.web.http.Controller):
     @openerp.addons.web.http.jsonrequest
     def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
         # FIXME move this method to board.board model
-        to_eval = nonliterals.CompoundContext(context_to_save)
-        to_eval.session = req.session
-        ctx = dict((k, v) for k, v in to_eval.evaluate().iteritems()
-                   if not k.startswith('search_default_'))
-        ctx['dashboard_merge_domains_contexts'] = False  # TODO: replace this 6.1 workaround by attribute on <action/>
-        domain = nonliterals.CompoundDomain(domain)
-        domain.session = req.session
-        domain = domain.evaluate()
-
-        dashboard_action = load_actions_from_ir_values(req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
+        dashboard_action = load_actions_from_ir_values(
+            req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
 
         if dashboard_action:
             action = dashboard_action[0][2]
@@ -36,7 +27,7 @@ class Board(openerp.addons.web.http.Controller):
                             'name': str(action_id),
                             'string': name,
                             'view_mode': view_mode,
-                            'context': str(ctx),
+                            'context': str(context_to_save),
                             'domain': str(domain)
                         })
                         column.insert(0, new_action)
@@ -45,6 +36,6 @@ class Board(openerp.addons.web.http.Controller):
                             'user_id': req.session._uid,
                             'ref_id': view_id,
                             'arch': arch
-                        }, req.session.eval_context(req.context))
+                        }, req.context)
 
         return False
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index eb835c43e22..13a51cc663e 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -375,11 +375,22 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         var domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
+
+        var c = instance.web.pyeval.eval('context', context);
+        for(var k in c) {
+            if (c.hasOwnProperty(k) && /^search_default_/.test(k)) {
+                delete c[k];
+            }
+        }
+        // TODO: replace this 6.1 workaround by attribute on <action/>
+        c.dashboard_merge_domains_contexts = false;
+        var d = instance.web.pyeval.eval('domain', domain);
+
         this.rpc('/board/add_to_dashboard', {
             menu_id: this.$el.find("select").val(),
             action_id: view_parent.action.id,
-            context_to_save: context,
-            domain: domain,
+            context_to_save: c,
+            domain: d,
             view_mode: view_parent.active_view,
             name: this.$el.find("input").val()
         }).done(function(r) {
diff --git a/addons/contacts/i18n/hu.po b/addons/contacts/i18n/hu.po
index 9b414baee4e..eacc9b22406 100644
--- a/addons/contacts/i18n/hu.po
+++ b/addons/contacts/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/it.po b/addons/contacts/i18n/it.po
new file mode 100644
index 00000000000..e0d4d816737
--- /dev/null
+++ b/addons/contacts/i18n/it.po
@@ -0,0 +1,46 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 19:52+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\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 ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Premere per creare un contatto in rubrica.\n"
+"          </p><p>\n"
+"            OpenERP ti aiuta a tenere traccia delle attività legate\n"
+"            a clienti, discussioni, storia delle opportunità,\n"
+"            document, etc.\n"
+"\n"
+"          </p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Contatti"
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 88b2edcd665..c552b1835f2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -4,7 +4,7 @@
 
         <!-- Read/Unread actions -->
         <record id="actions_server_crm_lead_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">CRM Lead: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
@@ -22,7 +22,7 @@
         </record>
 
         <record id="actions_server_crm_lead_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">CRM Lead: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9cb09e71be2..a6e8dbe397a 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -4,7 +4,7 @@
 
     <!-- Read/Unread actions -->
     <record id="actions_server_crm_phonecall_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">CRM Phonecall: Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
@@ -22,7 +22,7 @@
     </record>
 
     <record id="actions_server_crm_phonecall_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">CRM Phonecall: Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 85507a32c0f..8b6217b97e1 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -104,7 +104,7 @@
                 <header>
                     <button name="case_close" string="Settle" type="object" class="oe_highlight"
                             states="draft,open,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Reject" type="object"  groups="base.group_user"
+                    <button name="case_cancel" string="Reject" type="object" groups="base.group_user"
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
@@ -113,9 +113,9 @@
                         <field name="name"/>
                         <field name="date"/>
                     </group>
-                    <group colspan="4" col="4">
+                    <group colspan="4" col="4"  groups="base.group_user">
                         <field name="user_id"/>
-                        <field name="priority" groups="base.group_user"/>
+                        <field name="priority"/>
                         <field name="section_id"/>
                         <field name="date_deadline"/>
                         <field name="state" groups="base.group_no_one"/>
@@ -130,17 +130,17 @@
                                     <field name="partner_phone"/>
                                     <field name="email_from" widget="email"/>
                                 </group>
-                                <group colspan="2" col="2">
+                                <group colspan="2" col="2" groups="base.group_user">
                                     <separator colspan="2" string="Responsibilities"/>
                                     <field name="user_fault"/>
                                     <field name="categ_id" widget="selection"
                                         domain="[('object_id.model', '=', 'crm.claim')]"/>
                                     <field name="ref"/>
                                 </group>
-                                <separator colspan="4" string="Claim/Action Description"/>
+                                <separator colspan="4" string="Claim/Action Description" groups="base.group_user"/>
                                 <field name="description" colspan="4" nolabel="1"/>
                             </page>
-                            <page string="Follow Up">
+                            <page string="Follow Up" groups="base.group_user">
                                 <group colspan="2" col="2">
                                     <separator colspan="2" string="Actions"/>
                                     <field name="date_action_next"/>
@@ -167,7 +167,7 @@
                     </group>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 0880c6e8394..53f4da9eaad 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-12 19:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:56+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -28,6 +28,8 @@ msgid ""
 "Error! You cannot define the decimal precision of 'Account' as greater than "
 "the rounding factor of the company's main currency"
 msgstr ""
+"Errore! La precisione decimale di 'Contabilità' non può essere più grande "
+"del fattore di arrotondamento della valuta principale dell'azienda"
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index 10bf214d921..14cd97b3e62 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -23,10 +23,9 @@ class EDI(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def import_edi_url(self, req, url):
-        context = req.session.eval_context(req.context)
         result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
         if len(result) == 1:
-            return {"action": webmain.clean_action(req, result[0][2], context)}
+            return {"action": webmain.clean_action(req, result[0][2])}
         return True
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/i18n/zh_CN.po b/addons/edi/i18n/zh_CN.po
index 5f9d159b7b3..4a71e45fa8e 100644
--- a/addons/edi/i18n/zh_CN.po
+++ b/addons/edi/i18n/zh_CN.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-17 03:29+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:46+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "原因："
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "这个单据已经被成功导入！"
 
 #. module: edi
 #: sql_constraint:res.company:0
@@ -46,7 +46,7 @@ msgstr "错误，您不能创建循环引用的会员用户"
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "对不起，这个单据不能导入！"
 
 #. module: edi
 #: constraint:res.company:0
@@ -61,7 +61,7 @@ msgstr "公司"
 #. module: edi
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -78,13 +78,13 @@ msgstr "货币"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "单据导入通知"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "找不到的应用。"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -111,12 +111,12 @@ msgstr "业务伙伴"
 msgid ""
 "Error! You cannot define a rounding factor for the company's main currency "
 "that is smaller than the decimal precision of 'Account'."
-msgstr ""
+msgstr "错误！公司本位币的舍入系数不能定义得小于”科目“的小数位数"
 
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI 子系统"
 
 #~ msgid "Partner Addresses"
 #~ msgstr "业务伙伴地址"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 14895f2a1a7..a9a60570735 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -59,7 +59,7 @@
 
         <!-- Event Read/Unread actions -->
         <record id="actions_server_event_event_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Event: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
@@ -77,7 +77,7 @@
         </record>
 
         <record id="actions_server_event_event_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Event: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
@@ -107,7 +107,7 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
-                        <div class="oe_right oe_button_box">
+                        <div class="oe_right oe_button_box" groups="base.group_user">
                             <button name="%(event.act_event_list_register_event)d" type="action" string="Registrations" help="Register with this event"/>
                         </div>
                         <div class="oe_title">
@@ -204,7 +204,7 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     </div>
                 </form>
@@ -377,7 +377,7 @@
 
         <!-- Registration Read/Unread actions -->
         <record id="actions_server_event_registration_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Event registration : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
@@ -395,7 +395,7 @@
         </record>
 
         <record id="actions_server_event_registration_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Event registration : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
@@ -538,7 +538,7 @@
           <field name="view_mode">tree,form,calendar,graph</field>
           <field name="context">{}</field>
           <field name="search_view_id" ref="view_registration_search"/>
-        </record>view_
+        </record>
 
         <menuitem name="Registrations"
             id="menu_action_registration" parent="base.menu_event_main"
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index 8df0dadcd18..f8ad33aebee 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-16 14:07+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 01:57+0000\n"
+"Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:44+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr "我的事件"
+msgstr "我的活动"
 
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Participants"
-msgstr ""
+msgstr "参与者数目"
 
 #. module: event
 #: field:event.event,register_attended:0
 msgid "# of Participations"
-msgstr ""
+msgstr "参与编号#"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
@@ -61,12 +61,12 @@ msgstr ""
 #: code:addons/event/event.py:305
 #, python-format
 msgid "Event has been <b>cancelled</b>."
-msgstr ""
+msgstr "活动 <b>已经被取消</b>."
 
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
-msgstr "登记记录日期"
+msgstr "活动日期"
 
 #. module: event
 #: help:event.registration,origin:0
@@ -76,7 +76,7 @@ msgstr ""
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
-msgstr ""
+msgstr "活动类型"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -88,17 +88,17 @@ msgstr "Bon Jovi音乐会"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,registration_state:0
 msgid "Attended"
-msgstr ""
+msgstr "参加"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr "3月"
+msgstr "三月"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send Email"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -112,29 +112,29 @@ msgstr "公司"
 #: field:event.event,email_confirmation_id:0
 #: field:event.type,default_email_event:0
 msgid "Event Confirmation Email"
-msgstr ""
+msgstr "活动确认邮件"
 
 #. module: event
 #: field:event.type,default_registration_max:0
 msgid "Default Maximum Registration"
-msgstr ""
+msgstr "默认最多的注册者"
 
 #. module: event
 #: help:event.event,message_unread:0
 #: help:event.registration,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: event
 #: field:event.event,register_avail:0
 msgid "Available Registrations"
-msgstr ""
+msgstr "可注册项目"
 
 #. module: event
 #: view:event.registration:0
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr "事件登记记录"
+msgstr "活动登记记录"
 
 #. module: event
 #: model:ir.module.category,description:event.module_category_event_management
@@ -149,7 +149,7 @@ msgstr ""
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "登记记录的事件"
+msgstr "登记记录的活动"
 
 #. module: event
 #: view:event.event:0
@@ -167,12 +167,12 @@ msgstr "活动开始日期"
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr "事件分析"
+msgstr "活动分析"
 
 #. module: event
 #: help:event.type,default_registration_max:0
 msgid "It will select this default maximum value when you choose this event"
-msgstr ""
+msgstr "当你选择这个活动，将选择默认最大值"
 
 #. module: event
 #: view:report.event.registration:0
@@ -207,13 +207,13 @@ msgstr "错误！"
 #. module: event
 #: view:event.event:0
 msgid "Confirm Event"
-msgstr "确认事件"
+msgstr "确认活动"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr "下一个事件"
+msgstr "下一个活动"
 
 #. module: event
 #: selection:event.event,state:0
@@ -236,23 +236,23 @@ msgstr "Verdi歌剧"
 #. module: event
 #: view:report.event.registration:0
 msgid "Display"
-msgstr ""
+msgstr "显示"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,registration_state:0
 msgid "Registration State"
-msgstr ""
+msgstr "等级状态"
 
 #. module: event
 #: view:event.event:0
 msgid "tickets"
-msgstr ""
+msgstr "门票"
 
 #. module: event
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #. module: event
 #: model:mail.message.subtype,name:event.mt_event_registration
@@ -262,7 +262,7 @@ msgstr ""
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "活动结束日期"
 
 #. module: event
 #: help:event.event,message_summary:0
@@ -270,7 +270,7 @@ msgstr ""
 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: event
 #: view:report.event.registration:0
@@ -300,12 +300,12 @@ msgstr "业务伙伴"
 #. module: event
 #: help:event.type,default_registration_min:0
 msgid "It will select this default minimum value when you choose this event"
-msgstr ""
+msgstr "当你选择这个活动，将选择默认最小值"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr " 事件类型 "
+msgstr " 活动类型 "
 
 #. module: event
 #: view:event.registration:0
@@ -315,7 +315,7 @@ msgstr " 事件类型 "
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr "事件"
+msgstr "活动"
 
 #. module: event
 #: view:event.event:0
@@ -346,14 +346,14 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Register with this event"
-msgstr ""
+msgstr "注册这次活动"
 
 #. module: event
 #: help:event.type,default_email_registration:0
 msgid ""
 "It will select this default confirmation registration mail value when you "
 "choose this event"
-msgstr ""
+msgstr "当你选择这个活动，将选择确认登记邮件值"
 
 #. module: event
 #: view:event.event:0
@@ -421,7 +421,7 @@ msgstr "创建日期"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Event Responsible"
-msgstr ""
+msgstr "活动负责人"
 
 #. module: event
 #: view:event.event:0
@@ -453,7 +453,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr "事件结构"
+msgstr "活动组织机构"
 
 #. module: event
 #: view:event.confirm:0
@@ -463,7 +463,7 @@ msgstr "总是确认"
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr "事件数"
+msgstr "活动数量"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
@@ -479,7 +479,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr "取消事件"
+msgstr "取消活动"
 
 #. module: event
 #: code:addons/event/event.py:398
@@ -491,12 +491,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr "事件填充状态"
+msgstr "活动填充状态"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Category"
-msgstr ""
+msgstr "活动分类"
 
 #. module: event
 #: field:event.event,register_prospect:0
@@ -506,13 +506,13 @@ msgstr "不确认登记记录"
 #. module: event
 #: model:ir.actions.client,name:event.action_client_event_menu
 msgid "Open Event Menu"
-msgstr ""
+msgstr "打开活动菜单"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,event_state:0
 msgid "Event State"
-msgstr ""
+msgstr "活动状态"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -559,7 +559,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Finish Event"
-msgstr ""
+msgstr "结束活动"
 
 #. module: event
 #: model:ir.actions.server,name:event.actions_server_event_event_unread
@@ -575,7 +575,7 @@ msgstr "未确认状态的报名者"
 #. module: event
 #: view:event.event:0
 msgid "Event Description"
-msgstr ""
+msgstr "活动描述"
 
 #. module: event
 #: field:event.event,date_begin:0
@@ -591,7 +591,7 @@ msgstr ""
 #: code:addons/event/event.py:315
 #, python-format
 msgid "Event has been <b>done</b>."
-msgstr ""
+msgstr "活动已经 <b>完成</b>"
 
 #. module: event
 #: help:res.partner,speaker:0
@@ -627,6 +627,12 @@ msgid ""
 "             </p>\n"
 "           "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               单击添加一个新的活动\n"
+"             </p><p>\n"
+"               OpenERP帮你排程并有效地组织活动：跟踪订阅和参与、自动确认邮件、卖票等等。\n"
+"             </p>\n"
+"           "
 
 #. module: event
 #: help:event.event,register_max:0
@@ -634,7 +640,7 @@ msgid ""
 "You can for each event define a maximum registration level. If you have too "
 "much registrations you are not able to confirm your event. (put 0 to ignore "
 "this rule )"
-msgstr ""
+msgstr "你能为每个活动定义最大的登记水平。如果你有太多的登记，你不能确认你的活动。（输入0忽略这个规则）"
 
 #. module: event
 #: code:addons/event/event.py:462
@@ -649,14 +655,14 @@ msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
 "expected minimum/maximum. Please reconsider those limits before going "
 "further."
-msgstr ""
+msgstr "活动 '%s' 的确认登记合计没有遇到最小或最大值。进一步深入前请重新考虑这些限制。"
 
 #. module: event
 #: help:event.event,email_confirmation_id:0
 msgid ""
 "If you set an email template, each participant will receive this email "
 "announcing the confirmation of the event."
-msgstr ""
+msgstr "如果你设定了邮件模板，每个参与者将收到邮件公告确认次次活动。"
 
 #. module: event
 #: view:board.board:0
@@ -696,7 +702,7 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_reporting_events
 #: view:res.partner:0
 msgid "Events"
-msgstr "事件"
+msgstr "活动"
 
 #. module: event
 #: view:event.event:0
@@ -743,7 +749,7 @@ msgid ""
 "The email address of the organizer which is put in the 'Reply-To' of all "
 "emails sent automatically at event or registrations confirmation. You can "
 "also put your email address of your mail gateway if you use one."
-msgstr ""
+msgstr "在自动发送的活动或者登记确认的email中，组织者的email地址放在'Reply-To' 。你也能放你用的邮件网关的Email地址"
 
 #. module: event
 #: help:event.event,message_ids:0
@@ -787,7 +793,7 @@ msgstr ""
 msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
-msgstr "警告：这事件没有达到最低登记记录的规定，你肯定要确认它？"
+msgstr "警告：这活动没有达到最低登记记录的规定，你肯定要确认它？"
 
 #. module: event
 #: view:event.event:0
@@ -803,7 +809,7 @@ msgstr "我的登记记录"
 #: code:addons/event/event.py:310
 #, python-format
 msgid "Event has been set to <b>draft</b>."
-msgstr ""
+msgstr "活动被设置为“草稿”状态"
 
 #. module: event
 #: view:report.event.registration:0
@@ -877,7 +883,7 @@ msgstr "地址"
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr "事件类型"
+msgstr "活动类型"
 
 #. module: event
 #: help:event.event,email_registration_id:0
@@ -889,7 +895,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Attended the Event"
-msgstr ""
+msgstr "参加活动"
 
 #. module: event
 #: constraint:event.event:0
@@ -900,7 +906,7 @@ msgstr "错误！结束日期不能在开始日期前。"
 #: code:addons/event/event.py:400
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
-msgstr ""
+msgstr "你必须等待活动开始才能做这些动作"
 
 #. module: event
 #: field:event.event,user_id:0
@@ -938,7 +944,7 @@ msgstr ""
 #: model:email.template,subject:event.confirmation_event
 #: model:email.template,subject:event.confirmation_registration
 msgid "Your registration at ${object.event_id.name}"
-msgstr ""
+msgstr "你的登记在${object.event_id.name}"
 
 #. module: event
 #: view:event.registration:0
@@ -977,13 +983,13 @@ msgstr "关注者"
 #. module: event
 #: view:event.event:0
 msgid "Upcoming events from today"
-msgstr ""
+msgstr "今天将开始的活动"
 
 #. module: event
 #: code:addons/event/event.py:300
 #, python-format
 msgid "Event has been <b>created</b>."
-msgstr ""
+msgstr "活动已经被'创建'"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1014,12 +1020,12 @@ msgstr ""
 #: code:addons/event/event.py:320
 #, python-format
 msgid "Event has been <b>confirmed</b>."
-msgstr ""
+msgstr "活动已经被'确认'"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr "事件登记记录"
+msgstr "活动登记记录"
 
 #. module: event
 #: view:event.event:0
@@ -1115,7 +1121,7 @@ msgstr "已确认状态的活动"
 #: view:report.event.registration:0
 #: field:report.event.registration,event_type:0
 msgid "Event Type"
-msgstr "事件类型"
+msgstr "活动类型"
 
 #. module: event
 #: field:event.event,message_summary:0
@@ -1148,7 +1154,7 @@ msgstr "错误，您不能创建循环引用的会员用户"
 #: field:event.registration,event_begin_date:0
 #: field:report.event.registration,event_date:0
 msgid "Event Start Date"
-msgstr "事件开始日期"
+msgstr "活动开始日期"
 
 #. module: event
 #: view:report.event.registration:0
@@ -1203,7 +1209,7 @@ msgstr "错误:无效EAN编码"
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr "事件确认"
+msgstr "活动确认"
 
 #. module: event
 #: view:report.event.registration:0
diff --git a/addons/event_sale/i18n/zh_CN.po b/addons/event_sale/i18n/zh_CN.po
new file mode 100644
index 00000000000..84a135bab6d
--- /dev/null
+++ b/addons/event_sale/i18n/zh_CN.po
@@ -0,0 +1,101 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 01:53+0000\n"
+"Last-Translator: mrshelly <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "产品"
+
+#. 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 sale 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
+#: sql_constraint:product.product:0
+msgid "Error ! Ending Date cannot be set before Beginning Date."
+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 ""
+"Filter the list of event on this category only, in the sale order lines"
+msgstr "仅在此类中过滤."
+
+#. module: event_sale
+#: constraint:product.product:0
+msgid ""
+"You provided an invalid \"EAN13 Barcode\" reference. You may use the "
+"\"Internal Reference\" field instead."
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sale Order %s."
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr "订阅活动"
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "活动类型"
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr "活动类型"
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr "活动"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "销售订单明细"
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 6251eb81991..4ccea4d621e 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 8c7ceaf8d2d..416ca191a6e 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -318,12 +318,7 @@
                                         
                                     </ul>
 
-                                    <div class="oe_kanban_partner_categories">
-                                        <span class="oe_kanban_list_many2many">
-                                            <div modifiers="{}" name="tag_ids" class="oe_form_field oe_tags" model="fleet.vehicle.tag" t-att-data="record.tag_ids.raw_value" />
-                                        </span>
-                                    </div>
-
+                                    <field name="tag_ids"/>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/google_base_account/i18n/zh_CN.po b/addons/google_base_account/i18n/zh_CN.po
index 40b08fb64c9..391d9f10409 100644
--- a/addons/google_base_account/i18n/zh_CN.po
+++ b/addons/google_base_account/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-16 12:46+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 15:28+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -25,7 +25,7 @@ msgstr "用户名："
 #. module: google_base_account
 #: view:res.users:0
 msgid "Synchronization"
-msgstr ""
+msgstr "同步"
 
 #. module: google_base_account
 #: model:ir.actions.act_window,name:google_base_account.act_google_login_form
@@ -41,7 +41,7 @@ msgstr "导入Google联系人失败！"
 #. module: google_base_account
 #: model:ir.model,name:google_base_account.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: google_base_account
 #: constraint:res.users:0
@@ -56,7 +56,7 @@ msgstr "两个用户不能使用相同的用户名！"
 #. module: google_base_account
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
 
 #. module: google_base_account
 #: view:google.login:0
@@ -71,13 +71,13 @@ msgstr "Google密码"
 #. module: google_base_account
 #: view:google.login:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: google_base_account
 #: view:res.users:0
@@ -87,13 +87,13 @@ msgstr "Google 帐户"
 #. module: google_base_account
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Authentication failed. Check the user and password."
-msgstr ""
+msgstr "身份授权失败。检查用户名和密码。"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
@@ -113,7 +113,7 @@ msgstr "Google联系人"
 #. module: google_base_account
 #: view:google.login:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: google_base_account
 #: field:google.login,user:0
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 919cbcc678e..1d55acccbac 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,14 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 15:32+0000\n"
+"PO-Revision-Date: 2012-11-28 16:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr "错误！，你不能创建循环的员工等级"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -148,7 +153,7 @@ msgstr "相关的员工"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error! You cannot create recursive Categories."
-msgstr "错误！你不能创建递归的分类。"
+msgstr "错误！你不能创建循环的分类。"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
@@ -455,11 +460,6 @@ msgid "This installs the module hr_evaluation."
 msgstr "为此要安装模块 hr_evaluation."
 
 #. 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 "为此要安装模块 hr_attendance."
@@ -660,7 +660,7 @@ msgstr "国籍和其他信息"
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr "错误！你不能创建递归的部门"
+msgstr "错误！你不能创建循环的部门"
 
 #. module: hr
 #: sql_constraint:res.users:0
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 4cd9668d803..b143238c2b7 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-10-25 17:16+0000\n"
+"PO-Revision-Date: 2012-11-28 15:27+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -83,7 +83,7 @@ msgstr "评估阶段"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Request"
-msgstr ""
+msgstr "发送请求"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -96,7 +96,7 @@ msgstr "这个月份将在选择的考评计划里对员工进行首次考评。
 #: view:hr.employee:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Appraisals"
-msgstr ""
+msgstr "评估"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -107,7 +107,7 @@ msgstr "(eval_name)s:评估名称"
 #: field:hr.evaluation.interview,message_ids:0
 #: field:hr_evaluation.evaluation,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -141,13 +141,13 @@ msgstr "没有达到预期"
 #: 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 "考评"
+msgstr "评估"
 
 #. 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 "如果要求你关注新消息，勾选此项"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -215,7 +215,7 @@ msgstr "在计划执行阶段的评估"
 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: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -232,7 +232,7 @@ msgstr "截止日期"
 #: code:addons/hr_evaluation/hr_evaluation.py:326
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -252,7 +252,7 @@ msgstr "(date)s: 当前日期"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Interviews"
-msgstr ""
+msgstr "面试"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:82
@@ -264,13 +264,13 @@ msgstr "关于 "
 #: field:hr.evaluation.interview,message_follower_ids:0
 #: field:hr_evaluation.evaluation,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_unread:0
 #: field:hr_evaluation.evaluation,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -391,6 +391,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义一个评估计划 \n"
+"              </p><p>\n"
+"                你能定义评估计划(例如：6个月后首次面谈，然后每年一次).\n"
+"                然后每个员工能关联到一个评估计划，这样Openerp 能自动\n"
+"                生成一个面谈要求给管理人员和下属.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -405,7 +413,7 @@ msgstr "行动计划"
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr "定义复核"
+msgstr "定期评估"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
@@ -438,7 +446,7 @@ msgstr "所有答案"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "填写问卷"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -549,7 +557,7 @@ msgstr " (employee_name)s: 业务伙伴名称"
 #: field:hr.evaluation.interview,message_is_follower:0
 #: field:hr_evaluation.evaluation,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -580,7 +588,7 @@ msgstr "增加筛选条件"
 #: field:hr_evaluation.evaluation,message_comment_ids:0
 #: help:hr_evaluation.evaluation,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
@@ -733,7 +741,7 @@ msgstr "取消"
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "错误！，你不能创建循环的员工层次"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -836,7 +844,7 @@ msgstr "阶段"
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr "自下而上的考评申请"
+msgstr "自下而上的评估申请"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -847,7 +855,7 @@ msgstr "2月"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Appraisal"
-msgstr "面谈评估"
+msgstr "面谈测评"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
@@ -871,7 +879,7 @@ msgstr "面谈员工"
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
 "draft state."
-msgstr ""
+msgstr "你不能改变状态，因为有些评估正在等待结果。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -887,7 +895,7 @@ msgstr "评估计划阶段"
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1914d30ec05..aba6dd36538 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -3,7 +3,7 @@
 
         <!-- Hr holidays Read/Unread actions -->
         <record id="actions_server_holidays_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Holidays: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
@@ -21,7 +21,7 @@
         </record>
 
         <record id="actions_server_holidays_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Holidays: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 63c1cf47ccb..f2ba3d55057 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -60,7 +60,6 @@ You can define the different phases of interviews and easily rate the applicant
         'hr_recruitment_data.xml'
     ],
     'demo': ['hr_recruitment_demo.yml'],
-    'js': ['static/src/js/hr_recruitment.js'],
     'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c3281b43b94..8282c5a300c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -37,7 +37,7 @@
     <!-- Jobs -->
     <!-- Applicant Read/Unread actions -->
     <record id="actions_server_applicant_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">HR Applicant: Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
@@ -55,7 +55,7 @@
     </record>
 
     <record id="actions_server_applicant_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">HR Applicant: Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
@@ -314,9 +314,7 @@
 
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
-                                    <div class="oe_left oe_tags">
-                                        <field name="categ_ids"/>
-                                    </div>
+                                    <field name="categ_ids"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>
diff --git a/addons/hr_recruitment/static/src/js/hr_recruitment.js b/addons/hr_recruitment/static/src/js/hr_recruitment.js
deleted file mode 100644
index d11326ac9de..00000000000
--- a/addons/hr_recruitment/static/src/js/hr_recruitment.js
+++ /dev/null
@@ -1,35 +0,0 @@
-openerp.hr_recruitment = function(openerp) {
-    openerp.web_kanban.KanbanView.include({
-        applicant_display_categ_names: function() {
-            /*
-             * Set proper names to applicant categories.
-             * In kanban views, many2many fields only return a list of ids.
-             * Therefore, we have to fetch the matching data by ourselves.
-             */
-            var self = this;
-            var categ_ids = [];
-
-            // Collect categories ids
-            self.$el.find('span[data-categ_id]').each(function() {
-                categ_ids.push($(this).data('categ_id'));
-            });
-
-            // Find their matching names
-            var dataset = new openerp.web.DataSetSearch(self, 'hr.applicant_category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
-            dataset.read_slice(['id', 'name']).done(function(result) {
-                _.each(result, function(v, k) {
-                    // Set the proper value in the DOM and display the element
-                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
-                });
-            });
-        },
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(self, arguments);
-
-            if (self.dataset.model === 'hr.applicant') {
-                self.applicant_display_categ_names();
-            }
-        }
-    });
-};
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index 52b9795996f..8e6896c96a0 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/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-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-26 13:46+0000\n"
+"PO-Revision-Date: 2012-11-28 08:39+0000\n"
 "Last-Translator: hifly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
@@ -80,17 +80,17 @@ msgstr "共享库(FTP)"
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
 msgid "Manage documents"
-msgstr ""
+msgstr "管理文档"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "应用"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -103,16 +103,18 @@ msgid ""
 "Access your documents in OpenERP through an FTP interface.\n"
 "                This installs the module document_ftp."
 msgstr ""
+"在OpenERP里通过FTP接口访问你的文档。\n"
+"需要安装模块document_ftp。"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "或者"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_webdav:0
 msgid "Share repositories (WebDAV)"
-msgstr ""
+msgstr "共享仓库(WebDAV)"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index 924c50893d6..bbdc5865ed5 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/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-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-26 13:13+0000\n"
-"Last-Translator: youring <youring@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 11:04+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -47,7 +47,7 @@ msgstr "分组..."
 #. module: lunch
 #: field:lunch.alert,sunday:0
 msgid "Sunday"
-msgstr "周日"
+msgstr "星期日"
 
 #. module: lunch
 #: field:lunch.order.line,supplier:0
@@ -68,22 +68,22 @@ msgstr "3月"
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "By Employee"
-msgstr ""
+msgstr "按员工"
 
 #. module: lunch
 #: field:lunch.alert,friday:0
 msgid "Friday"
-msgstr "周五"
+msgstr "星期五"
 
 #. module: lunch
 #: view:lunch.validation:0
 msgid "validate order lines"
-msgstr ""
+msgstr "核对餐单明细"
 
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "Order lines Tree"
-msgstr ""
+msgstr "餐单明细列表"
 
 #. module: lunch
 #: field:lunch.alert,specific_day:0
@@ -132,7 +132,7 @@ msgstr "订餐单（按供餐单位分）"
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Receive Meals"
-msgstr ""
+msgstr "接收食品"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -184,7 +184,7 @@ msgstr ""
 #. module: lunch
 #: view:lunch.alert:0
 msgid "alert tree"
-msgstr ""
+msgstr "提醒列表"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order_line
@@ -194,7 +194,7 @@ msgstr "午餐订单统计"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_alert
 msgid "Lunch Alert"
-msgstr ""
+msgstr "午餐提醒"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:182
@@ -205,12 +205,12 @@ msgstr ""
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Week"
-msgstr ""
+msgstr "每周"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove
 msgid "Register Cash Moves"
-msgstr ""
+msgstr "登记现金凭证"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -230,7 +230,7 @@ msgstr "确认"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 msgid "Your Account"
-msgstr ""
+msgstr "您的帐号"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
@@ -240,12 +240,12 @@ msgstr ""
 #. module: lunch
 #: field:lunch.alert,active_from:0
 msgid "Between"
-msgstr ""
+msgstr "介于"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_order
 msgid "Wizard to order a meal"
-msgstr ""
+msgstr "订购食品的向导"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -257,7 +257,7 @@ msgstr "新建"
 #: code:addons/lunch/lunch.py:179
 #, python-format
 msgid "This is the first time you order a meal"
-msgstr ""
+msgstr "这是你第一次订购食品"
 
 #. module: lunch
 #: field:report.lunch.order.line,price_total:0
@@ -267,7 +267,7 @@ msgstr "总价格"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_validation
 msgid "lunch validation for order"
-msgstr ""
+msgstr "午餐确认"
 
 #. module: lunch
 #: report:lunch.order.line:0
@@ -287,13 +287,13 @@ msgstr "7月"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_config
 msgid "Configuration"
-msgstr ""
+msgstr "设置"
 
 #. module: lunch
 #: field:lunch.order,state:0
 #: field:lunch.order.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: lunch
 #: view:lunch.order.order:0
@@ -301,6 +301,8 @@ msgid ""
 "Order a meal doesn't mean that we have to pay it.\n"
 "                        A meal should be paid when it is received."
 msgstr ""
+"订购食品并不意味着我们必须支付。\n"
+"        食品将在收到后支付。"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_control_accounts
@@ -311,12 +313,12 @@ msgstr ""
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
 msgid "Employee's Payment"
-msgstr ""
+msgstr "员工的支付"
 
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
-msgstr ""
+msgstr "每天"
 
 #. module: lunch
 #: field:lunch.order.line,cashmove:0
@@ -326,12 +328,12 @@ msgstr "现金划拨"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.order_order_lines
 msgid "Order meals"
-msgstr ""
+msgstr "订购食品"
 
 #. module: lunch
 #: view:lunch.alert:0
 msgid "Schedule Hour"
-msgstr ""
+msgstr "预定时间"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -362,12 +364,12 @@ msgstr ""
 #. module: lunch
 #: field:lunch.alert,tuesday:0
 msgid "Tuesday"
-msgstr ""
+msgstr "星期二"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_tree
 msgid "Your Orders"
-msgstr ""
+msgstr "你的订单"
 
 #. module: lunch
 #: field:report.lunch.order.line,month:0
@@ -391,7 +393,7 @@ msgstr ""
 #: view:lunch.alert:0
 #: field:lunch.alert,message:0
 msgid "Message"
-msgstr ""
+msgstr "消息"
 
 #. module: lunch
 #: view:lunch.order.order:0
@@ -403,7 +405,7 @@ msgstr ""
 #: view:lunch.order.order:0
 #: view:lunch.validation:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_product_categories
@@ -420,7 +422,7 @@ msgstr ""
 #. module: lunch
 #: view:lunch.order.order:0
 msgid "Order meal"
-msgstr ""
+msgstr "订购食品"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
@@ -436,37 +438,37 @@ msgstr ""
 #. module: lunch
 #: view:lunch.alert:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "预定日期"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_alert
 #: model:ir.ui.menu,name:lunch.menu_lunch_alert
 #: field:lunch.order,alerts:0
 msgid "Alerts"
-msgstr ""
+msgstr "警告"
 
 #. module: lunch
 #: field:lunch.order.line,note:0
 #: field:report.lunch.order.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "说明"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:249
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "新增"
 
 #. module: lunch
 #: view:lunch.product:0
 #: view:lunch.product.category:0
 msgid "Products Form"
-msgstr ""
+msgstr "产品表单"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.cancel_order_lines
 msgid "Cancel meals"
-msgstr ""
+msgstr "取消食品"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
@@ -477,12 +479,12 @@ msgstr ""
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Are you sure you want to cancel these meals?"
-msgstr ""
+msgstr "你确信要取消这些食品？"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "My Account"
-msgstr ""
+msgstr "我的账户"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -492,17 +494,17 @@ msgstr "8月"
 #. module: lunch
 #: field:lunch.alert,monday:0
 msgid "Monday"
-msgstr ""
+msgstr "星期一"
 
 #. module: lunch
 #: field:lunch.order.line,name:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.validate_order_lines
 msgid "Receive meals"
-msgstr ""
+msgstr "收到食品"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -526,12 +528,12 @@ msgstr "午餐管理"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_line
 msgid "lunch order line"
-msgstr ""
+msgstr "午餐订单行"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "lunch product"
-msgstr ""
+msgstr "午餐产品"
 
 #. module: lunch
 #: field:lunch.order.line,user_id:0
@@ -554,18 +556,18 @@ msgstr "11月"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Orders Tree"
-msgstr ""
+msgstr "订单树"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Orders Form"
-msgstr ""
+msgstr "订单表单"
 
 #. module: lunch
 #: view:lunch.alert:0
 #: view:lunch.order.line:0
 msgid "Search"
-msgstr ""
+msgstr "查找"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -600,27 +602,27 @@ msgstr "1月"
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Specific Day"
-msgstr ""
+msgstr "指定日"
 
 #. module: lunch
 #: field:lunch.alert,wednesday:0
 msgid "Wednesday"
-msgstr ""
+msgstr "星期三"
 
 #. module: lunch
 #: view:lunch.product.category:0
 msgid "Product Category: "
-msgstr ""
+msgstr "产品目录: "
 
 #. module: lunch
 #: field:lunch.alert,active_to:0
 msgid "And"
-msgstr ""
+msgstr "And"
 
 #. module: lunch
 #: selection:lunch.order.line,state:0
 msgid "Ordered"
-msgstr ""
+msgstr "已订购"
 
 #. module: lunch
 #: field:report.lunch.order.line,date:0
@@ -630,7 +632,7 @@ msgstr "订单日期"
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Cancel Orders"
-msgstr ""
+msgstr "取消订单"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_alert
@@ -657,17 +659,17 @@ msgstr ""
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "A cancelled meal should not be paid by employees."
-msgstr ""
+msgstr "已经取消的食品不会被员工支付。"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cash
 msgid "Administrate Cash Moves"
-msgstr ""
+msgstr "管理现金凭证"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cancel
 msgid "cancel lunch order"
-msgstr ""
+msgstr "取消午餐订单"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -699,14 +701,14 @@ msgstr ""
 #: code:addons/lunch/lunch.py:185
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
-msgstr ""
+msgstr "你食物收藏夹基于最后一次订单创建。"
 
 #. module: lunch
 #: model:ir.module.category,description:lunch.module_lunch_category
 msgid ""
 "Helps you handle your lunch needs, if you are a manager you will be able to "
 "create new products, cashmoves and to confirm or cancel orders."
-msgstr ""
+msgstr "帮你处理午餐需要的事务，如果是一个管理者，你能创建产品、现金凭证并确认或者取消餐单。"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
@@ -727,18 +729,18 @@ msgstr ""
 #. module: lunch
 #: field:lunch.alert,alter_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "循环"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:188
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
-msgstr ""
+msgstr "不要忘记红色区域显示的提示信息。"
 
 #. module: lunch
 #: field:lunch.alert,thursday:0
 msgid "Thursday"
-msgstr ""
+msgstr "星期四"
 
 #. module: lunch
 #: report:lunch.order.line:0
@@ -772,13 +774,13 @@ msgstr "价格"
 #. module: lunch
 #: field:lunch.cashmove,state:0
 msgid "Is an order or a Payment"
-msgstr ""
+msgstr "一个订单或者付款单"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_form
 msgid "New Order"
-msgstr ""
+msgstr "新的订单"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -788,13 +790,13 @@ msgstr ""
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Cancel a meal means that we didn't receive it from the supplier."
-msgstr ""
+msgstr "取消我们不能从供应商出接收的食物。"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -809,12 +811,12 @@ msgstr "年"
 #. module: lunch
 #: view:lunch.order:0
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_admin
 msgid "Administrate Orders"
-msgstr ""
+msgstr "订单管理"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -824,7 +826,7 @@ msgstr "4月"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Select your order"
-msgstr ""
+msgstr "选择你的订单"
 
 #. module: lunch
 #: field:lunch.cashmove,order_id:0
@@ -845,22 +847,22 @@ msgstr "午餐订单"
 #. module: lunch
 #: view:lunch.order.order:0
 msgid "Are you sure you want to order these meals?"
-msgstr ""
+msgstr "你确信要订购这些食物？"
 
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "cancel order lines"
-msgstr ""
+msgstr "取消订单行"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product_category
 msgid "lunch product category"
-msgstr ""
+msgstr "午餐产品目录"
 
 #. module: lunch
 #: field:lunch.alert,saturday:0
 msgid "Saturday"
-msgstr ""
+msgstr "星期六"
 
 #. module: lunch
 #: model:res.groups,name:lunch.group_lunch_manager
@@ -870,17 +872,17 @@ msgstr "经理"
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Did your received these meals?"
-msgstr ""
+msgstr "你收到了这些食物吗?"
 
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Once a meal is received a new cash move is created for the employee."
-msgstr ""
+msgstr "一旦食物被收取，这个员工的新的现金凭证被创建"
 
 #. module: lunch
 #: view:lunch.product:0
 msgid "Products Tree"
-msgstr ""
+msgstr "产品列表"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -888,12 +890,12 @@ msgstr ""
 #: field:lunch.order,total:0
 #: view:lunch.order.line:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
 msgid "Previous Orders"
-msgstr ""
+msgstr "之前的订单"
 
 #~ msgid "Are you sure you want to cancel this order ?"
 #~ msgstr "您确定要取消此订单？"
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 0377a00a8cf..d0d9836ce8c 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index ee0146aaeb1..fba192b18bc 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -105,7 +105,7 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group..."/>
                     </div>
                 </form>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index ba6d101541c..3273870f5e0 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -206,6 +206,14 @@ class mail_message(osv.Model):
             new_is_favorite = not (uid in message.get('favorite_user_ids'))
             if new_is_favorite:
                 self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(4, uid)]}, context=context)
+                # when setting a favorite, set the related notification as unread, or create an unread notification if not existing
+                notification_obj = self.pool.get('mail.notification')
+                pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+                notif_id = notification_obj.search(cr, SUPERUSER_ID, [('message_id', '=', message.get('id')), ('partner_id', '=', pid)], context=context)
+                if notif_id:
+                    notification_obj.write(cr, SUPERUSER_ID, notif_id, {'read': False}, context=context)
+                else:
+                    notification_obj.create(cr, SUPERUSER_ID, {'message_id': message.get('id'), 'partner_id': pid, 'read': False}, context=context)
             else:
                 self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(3, uid)]}, context=context)
         return new_is_favorite or False
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 15bc53223ba..30954be4ed8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -802,11 +802,12 @@ class mail_thread(osv.AbstractModel):
 
     def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
         """ Add partners to the records followers. """
-        self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
+        self.check_access_rights(cr, uid, 'read')
+        self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
         # if subtypes are not specified (and not set to a void list), fetch default ones
         if subtype_ids is None:
             subtype_obj = self.pool.get('mail.message.subtype')
-            subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+            subtype_ids = subtype_obj.search(cr, SUPERUSER_ID, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
         # update the subscriptions
         fol_obj = self.pool.get('mail.followers')
         fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
@@ -823,7 +824,8 @@ class mail_thread(osv.AbstractModel):
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
         """ Remove partners from the records followers. """
-        return self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
+        self.check_access_rights(cr, uid, 'read')
+        return self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
 
     #------------------------------------------------------
     # Thread state
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a232aa12642..4106eb2e024 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -42,7 +42,8 @@
             <field name="params" eval="&quot;{
                 'domain': [('partner_ids.user_ids', 'in', [uid])],
                 'view_mailbox': True,
-                'read_action': 'read', }&quot;"/>
+                'read_action': 'read',
+                'show_compose_message': False }&quot;"/>
             <field name="help" type="html">
                 <p>
                     <b>No private message.</b>
@@ -64,7 +65,8 @@
             <field name="params" eval="&quot;{
                 'domain': [('favorite_user_ids', 'in', [uid])],
                 'view_mailbox': True,
-                'read_action': 'read', }&quot;"/>
+                'read_action': 'read',
+                'compose_as_todo': True }&quot;"/>
             <field name="help" type="html">
                 <p>
                     <b>No todo.</b>
@@ -84,7 +86,8 @@
             }</field>
             <field name="params" eval="&quot;{
                 'domain': ['|', ('notification_ids.partner_id.user_ids', 'in', [uid]), ('author_id.user_ids', 'in', [uid])],
-                'view_mailbox': True, }&quot;"/>
+                'view_mailbox': True,
+                'show_compose_message': False }&quot;"/>
             <field name="help" type="html">
                 <p>
                     No message found and no message sent yet.
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 94a5c2d1f41..638d016921b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -48,7 +48,7 @@
 
 .openerp .oe_mail .oe_msg{
     position: relative;
-    background: #F4F5FA;
+    background: #EDEDF6;
     border-radius: 2px;
     margin-bottom: 2px;
     min-height: 42px;
@@ -70,7 +70,7 @@
     margin-left: 40px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
-    padding-left: 4px;
+    margin-left: 4px;
     padding-top: 3px;
     overflow: hidden;
     margin-bottom: 4px;
@@ -94,6 +94,10 @@
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p {
     margin-bottom: 0px;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body * {
+    text-overflow:ellipsis;
+    word-wrap: break-word;
+}
 
 /* a) Indented Messages */
 
@@ -380,6 +384,10 @@
     line-height: 12px;
     vertical-align: middle;
 }
+.openerp .oe_mail .oe_msg_footer button.oe_post{
+    position: relative;
+    z-index: 2;
+}
 .openerp .oe_mail .oe_msg_footer button.oe_attach{
     width: 24px;
     overflow: hidden;
@@ -387,8 +395,9 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{
     position: relative;
-    top: -1px;
-    left: -9px;
+    top: -4px;
+    margin-left: -9px;
+    vertical-align: middle;
     filter:none;
 }
 .openerp .oe_mail .oe_hidden_input_file, .openerp .oe_mail .oe_hidden_input_file form{
@@ -402,8 +411,9 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_full .oe_e{
     position: relative;
-    top: -1px;
-    left: -9px;
+    top: -4px;
+    margin-left: -9px;
+    vertical-align: middle;
     filter:none;
 }
 .openerp .oe_mail button.oe_attach, .openerp .oe_mail button.oe_full{
@@ -418,13 +428,17 @@
     color: #7C7BAD;
     margin-left: -3px;
 }
+.openerp .oe_mail .oe_msg_footer .oe_attachment_file{
+    cursor: pointer;
+}
 .openerp .oe_mail .oe_msg_footer .oe_attachment_file .oe_form_binary_file{
     display: inline-block;
-    margin-left: -47px;
-    height: 28px;
-    width: 52px;
-    margin-top: -6px;
+    margin-left: -122px;
+    height: 22px;
+    width: 128px;
+    margin-top: -4px;
     filter:none;
+    cursor: pointer;
 }
 .openerp .oe_mail .oe_mail_list_recipients{
     font-size: 12px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 44bb4e9ae09..a5beaac229f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -204,7 +204,7 @@ openerp.mail = function (session) {
             this.subject = datasets.subject ||  false,
             this.name = datasets.name ||  false,
             this.record_name = datasets.record_name ||  false,
-            this.body = datasets.body ||  false,
+            this.body = datasets.body || '',
             this.vote_nb = datasets.vote_nb || 0,
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,
@@ -508,7 +508,6 @@ openerp.mail = function (session) {
                 res_model: 'mail.compose.message',
                 view_mode: 'form',
                 view_type: 'form',
-                action_from: 'mail.ThreadComposeMessage',
                 views: [[false, 'form']],
                 target: 'new',
                 context: context,
@@ -574,12 +573,7 @@ openerp.mail = function (session) {
                             var message = thread.create_message_object( data[0] );
                             // insert the message on dom
                             thread.insert_message( message, root ? undefined : self.$el, root );
-                            if (thread.parent_message) {
-                                self.$el.remove();
-                                self.parent_thread.compose_message = null;
-                            } else {
-                                self.on_cancel();
-                            }
+                            self.on_cancel();
                         });
                         //session.web.unblockUI();
                     });
@@ -591,11 +585,11 @@ openerp.mail = function (session) {
         */
         on_compose_expandable: function (event) {
 
-            if (!this.stay_open && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
+            if ((!this.stay_open || (event && event.type == 'click')) && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
                 this.show_composer = !this.show_composer || this.stay_open;
                 this.reinit();
             }
-            if (!this.stay_open && this.show_composer) {
+            if (!this.stay_open && this.show_composer && (!event || event.type != 'blur')) {
                 this.$('textarea:not(.oe_compact):first').focus();
             }
             return true;
@@ -725,7 +719,7 @@ openerp.mail = function (session) {
         on_message_reply:function (event) {
             event.stopPropagation();
             this.create_thread();
-            this.thread.on_compose_message();
+            this.thread.on_compose_message(event);
             return false;
         },
 
@@ -833,9 +827,10 @@ openerp.mail = function (session) {
             return false;
         },
 
-        /*The selected thread and all childs (messages/thread) became read
-        * @param {object} mouse envent
-        */
+        /* Set the selected thread and all childs as read or unread, based on
+         * read parameter.
+         * @param {boolean} read_value
+         */
         on_message_read_unread: function (read_value) {
             var self = this;
             var messages = [this].concat(this.get_childs());
@@ -958,7 +953,7 @@ openerp.mail = function (session) {
 
             this.options = options.options;
             this.options.root_thread = (options.options.root_thread != undefined ? options.options.root_thread : this);
-            this.options.show_compose_message = this.options.show_compose_message && (this.options.display_indented_thread >= this.thread_level || !this.thread_level);
+            this.options.show_compose_message = this.options.show_compose_message && !this.thread_level;
             
             // record options and data
             this.parent_message= parent.thread!= undefined ? parent : false ;
@@ -995,7 +990,7 @@ openerp.mail = function (session) {
             // add message composition form view
             if (!this.compose_message) {
                 this.compose_message = new mail.ThreadComposeMessage(this, this, {
-                    'context': this.context,
+                    'context': this.options.compose_as_todo && !this.thread_level ? _.extend(this.context, { 'default_favorite_user_ids': [this.session.uid] }) : this.context,
                     'options': this.options,
                 });
                 if (!this.thread_level || this.thread_level > this.options.display_indented_thread) {
@@ -1136,9 +1131,9 @@ openerp.mail = function (session) {
         * Call the on_compose_expandable method to allow the user to write his message.
         * (Is call when a user click on "Reply" button)
         */
-        on_compose_message: function () {
+        on_compose_message: function (event) {
             this.instantiate_compose_message();
-            this.compose_message.on_compose_expandable();
+            this.compose_message.on_compose_expandable(event);
             return false;
         },
 
@@ -1241,6 +1236,7 @@ openerp.mail = function (session) {
             } else {
                 message.appendTo(self.$el);
             }
+            message.$el.hide().fadeIn(500);
 
             return message
         },
@@ -1262,6 +1258,9 @@ openerp.mail = function (session) {
                 // insert the message on dom
                 thread.insert_message( message, typeof dom_insert_after == 'object' ? dom_insert_after : false);
             });
+            if (!records.length && this.options.root_thread == this) {
+                this.no_message();
+            }
         },
 
         /**
@@ -1291,8 +1290,10 @@ openerp.mail = function (session) {
             var messages = _.sortBy( this.messages, function (val) { return val.id; });
             var it = _.indexOf( messages, message );
 
-            var msg_up = messages[it-1];
-            var msg_down = messages[it+1];
+            var msg_up = message.$el.prev('.oe_msg');
+            var msg_down = message.$el.next('.oe_msg');
+            var msg_up = msg_up.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_up[0]; }) : false;
+            var msg_down = msg_down.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_down[0]; }) : false;
 
             var message_dom = [ ["id", "=", message.id] ];
 
@@ -1397,6 +1398,8 @@ openerp.mail = function (session) {
          *...  @param {Array} [message_ids] List of ids to fetch by the root thread.
          *      When you use this option, the domain is not used for the fetch root.
          *     @param {String} [no_message] Message to display when there are no message
+         *     @param {Boolean} [show_link_partner] Display partner (authors, followers...) on link or not
+         *     @param {Boolean} [compose_as_todo] The root composer mark automatically the message as todo
          */
         init: function (parent, action) {
             this._super(parent, action);
@@ -1414,8 +1417,10 @@ openerp.mail = function (session) {
                 'show_compose_message' : false,
                 'show_compact_message' : false,
                 'compose_placeholder': false,
+                'show_link_partner': true,
                 'view_inbox': false,
                 'message_ids': undefined,
+                'compose_as_todo' : false,
             }, this.action.params);
 
             this.action.params.help = this.action.help || false;
@@ -1441,7 +1446,6 @@ openerp.mail = function (session) {
             });
 
             this.thread.appendTo( this.$el );
-            this.thread.no_message();
 
             if (this.action.params.show_compose_message) {
                 this.thread.instantiate_compose_message();
@@ -1632,7 +1636,7 @@ openerp.mail = function (session) {
          */
         do_searchview_search: function (domains, contexts, groupbys) {
             var self = this;
-            this.rpc('/web/session/eval_domain_and_context', {
+            session.web.pyeval.eval_domains_and_contexts({
                 domains: domains || [],
                 contexts: contexts || [],
                 group_by_seq: groupbys || []
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bb787c9a21b..cca908a5d98 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -34,14 +34,14 @@
                     <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
                     <!--<a class="oe_cancel oe_e">X</a>-->
-                    <button class="oe_full"><span class='oe_e'>&amp;ograve</span></button>
+                    <button class="oe_full" title="Open the full mail composer"><span class='oe_e'>&amp;ograve</span></button>
                 </div>
             </div>
         </div>
         <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea t-if="widget.options.compose_placeholder" class="field_text oe_compact" t-att-placeholder="widget.options.compose_placeholder"/>
-            <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write an internal note..."/>
-            <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share to my followers..."/>
+            <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this document..."/>
+            <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share with my followers..."/>
         </div>
         <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
     </t>
@@ -75,9 +75,11 @@
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
             <t t-if="attachment.filetype !== 'webimage'">
                 <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img></a>
+                    <a t-att-href='attachment.url'>
+                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
+                        <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    </a>
                     <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
-                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -85,9 +87,11 @@
             </t>
             <t t-if="attachment.filetype === 'webimage'">
                 <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img></a>
+                    <a t-att-href='attachment.url'>
+                        <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
+                        <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    </a>
                     <div class='oe_delete oe_e'>[</div>
-                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -111,7 +115,11 @@
             </t>
             <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
             <t t-set="inc" t-value="0"/>
-            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner">
+                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
+                    <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
+                    <t t-if="!widget.options.show_link_partner" t-raw="partner[1]"/>
+                </span><t t-set="inc" t-value="inc+1"/>
             </t>
             <t t-if="widget.partner_ids.length>=3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
@@ -148,7 +156,7 @@
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
-            <tr class="oe_header_row" t-if="widget.action.params.view_inbox" >
+            <tr class="oe_header_row" t-if="widget.action.params.view_inbox and widget.action.params.show_compose_message" >
                 <td colspan="2">
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
@@ -190,14 +198,15 @@
         <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type}">
 
             <div class='oe_msg_left'>
-                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
                     <img class="oe_msg_icon" t-att-src="widget.avatar"/>
                 </a>
+                <img t-if="!widget.options.show_link_partner" class="oe_msg_icon" t-att-src="widget.avatar"/>
             </div>
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">X</a></span>
+                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">W</a></span>
                     <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span>
                     <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.options.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
@@ -217,7 +226,8 @@
                     <t t-if="widget.attachment_ids.length > 0">
                         <div class="oe_msg_attachment_list"></div>
                     </t>
-                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> 
+                    <a t-if="widget.author_id and widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-if="widget.author_id and !widget.options.show_link_partner"><t t-raw="widget.author_id[1]"/></span>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                     <span class='oe_subtle'>•</span>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 3dec4ef1dd2..11698c1fb62 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -5,7 +5,7 @@
         followers main template
         Template used to display the followers, the actions and the subtypes in a record.
         -->
-    <div t-name="mail.followers" class="oe_followers">
+    <div t-name="mail.followers" class="oe_followers">        
         <div class="oe_actions">
             <button type="button" class="oe_follower oe_notfollow">
                 <span class="oe_follow">Follow</span>
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 16f18fc034d..e1c5cbb92e2 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/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-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-25 16:35+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2012-11-28 14:03+0000\n"
+"Last-Translator: hifly <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:40+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -29,13 +29,13 @@ msgid ""
 "                This installs the module mrp_repair."
 msgstr ""
 "允许管理所有的产品维修.\n"
-"                    * 添加删除要修复的产品\n"
+"                    * 添加/删除要修复的产品\n"
 "                    * 影响库存\n"
 "                    * 开票（产品和/或服务）\n"
 "                    * 保修\n"
 "                    * 修理报价单\n"
 "                    * 技术人员和最终客户的说明.\n"
-"             这需要安装模块mrp_repair."
+"             为此需要安装模块mrp_repair."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -45,12 +45,12 @@ msgstr "周期数"
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr "系统用于查找部件的位置。"
+msgstr "系统用于查找部件的库位。"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "工作中心利用率"
+msgstr "工作中心效率"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -1231,6 +1231,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
@@ -1491,6 +1494,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击创建一个新的属性。\n"
+"              </p><p>\n"
+"               OpenERP里的属性用于在制造同一个产品却有不同方法时，选择正确的BoM。\n"
+"                你可以为每个BoM设置多个属性。 \n"
+"                销售员创建销售订单时，可以关联多个属性，\n"
+"                这样OpenERP将根据这些属性自动匹配对应的BoM。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1581,7 +1593,7 @@ msgid ""
 "                within your work centers in order to produce a product. They "
 "are attached to bills of materials\n"
 "                that will define the required raw materials."
-msgstr ""
+msgstr "工艺路线允许你创建并管理制造工序。为了生产产品，这些工序被分配到工作中心。我们在定义原材料的BoM里可以设置工艺路线。"
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -2151,6 +2163,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击创建BoM。\n"
+"              </p><p>\n"
+"                BoM允许你为制造一个产品而定义一组原材料；\n"
+"                生产可通过生产订单或者产品包装来完成。\n"
+"              </p><p>\n"
+"                OpenERP使用这些BoM，依据需求自动给出生产订单建议。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2175,6 +2196,10 @@ msgid ""
 "                With this module: A + B + C -> D + E.\n"
 "                This installs the module mrp_byproduct."
 msgstr ""
+"你可以在BoM里配置副产品。\n"
+"                不安装该模块，只能做到: A + B + C -> D.\n"
+"                安装该模块后，可以做到: A + B + C -> D + E.\n"
+"                为此需要安装模块 mrp_byproduct."
 
 #. module: mrp
 #: field:procurement.order,bom_id:0
diff --git a/addons/mrp_byproduct/i18n/zh_CN.po b/addons/mrp_byproduct/i18n/zh_CN.po
index 13da473b1c9..347fe584ee8 100644
--- a/addons/mrp_byproduct/i18n/zh_CN.po
+++ b/addons/mrp_byproduct/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-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-06-14 05:53+0000\n"
+"PO-Revision-Date: 2012-11-28 14:12+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -27,6 +27,9 @@ msgid ""
 "BoM / quantity of manufactured product set on the BoM * quantity of "
 "manufactured product in the production order.)'"
 msgstr ""
+"使用BoM定义在生产订单上有多少数量的副产品。\r\n"
+"“固定的” 描绘了生成的副产品的数量总是等于 BoM设置的，无论生产订单生产了多少产品。\r\n"
+"相对的，“可变的”意味着数量是要被计算的：BoM设置的副产品数量 / BoM 上设置的产品生产数量 * 在生产订单中的成品数量。)'"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_id:0
@@ -41,7 +44,7 @@ msgstr "固定的"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -60,17 +63,19 @@ msgid ""
 "You should install the mrp_byproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"所有的产品数量必须大于0。\n"
+"如果你要在BOM上面管理额外的产品，你要安装mrp_byproduct模块。"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
 #: field:mrp.bom,sub_products:0
 msgid "Byproducts"
-msgstr ""
+msgstr "副产品"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "修改产成品数量"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -91,7 +96,7 @@ msgstr "产品数量"
 #: code:addons/mrp_byproduct/mrp_byproduct.py:62
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,bom_id:0
@@ -124,9 +129,9 @@ msgstr "错误！你不能创建循环引用的物料清单。"
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
 "product form."
-msgstr ""
+msgstr "你选择的计量单位跟产品表单的计量单位在不同的类别。"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
 msgid "Byproduct"
-msgstr ""
+msgstr "副产品"
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
index 8f6aa5b3d01..9d45b6233ef 100644
--- a/addons/note/security/note_security.xml
+++ b/addons/note/security/note_security.xml
@@ -6,10 +6,5 @@
         <field name="name">Notes / Fancy mode</field>

 	<field name="category_id" ref="base.module_category_hidden"/>

     </record>

-

-    <record id="base.group_user" model="res.groups">

-	<field name="implied_ids" eval="[(4, ref('group_note_fancy'))]"/>

-    </record>

-

 </data>

 </openerp>

diff --git a/addons/pad/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
index 5a329c44078..08ed2ebf7ba 100644
--- a/addons/pad/i18n/zh_CN.po
+++ b/addons/pad/i18n/zh_CN.po
@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 09:50+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 08:20+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: pad
 #. openerp-web
 #: code:addons/pad/static/src/xml/pad.xml:27
 #, python-format
 msgid "&Ntilde;"
-msgstr ""
+msgstr "&Ntilde;"
 
 #. module: pad
 #: model:ir.model,name:pad.model_pad_common
 msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
 
 #. module: pad
 #: sql_constraint:res.company:0
@@ -37,7 +37,7 @@ msgstr "公司名称必须唯一！"
 #. module: pad
 #: help:res.company,pad_key:0
 msgid "Etherpad lite api key."
-msgstr ""
+msgstr "Etherpad lite api key."
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -56,27 +56,27 @@ msgstr "错误！您不能创建递归公司."
 msgid ""
 "You must configure the etherpad through the menu Setting > Companies > "
 "Companies, in the configuration tab of your company."
-msgstr ""
+msgstr "你必须通过菜单 设置->公司->公司,配置 etherpad ,在你的公司的 配置标签中。"
 
 #. module: pad
 #: view:res.company:0
 msgid "Pads"
-msgstr ""
+msgstr "Pads"
 
 #. module: pad
 #: field:res.company,pad_server:0
 msgid "Pad Server"
-msgstr ""
+msgstr "Pad 服务器"
 
 #. module: pad
 #: field:res.company,pad_key:0
 msgid "Pad Api Key"
-msgstr ""
+msgstr "Pad Api Key"
 
 #. module: pad
 #: help:res.company,pad_server:0
 msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Etherpad lite服务器，例如 beta.primarypad.com"
 
 #, python-format
 #~ msgid "Ok"
diff --git a/addons/pad_project/i18n/zh_CN.po b/addons/pad_project/i18n/zh_CN.po
index a560305a73c..bd6c2d03e02 100644
--- a/addons/pad_project/i18n/zh_CN.po
+++ b/addons/pad_project/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-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 09:54+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:49+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
@@ -25,7 +25,7 @@ msgstr "错误！任务结束日期必须大于任务开始日期"
 #. module: pad_project
 #: field:project.task,description_pad:0
 msgid "Description PAD"
-msgstr ""
+msgstr "PAD 说明"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/plugin_outlook/i18n/zh_CN.po b/addons/plugin_outlook/i18n/zh_CN.po
index 4a108f01ede..49dbb66611a 100644
--- a/addons/plugin_outlook/i18n/zh_CN.po
+++ b/addons/plugin_outlook/i18n/zh_CN.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 09:56+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:53+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
 msgid "Outlook Plug-in 32bits"
-msgstr ""
+msgstr "32位Outlook 插件"
 
 #. module: plugin_outlook
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "下载并安装插件"
 
 #. module: plugin_outlook
 #: model:ir.model,name:plugin_outlook.model_outlook_installer
@@ -35,7 +35,7 @@ msgstr "outlook.installer"
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "MS .Net Framework 3.5 or above."
-msgstr ""
+msgstr "MS  .net 框架3.5 或以上"
 
 #. module: plugin_outlook
 #: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
@@ -48,7 +48,7 @@ msgstr "安装Outlook插件"
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "System requirements:"
-msgstr ""
+msgstr "系统要求"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -60,22 +60,22 @@ msgstr "标题"
 msgid ""
 "Click on the link above to download the installer for either 32 or 64 bits, "
 "and execute it."
-msgstr ""
+msgstr "在链接上面单击 下载32位或64位安装文件，然后执行。"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "MS Outlook 2005 or above."
-msgstr ""
+msgstr "MS Outlook 2005 或以上"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin64:0
 msgid "Outlook Plug-in 64bits"
-msgstr ""
+msgstr "64位Outlook 插件"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -86,7 +86,7 @@ msgstr "安装和设置步骤"
 #: help:outlook.installer,plugin32:0
 #: help:outlook.installer,plugin64:0
 msgid "Outlook plug-in file. Save this file and install it in Outlook."
-msgstr ""
+msgstr "Outlook 插件文件，保存，然后在Outlook中安装"
 
 #~ msgid "Outlook Plug-in"
 #~ msgstr "Outlook插件"
diff --git a/addons/plugin_thunderbird/i18n/zh_CN.po b/addons/plugin_thunderbird/i18n/zh_CN.po
index d7d758a373d..4581f592c4d 100644
--- a/addons/plugin_thunderbird/i18n/zh_CN.po
+++ b/addons/plugin_thunderbird/i18n/zh_CN.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 10:00+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 13:58+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "重启Thunderbird。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Thunderbird 插件安装："
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "下载并安装插件"
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
@@ -43,7 +43,7 @@ msgstr "安装 Thunderbird 插件"
 #: help:plugin_thunderbird.installer,plugin_file:0
 msgid ""
 "Thunderbird plug-in file. Save this file and install it in Thunderbird."
-msgstr ""
+msgstr "Thunderbird 插件的文件file。保存此文件，然后在Thunderbird 中安装。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -63,7 +63,7 @@ msgstr "文件名"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "单击“现在安装”"
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -79,7 +79,7 @@ msgstr "Thunderbird 插件"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "配置你的 openerp 服务器"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -91,17 +91,17 @@ msgstr "允许你选择一个你想链接到你电子邮件和它的附件的对
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "保存 Thunderbird 插件。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "选择插件（文件名是 openerp_plugin.xpi ）。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -109,11 +109,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"从 Thunderbird 的菜单条：Tools ­> Add-ons -> Screwdriver/Wrench Icon ->  Install "
+"add-on from file..."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "从 Thunderbird  的菜单条 : OpenERP -> Configuration."
 
 #~ msgid "Description"
 #~ msgstr "描述"
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index 8bbc8f67a01..3d47ee53823 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 18:18+0000\n"
+"PO-Revision-Date: 2012-11-28 18:29+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:45+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr "Numéro du Produit"
+msgstr "N° article"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
@@ -130,7 +130,7 @@ msgstr "Jour"
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr "Nom du Produit"
+msgstr "Nom de l'article"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template
@@ -787,7 +787,7 @@ msgstr "Pizza"
 #: code:addons/point_of_sale/wizard/pos_return.py:240
 #, python-format
 msgid "Add Product"
-msgstr "Ajouter un produit"
+msgstr "Ajouter un article"
 
 #. module: point_of_sale
 #: field:pos.config,name:0
@@ -992,7 +992,7 @@ msgstr "Mars"
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
 #: report:pos.user.product:0
 msgid "User's Product"
-msgstr "Produit utilisateur"
+msgstr "Articles utilisateur"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1141
@@ -1002,7 +1002,7 @@ msgid ""
 "Please set one before choosing a product."
 msgstr ""
 "Vous devez sélectionner une liste de prix dans le formulaire de vente !\n"
-"Veuillez en choisir une avant de choisir un produit"
+"Veuillez en choisir une avant de choisir un article"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
@@ -1449,7 +1449,7 @@ msgstr "Dr. Oetker Restaurant Funghi"
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_category
 msgid "Product Categories"
-msgstr ""
+msgstr "Catégories d'articles"
 
 #. module: point_of_sale
 #: help:pos.config,journal_id:0
@@ -1581,7 +1581,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:348
 #, python-format
 msgid "The scanned product was not recognized"
-msgstr ""
+msgstr "L'article scanné n'a pas été reconnu"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -1690,7 +1690,7 @@ msgstr "Annuler"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:306
 #, python-format
 msgid "Please put your product on the scale"
-msgstr ""
+msgstr "Veuillez placer l'article sur la balance"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -1725,7 +1725,7 @@ msgstr "Prix unitaire"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:184
 #, python-format
 msgid "Product Weighting"
-msgstr ""
+msgstr "Pesée des articles"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1866,7 +1866,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.unreferenced_product_product_template
 msgid "Unreferenced Products"
-msgstr ""
+msgstr "Article inconnu"
 
 #. module: point_of_sale
 #: view:pos.ean_wizard:0
@@ -1949,6 +1949,8 @@ msgstr ""
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
+"Indique l'ordre d'affichage lorsqu'une liste de catégories d'articles est "
+"affichée."
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -2099,7 +2101,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_products
 #: view:pos.order:0
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
@@ -2283,7 +2285,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Qty of product"
-msgstr "Qté de Produits"
+msgstr "Qté d'articles"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_golden_perlim_product_template
@@ -2323,7 +2325,7 @@ msgstr "Coca-Cola Light 50cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:472
 #, python-format
 msgid "Unknown Product"
-msgstr ""
+msgstr "Article inconnu"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2754,7 +2756,7 @@ msgstr "Statistiques des commandes du point de vente"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_pollo_product_template
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index d7550e0f2b4..9e2bff2b962 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -8,11 +8,29 @@
             <field name="public">public</field>
         </record>
 
-        <record id="action_news" model="ir.actions.act_window">
+        <record id="action_news" model="ir.actions.client">
             <field name="name">News</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="company_news_feed"/>
-            <field name="view_mode">form</field>
+            <field name="tag">mail.wall</field>
+            <field name="model">mail.group</field>
+            <field name="params" eval="{
+                'domain': [
+                    ('model', '=', 'mail.group'),
+                    ('res_id', '=', ref('company_news_feed'))
+                ],
+                'context':{
+                    'search_default_message_unread': False,
+                    'default_model': 'mail.group',
+                    'default_res_id': ref('company_news_feed'),
+                },
+                'show_link_partner': False,
+                'res_model': 'mail.message',
+                'thread_level': 1,
+            }"/>
+            <field name="help" type="html">
+                <p>
+                    Youd don't have unread company's news.
+                </p>
+            </field>
         </record>
 
         <!-- Mail group for the company's jobs -->
@@ -21,11 +39,30 @@
             <field name="public">public</field>
         </record>
 
-        <record id="action_jobs" model="ir.actions.act_window">
+        <record id="action_jobs" model="ir.actions.client">
             <field name="name">Jobs</field>
-            <field name="res_model">mail.group</field>
+            <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
             <field name="res_id" ref="company_jobs"/>
-            <field name="view_mode">form</field>
+            <field name="params" eval="{
+                'domain':[
+                    ('model', '=', 'mail.group'),
+                    ('res_id', '=', ref('company_jobs'))
+                ],
+                'context':{
+                    'search_default_message_unread': False,
+                    'default_model': 'mail.group',
+                    'default_res_id': ref('company_jobs'),
+                },
+                'show_link_partner': False,
+                'res_model': 'mail.message',
+                'thread_level': 1,
+            }"/>
+            <field name="help" type="html">
+                <p>
+                    Youd don't have unread job offers.
+                </p>
+            </field>
         </record>
         
 
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index a5b35a069b1..b7765e63ffd 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -8,18 +8,18 @@
             groups="base.group_no_one,portal.group_portal"
             sequence="15"/>
 
-            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
-                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
-                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
-
-            <!--
-                Create menu items that we'll leave empty for now - they'll be
-                filled up by other portal modules.
-            -->
-            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
-            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
-            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
-            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+        <menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10"/>
+        <menuitem name="About Us" id="portal_company" parent="portal_menu" sequence="200"/>
+        <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+        <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+        <!--
+            Create menu items that we'll leave empty for now - they'll be
+            filled up by other portal modules.
+        -->
+        <menuitem name="Quotations and Sales Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+        <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="30"/>
+        <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>        
 
         <!-- extend res.groups search view -->
         <record id="group_search_view" model="ir.ui.view">
@@ -47,5 +47,39 @@
             </field>
         </record>
 
+        <record id="action_mail_inbox_feeds_portal" model="ir.actions.client">
+            <field name="name">Inbox</field>
+            <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid,
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('notification_ids.partner_id.user_ids', 'in', [uid]),
+                  ('to_read', '=', True),
+                  ('favorite_user_ids', 'not in', [uid])
+                ],
+                'show_compose_message': False,
+                'show_link_partner': False,
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read'
+            }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>Good Job!</b> Your inbox is empty.
+                </p><p>
+                    Your inbox contains private messages or emails sent to you
+                    as well as information related to documents or people you
+                    follow.
+                </p>
+            </field>
+        </record>
+
+        <menuitem name="Inbox" id="portal_inbox" parent="portal_messages"
+            action="action_mail_inbox_feeds_portal" sequence="10"/>
+
     </data>
 </openerp>
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index b6d932bf7ee..b9f98f81fd7 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mail_message_portal,mail.message.portal,mail.model_mail_message,group_portal,1,0,1,1
+access_mail_notification_portal,mail.notification.portal,mail.model_mail_notification,group_portal,1,1,1,0
 access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
 access_res_partner_address,res.partner_address,base.model_res_partner_address,portal.group_portal,1,0,0,0
 access_res_partner_category,res.partner_category,base.model_res_partner_category,portal.group_portal,1,0,0,0
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index bf8353c92c1..48bb0f94858 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -50,10 +50,6 @@ OpenERP - Open Source Business Applications
 http://www.openerp.com
 """)
 
-def random_password():
-    # temporary random stuff; user password is reset by signup process
-    chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-    return ''.join(random.choice(chars) for i in xrange(12))
 
 def extract_email(email):
     """ extract the email address from a user-friendly email address """
@@ -180,7 +176,6 @@ class wizard_user(osv.osv_memory):
         create_context = dict(context or {}, noshortcut=True)       # to prevent shortcut creation
         values = {
             'login': extract_email(wizard_user.email),
-            'password': random_password(),
             'partner_id': wizard_user.partner_id.id,
             'groups_id': [(6, 0, [])],
             'share': True,
@@ -219,6 +214,7 @@ class wizard_user(osv.osv_memory):
             'body_html': '<pre>%s</pre>' % (_(WELCOME_EMAIL_BODY) % data),
             'state': 'outgoing',
         }
-        return mail_mail.create(cr, uid, mail_values, context=this_context)
+        mail_id = mail_mail.create(cr, uid, mail_values, context=this_context)
+        return mail_mail.send(cr, uid, [mail_id], context=this_context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_claim/portal_claim_view.xml b/addons/portal_claim/portal_claim_view.xml
index e08b39e476b..cd0e4941286 100644
--- a/addons/portal_claim/portal_claim_view.xml
+++ b/addons/portal_claim/portal_claim_view.xml
@@ -6,10 +6,11 @@
             <field name="name">Claims</field>
             <field name="res_model">crm.claim</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,calendar,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="view_id" ref="crm_claim.crm_case_claims_tree_view"/>
-            <field name="context">{"search_default_user_id":'', "stage_type":'claim'}</field>
+            <field name="context">{"search_default_user_id":'', "stage_type":'claim', "portal":'True'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
+            <field name="target">current</field>
             <field name="help"  type="html">
               <p class="oe_view_nocontent_create">
                 Click to register a new claim. 
diff --git a/addons/portal_claim/security/ir.model.access.csv b/addons/portal_claim/security/ir.model.access.csv
index ab2a2f66770..4fcfd0f947f 100644
--- a/addons/portal_claim/security/ir.model.access.csv
+++ b/addons/portal_claim/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_crm_claim,crm.claim,crm_claim.model_crm_claim,portal.group_portal,1,0,0,0
+access_crm_claim,crm.claim,crm_claim.model_crm_claim,portal.group_portal,1,0,1,0
 access_crm_claim_stage,crm.claim.stage,crm_claim.model_crm_claim_stage,portal.group_portal,1,0,0,0
diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index 3742765f795..af5261c408b 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
+        <record id="portal_claim_rule" model="ir.rule">
             <field name="name">Portal Personal Claims</field>
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
             <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
diff --git a/addons/portal_crm/__init__.py b/addons/portal_crm/__init__.py
index 6b791be9f25..92b3ac62321 100644
--- a/addons/portal_crm/__init__.py
+++ b/addons/portal_crm/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import wizard
+import contact
diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py
index 1516ab13961..2eaa829e88a 100644
--- a/addons/portal_crm/__openerp__.py
+++ b/addons/portal_crm/__openerp__.py
@@ -31,7 +31,9 @@ This module adds a contact page (with a contact form creating a lead when submit
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','portal'],
-    'data': ['wizard/contact_view.xml'],
+    'data': [
+        'contact_view.xml',
+    ],
     'test': [
         'test/contact_form.yml',
     ],
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/contact.py
index a0f0d952a66..132f4db34d5 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/contact.py
@@ -83,7 +83,7 @@ class crm_contact_us(osv.TransientModel):
         Since they are potentially sensitive, we don't want any user to be able
         to read datas generated through this module.  Therefore we'll write
         these information directly in the crm.lead table and leave blank
-        entries in the portal_crm.crm_contact_us table.
+        entries in the contact table.
         This is why the create() method is overwritten.
         """
         crm_lead = self.pool.get('crm.lead')
@@ -95,11 +95,11 @@ class crm_contact_us(osv.TransientModel):
         it is quite complicated to set proper rights for this object.
         Therefore, user SUPERUSER_ID will perform the creation.
         """
-        values['contact_name'] = values['name']
+        values['contact_name'] = values['partner_name']
         crm_lead.create(cr, SUPERUSER_ID, dict(values,user_id=False), context)
 
         """
-        Create an empty record in the portal_crm.crm_contact_us table.
+        Create an empty record in the contact table.
         Since the 'name' field is mandatory, give an empty string to avoid an integrity error.
         """
         empty_values = dict((k, False) if k != 'name' else (k, '') for k, v in values.iteritems())
@@ -114,7 +114,7 @@ class crm_contact_us(osv.TransientModel):
             'res_model': self._name,
             'res_id': ids[0],
             'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
-            'target': 'inline',
+            'target': 'new',
         }
 
     def _needaction_domain_get(self, cr, uid, context=None):
diff --git a/addons/portal_crm/contact_view.xml b/addons/portal_crm/contact_view.xml
new file mode 100644
index 00000000000..8fcd2e9b08f
--- /dev/null
+++ b/addons/portal_crm/contact_view.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="contact_form_view" model="ir.ui.view">
+            <field name="name">Contact form</field>
+            <field name="model">portal_crm.crm_contact_us</field>
+            <field name="arch" type="xml">
+                <form string="Contact form" version="7.0" class="oe_portal_crm_contact">
+                    <h1>Contact us</h1>
+                    <div style="width: 300px; float:right;">
+                        <field name="company_ids" nolabel="1" widget="many2many_kanban" class="oe_portal_crm_office" colspan="2">
+                            <kanban>
+                                <field name="name"/>
+                                <field name="email"/>
+                                <field name="phone"/>
+                                <field name="street"/>
+                                <field name="street2"/>
+                                <field name="zip"/>
+                                <field name="city"/>
+                                <field name="country_id" options='{"no_open": True}'/>
+                                <field name="state_id" options='{"no_open": True}'/>
+                                <templates>
+                                    <t t-name="kanban-box">
+                                        <h4><field name="name"/></h4>
+                                        <ul class="oe_portal_crm_address">
+                                            <li t-if="record.street"><field name="street"/></li>
+                                            <li t-if="record.street2"><field name="street2"/></li>
+                                            <li t-if="record.zip"><field name="zip"/></li>
+                                            <li t-if="record.city"><field name="city"/></li>
+                                            <li t-if="record.country_id"><field name="country_id"/></li>
+                                        </ul>
+                                        <ul class="oe_portal_crm_contact_info">
+                                            <li t-if="record.phone"><field name="phone"/></li>
+                                            <li t-if="record.email.raw_value">
+                                                <a title="Mail" t-att-href="'mailto:'+record.email.value">
+                                                <field name="email"/>
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </t>
+                                </templates>
+                            </kanban>
+                        </field>
+                        <div class="oe_portal_crm_team">
+                        
+                        </div>
+                    </div>
+                    <div  style="margin-right: 320px; max-width: 900px;">
+                        <group>
+                            <group>
+                                <field name="partner_name" string="Name" placeholder="Your name..."/>
+                                <field name="email_from" placeholder="Your email..."/>
+                                <field name="phone" placeholder="Your phone number..."/>                                
+                            </group>
+                            <field name="name" placeholder="Subject..." nolabel="1" colspan="2"/>
+                            <field name="description" String="Content" placeholder="Content..." nolabel="1" colspan="2"/>
+                        </group>
+                    </div>
+                    <div>
+                        <button string="Submit" name="submit" type="object" class="oe_highlight"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- wizard thanks message (shows after submitting the form) -->
+        <record id="wizard_contact_form_view_thanks" model="ir.ui.view">
+            <field name="name">Wizard thanks message</field>
+            <field name="model">portal_crm.crm_contact_us</field>
+            <!-- give it a low priority to ensure this won't be the default view -->
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <form string="Thank you" version="7.0">
+                    <!--
+                        make sure there is at least one field in the view,
+                        otherwise the orm will try to select all the model's
+                        records and this will result in a permission denied error
+                    -->
+                    <field name="partner_name" invisible="1"/>
+                    <label string="Thank you for your interest, we'll respond to your request shortly."/>
+                    <footer>
+                        <button string="Close" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_contact_us" model="ir.actions.act_window">
+            <field name="name">Contact Us</field>
+            <field name="res_model">portal_crm.crm_contact_us</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="contact_form_view"/>
+            <field name="target">inline</field>
+        </record>
+
+        <!-- attach it to the portal menu -->
+        <menuitem name="Contact" id="portal_company_contact"
+            parent="portal.portal_company" action="action_contact_us" sequence="40"/>
+
+    </data>
+</openerp>
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index 0589eb92e71..e322f1cb9da 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -1,8 +1,6 @@
  /* Root container */
 .openerp .oe_portal_crm_contact {
-    width: 800px;
-    margin: auto;
-    padding: 8px 0 0 0;
+    min-width: 960px;
 }
 
 /* Contact form section */
diff --git a/addons/portal_crm/wizard/__init__.py b/addons/portal_crm/wizard/__init__.py
deleted file mode 100644
index 92b3ac62321..00000000000
--- a/addons/portal_crm/wizard/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import contact
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
deleted file mode 100644
index 778e7f9562e..00000000000
--- a/addons/portal_crm/wizard/contact_view.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <!-- wizard form view -->
-        <record id="wizard_contact_form_view" model="ir.ui.view">
-            <field name="name">Wizard form view</field>
-            <field name="model">portal_crm.crm_contact_us</field>
-            <field name="arch" type="xml">
-                <form string="Contact wizard view" version="7.0">
-                    <div class="oe_portal_crm_contact">
-                        <h1>Contact us</h1>
-                        <table>
-                          <tr>
-                            <td width="70%%">
-                                <div class="oe_portal_crm_contact_form">
-                                    <group>
-                                        <field name="name"/>
-                                        <field name="partner_name"/>
-                                        <field name="email_from"/>
-                                        <field name="phone"/>
-                                        <field name="description"/>
-                                        <button string="Submit" name="submit" type="object"/>
-                                    </group>
-                                </div>
-                            </td>
-                            <td>
-                                <div class="oe_portal_crm_office">
-                                    <field name="company_ids" widget="many2many_kanban">
-                                        <kanban>
-                                            <field name="name"/>
-                                            <field name="email"/>
-                                            <field name="phone"/>
-                                            <field name="street"/>
-                                            <field name="street2"/>
-                                            <field name="zip"/>
-                                            <field name="city"/>
-                                            <field name="country_id" options='{"no_open": True}'/>
-                                            <field name="state_id" options='{"no_open": True}'/>
-                                            <templates>
-                                                <t t-name="kanban-box">
-                                                    <h4><field name="name"/></h4>
-                                                    <ul class="oe_portal_crm_address">
-                                                        <li t-if="record.street"><field name="street"/></li>
-                                                        <li t-if="record.street2"><field name="street2"/></li>
-                                                        <li t-if="record.zip"><field name="zip"/></li>
-                                                        <li t-if="record.city"><field name="city"/></li>
-                                                        <li t-if="record.country_id"><field name="country_id"/></li>
-                                                    </ul>
-                                                    <ul class="oe_portal_crm_contact_info">
-                                                        <li t-if="record.phone"><field name="phone"/></li>
-                                                        <li t-if="record.email.raw_value">
-                                                            <a title="Mail" t-att-href="'mailto:'+record.email.value">
-                                                            <field name="email"/>
-                                                            </a>
-                                                        </li>
-                                                    </ul>
-                                                </t>
-                                            </templates>
-                                        </kanban>
-                                    </field>
-                                </div>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td colspan="2">
-                                <div class="oe_portal_crm_team">
-
-                                </div>
-                            </td>
-                          </tr>
-                        </table>
-                    </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- wizard thanks message (shows after submitting the form) -->
-        <record id="wizard_contact_form_view_thanks" model="ir.ui.view">
-            <field name="name">Wizard thanks message</field>
-            <field name="model">portal_crm.crm_contact_us</field>
-            <!-- give it a low priority to ensure this won't be the default view -->
-            <field name="priority">99</field>
-            <field name="arch" type="xml">
-                <form string="Thank you">
-                    <!--
-                        make sure there is at least one field in the view,
-                        otherwise the orm will try to select all the model's
-                        records and this will result in a permission denied error
-                    -->
-                    <field name="name" invisible="1"/>
-                    <label string="Thank you for your interest, we'll respond to your request shortly."/>
-                </form>
-            </field>
-        </record>
-
-        <!-- wizard action -->
-        <record id="action_wizard_contact_us" model="ir.actions.act_window">
-            <field name="name">Contact</field>
-            <field name="res_model">portal_crm.crm_contact_us</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
-        <!-- attach it to the portal menu -->
-        <menuitem name="Contact" id="portal_company_contact"
-            parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
-
-    </data>
-</openerp>
diff --git a/addons/portal_event/i18n/zh_CN.po b/addons/portal_event/i18n/zh_CN.po
new file mode 100644
index 00000000000..31eb1eaf09b
--- /dev/null
+++ b/addons/portal_event/i18n/zh_CN.po
@@ -0,0 +1,64 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 12:36+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_event
+#: view:event.event:0
+msgid "Portal Settings"
+msgstr "门户设置"
+
+#. module: portal_event
+#: model:ir.actions.act_window,help:portal_event.action_event_view
+msgid "There are no public events."
+msgstr "没有公共的活动。"
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Public"
+msgstr "公共的"
+
+#. module: portal_event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "错误！结束日期不能在开始日期前。"
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Private"
+msgstr "私有的"
+
+#. module: portal_event
+#: model:ir.model,name:portal_event.model_event_event
+msgid "Event"
+msgstr "活动"
+
+#. module: portal_event
+#: field:event.event,visibility:0
+msgid "Visibility"
+msgstr "可见性"
+
+#. module: portal_event
+#: help:event.event,visibility:0
+msgid "Event's visibility in the portal's contact page"
+msgstr "活动在门户联系人页面的可见性"
+
+#. module: portal_event
+#: model:ir.actions.act_window,name:portal_event.action_event_view
+#: model:ir.ui.menu,name:portal_event.portal_company_events
+msgid "Events"
+msgstr "活动"
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
index 5d2397f6148..0a0f59d7857 100755
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -10,14 +10,14 @@
             <field name="name">Events</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">event.event</field>
-            <field name="view_mode">kanban,calendar,tree,form,graph</field>
+            <field name="view_mode">kanban,calendar,tree,form</field>
             <field name="context">{"search_default_upcoming":1}</field>
             <field name="search_view_id" ref="event.view_event_search"/>
             <field name="help">There are no public events.</field>
         </record>
 
         <menuitem name="Events" id="portal_company_events" parent="portal.portal_company"
-            action="action_event_view" sequence="40"/>
+            action="action_event_view" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 8f17808345b..22e630f33ef 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_event_rule" model="ir.rule">
             <field name="name">Portal Visible Events</field>
             <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">[('visibility', '=', 'public')]</field>
+            <field name="domain_force">['|', ('visibility', '=', 'public'), ('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
index b54e544a744..94acea8c4aa 100644
--- a/addons/portal_hr_employees/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -23,8 +23,8 @@ from osv import osv, fields
 
 class crm_contact_us(osv.TransientModel):
     """ Add employees list to the portal's contact page """
-    _description = 'Contact form for the portal'
     _inherit = 'portal_crm.crm_contact_us'
+    _description = 'Contact form for the portal'
     _columns = {
         'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True),
     }
@@ -51,6 +51,7 @@ class hr_employee(osv.osv):
     _columns = {
         'visibility': fields.selection([('public', 'Public'),('private', 'Private')],
             string='Visibility', help='Employee\'s visibility in the portal\'s contact page'),
+        'public_info': fields.text(),
     }
     _defaults = {
         'visibility': 'private',
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 4e133061da6..4ffca098c55 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -1,56 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data>        
 
         <!-- add visibility field to the employee form view -->
         <record id="view_employee_form" model="ir.ui.view">
-            <field name="name">portal_hr_employees.employee.form</field>
+            <field name="name">portal_hr_employees_form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='active']" position="before">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="visibility"/>
+                    <field name="public_info" String="Public Notes" placeholder="Here you can write information about you to be shown in the portal..." attrs='{"invisible":[("visibility", "=", "private")]}'/>
                 </xpath>
             </field>
         </record>
 
-        <!-- a kanban view of the employees to the portal's contact page -->
-        <record id="wizard_contact_form_view_employees_list" model="ir.ui.view">
-            <field name="name">portal_hr_employees.employees_list</field>
+        <record id="portal_view_employee_filter" model="ir.ui.view">
+            <field name="name">Employees</field>
+            <field name="model">hr.employee</field>
+            <field name="arch" type="xml">
+                <search string="Employees">
+                    <field name="name" string="Employees"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_team" model="ir.actions.act_window">
+            <field name="name">Meet the team</field>
+            <field name="res_model">hr.employee</field>
+            <field name="view_id" ref="hr.hr_kanban_view_employees"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('visibility','!=','private')]</field>
+            <field name="search_view_id" ref="portal_view_employee_filter"/>
+            <field name="target">current</field>
+        </record>
+
+        <record id="crm_contact_us" model="ir.ui.view">
+            <field name="name">crm_contact_us</field>
             <field name="model">portal_crm.crm_contact_us</field>
-            <field name="inherit_id" ref="portal_crm.wizard_contact_form_view"/>
+            <field name="inherit_id" ref="portal_crm.contact_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
-                    <h1>Meet the team</h1>
-                    <field name="employee_ids" widget="many2many_kanban">
-                        <kanban>
-                            <field name="visibility"/>
-
-                            <templates>
-                                <t t-name="kanban-box">
-                                    <div class="oe_employee_vignette">
-                                        <div class="oe_employee_image">
-                                            <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
-                                        </div>
-                                        <div class="oe_employee_details">
-                                            <h4>
-                                                <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
-                                            </h4>
-                                            <ul>
-                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
-                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
-                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
-                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </t>
-                            </templates>
-                        </kanban>
-                    </field>
+                    <a href="#action=portal_hr_employees.action_team">Meet the team</a>
                 </xpath>
             </field>
         </record>
 
+        
     </data>
 </openerp>
diff --git a/addons/portal_hr_employees/i18n/zh_CN.po b/addons/portal_hr_employees/i18n/zh_CN.po
new file mode 100644
index 00000000000..33f22506e78
--- /dev/null
+++ b/addons/portal_hr_employees/i18n/zh_CN.po
@@ -0,0 +1,73 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 14:15+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_hr_employees
+#: view:portal_crm.crm_contact_us:0
+msgid "Tel:"
+msgstr "电话:"
+
+#. module: portal_hr_employees
+#: field:portal_crm.crm_contact_us,employee_ids:0
+msgid "Employees"
+msgstr "员工"
+
+#. module: portal_hr_employees
+#: view:portal_crm.crm_contact_us:0
+msgid "Mobile:"
+msgstr "手机："
+
+#. module: portal_hr_employees
+#: help:hr.employee,visibility:0
+msgid "Employee's visibility in the portal's contact page"
+msgstr "员工的可见性在门户联系人页面"
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Private"
+msgstr "私有的"
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Public"
+msgstr "公共的"
+
+#. module: portal_hr_employees
+#: field:hr.employee,visibility:0
+msgid "Visibility"
+msgstr "可见性"
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr "来自门户的联系方式"
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_hr_employee
+msgid "Employee"
+msgstr "员工"
+
+#. module: portal_hr_employees
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr "错误！，你不能创建循环的员工层次"
+
+#. module: portal_hr_employees
+#: view:portal_crm.crm_contact_us:0
+msgid "Meet the team"
+msgstr "团队集会"
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index 5fa658de8c1..da511eaf2c0 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -3,14 +3,13 @@
     width: 100%;
 }
 .openerp .oe_portal_crm_contact .oe_portal_crm_team {
-    padding: 8px 0 0 0;
+    margin-top: 30px;
+    padding-top: 30px;
 }
 .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details {
     width: 170px;
 }
 .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image {
-    width: 65px;
-    height: 65px;
 }
 
 .openerp .oe_employee_vignette ul, .openerp .oe_employee_vignette li {
diff --git a/addons/portal_project/i18n/zh_CN.po b/addons/portal_project/i18n/zh_CN.po
new file mode 100644
index 00000000000..a695b514412
--- /dev/null
+++ b/addons/portal_project/i18n/zh_CN.po
@@ -0,0 +1,23 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 09:37+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_project
+#: model:ir.ui.menu,name:portal_project.portal_services_tasks
+msgid "Tasks"
+msgstr "任务"
diff --git a/addons/portal_project/portal_project_view.xml b/addons/portal_project/portal_project_view.xml
index 51f6683382a..b7f3568545b 100644
--- a/addons/portal_project/portal_project_view.xml
+++ b/addons/portal_project/portal_project_view.xml
@@ -2,8 +2,24 @@
 <openerp>
     <data>
 
-        <menuitem name="Tasks" id="portal_services_tasks" parent="portal.portal_projects"
-            action="project.action_view_task" sequence="20"/>
+        <record id="open_view_project" model="ir.actions.act_window">
+            <field name="name">Projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">form</field>
+            <field name="domain">[]</field>
+            <field name="view_mode">kanban,gantt</field>
+            <field name="view_id" ref="project.view_project_kanban"/>
+            <field name="search_view_id" ref="project.view_project_project_filter"/>
+            <field name="context">{}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                  Click to start a new project.
+                </p>
+            </field>
+        </record>
+
+        <menuitem name="Projects" id="portal_services_projects" parent="portal.portal_projects"
+            action="open_view_project" sequence="10"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_project/security/ir.model.access.csv b/addons/portal_project/security/ir.model.access.csv
index 85463868ee1..0e743050568 100644
--- a/addons/portal_project/security/ir.model.access.csv
+++ b/addons/portal_project/security/ir.model.access.csv
@@ -1,5 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_task,tasks,project.model_project_task,portal.group_portal,1,0,0,0
+access_project,project,project.model_project_project,portal.group_portal,1,0,0,0
+access_task,task,project.model_project_task,portal.group_portal,1,0,0,0
 access_task_type,task_type,project.model_project_task_type,portal.group_portal,1,0,0,0
 access_task_work,task_work,project.model_project_task_work,portal.group_portal,1,0,0,0
 access_project_category,project_category,project.model_project_category,portal.group_portal,1,0,0,0
+access_account_analytic_account,account_analytic_account,analytic.model_account_analytic_account,portal.group_portal,1,0,0,0
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index ba686f72db4..0d995cfd70b 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -2,15 +2,18 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="portal_project_rule" model="ir.rule">
+            <field name="name">Portal Projects</field>
+            <field ref="project.model_project_project" name="model_id"/>
+            <field name="domain_force">['|', ('privacy_visibility', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+        </record>
+
         <record id="portal_task_rule" model="ir.rule">
-            <field name="name">Portal Personal Task</field>
+            <field name="name">Portal Tasks</field>
             <field ref="project.model_project_task" name="model_id"/>
             <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_project_issue/__init__.py b/addons/portal_project_issue/__init__.py
index 26c654db9dd..45de899ed49 100644
--- a/addons/portal_project_issue/__init__.py
+++ b/addons/portal_project_issue/__init__.py
@@ -18,4 +18,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
diff --git a/addons/portal_project_issue/i18n/zh_CN.po b/addons/portal_project_issue/i18n/zh_CN.po
new file mode 100644
index 00000000000..e8f5cc093da
--- /dev/null
+++ b/addons/portal_project_issue/i18n/zh_CN.po
@@ -0,0 +1,48 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 14:20+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr "创建："
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:portal_project_issue.portal_after_sales_issues
+msgid "Issues"
+msgstr "问题"
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                OpenERP's kanban view will help you track easily your "
+"current \n"
+"                pipeline of issues to fix.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建一个问题.\n"
+"              </p><p>\n"
+"                OpenERP的看板视图将帮助你更便于跟踪你的当前问题被修复的途径。\n"
+"              </p>\n"
+"            "
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 6502d92b4dc..2750edf300f 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -18,18 +18,24 @@
                         <t t-name="kanban-box">
                             <div class="oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_kanban_content">
+                                    <div class="oe_portal_project_issue">
+                                        <div><h1><field name="name"/></h1></div>
+                                        <div class="oe_kanban_footer_left">
+                                            <field name="partner_id" context="{'portal':1}"/> <br/>
+                                            <field name="version_id"/>                                            
+                                        </div>
+                                        <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
+                                        <div class="oe_text_right">
+                                            <h1><field name="state" readonly="1"/></h1>
+                                        </div>
+                                    </div>
                                     <div>
                                         <h1><a type="open"><field name="name"/></a></h1>
                                         <field name="partner_id"/> <br/>
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left oe_tags">
-                                            <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                                <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                            </t>
-                                            <field name="categ_ids"/>
-                                        </div>
+                                        <field name="categ_ids"/>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
                                             <span class="oe_kanban_highlight">
@@ -54,7 +60,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="oe_clear"></div>
+                                <div class="oe_clear"/>
                             </div>
                         </t>
                     </templates>
@@ -69,20 +75,18 @@
             <field name="view_mode">kanban,form</field>
             <field name="view_id" ref="portal_project_issue_kanban_view"/>
             <field name="domain" eval=""/>
-            <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":''}</field>
+            <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":'', "portal":'True'}</field>
             <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>
+            <field name="target">current</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create an issue.
               </p><p>
-                OpenERP's kanban view will help you track easily your current 
-                pipeline of issues to fix.
+                You can track your issues from this menu and the action we
+                will take.
               </p>
             </field>
         </record>
 
-        <menuitem name="Issues" id="portal_after_sales_issues" parent="portal.portal_projects"
-            action="project_issue_categ_act0" sequence="10"/>
-
     </data>
 </openerp>
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css
index 39c12c6076d..983b7d6804f 100644
--- a/addons/portal_project_issue/static/src/css/portal_project_issue.css
+++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css
@@ -1,5 +1,4 @@
 .oe_portal_project_issue {
-    width: 960px;
     margin: 0 auto;
 }
 
@@ -10,7 +9,6 @@
 .oe_portal_project_issue .oe_fold_column.oe_kanban_record {
     float: none;
     display: block;
-    width: 100%;
     border-width: 1px;
     border-radius: 4px;
     border-style: solid;
@@ -27,6 +25,6 @@
 
 .oe_portal_project_issue .oe_fold_column.oe_kanban_record h1 {
     margin: 0;
-    font-size: 1.2em;
+    font-size: 1.1em;
     font-weight: bold;
 }
diff --git a/addons/portal_sale/__init__.py b/addons/portal_sale/__init__.py
index f8c8c7d6446..296de46594a 100644
--- a/addons/portal_sale/__init__.py
+++ b/addons/portal_sale/__init__.py
@@ -19,5 +19,7 @@
 #
 ##############################################################################
 
+import account_invoice
+import sale
 import portal_sale
-import res_config
\ No newline at end of file
+import res_config
diff --git a/addons/portal_sale/__openerp__.py b/addons/portal_sale/__openerp__.py
index a993ab9c462..b8ce9165283 100644
--- a/addons/portal_sale/__openerp__.py
+++ b/addons/portal_sale/__openerp__.py
@@ -44,7 +44,7 @@ pay online on their Sale Orders and Invoices that are not paid yet. Paypal is in
 by default, you simply need to configure a Paypal account in the Accounting/Invoicing settings.
     """,
     'author': 'OpenERP SA',
-    'depends': ['sale_stock','portal'],
+    'depends': ['sale','portal'],
     'data': [
         'security/portal_security.xml',
         'portal_sale_view.xml',
diff --git a/addons/portal_sale/account_invoice.py b/addons/portal_sale/account_invoice.py
new file mode 100644
index 00000000000..fa81b2049e0
--- /dev/null
+++ b/addons/portal_sale/account_invoice.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+
+    def invoice_validate(self, cr, uid, ids, context=None):
+        # fetch the partner's id and subscribe the partner to the sale order
+        partner = self.browse(cr, uid, ids[0], context=context)['partner_id']
+        if partner.id not in self.browse(cr, uid, ids[0], context=context)['message_follower_ids']:
+            self.message_subscribe(cr, uid, ids, [partner.id], context=context)
+            document = self.browse(cr, uid, ids[0], context=context)
+            mail_values = {
+                'email_from': self.pool.get('res.users').browse(cr, uid, uid, context=context)['partner_id']['email'],
+                'email_to': partner.email,
+                'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
+                'auto_delete': True,
+            }
+            mail_obj = self.pool.get('mail.mail')
+            mail_id = mail_obj.create(cr, uid, mail_values, context=context)
+            mail_obj.send(cr, uid, [mail_id], recipient_ids=[partner.id], context=context)
+        return super(account_invoice, self).invoice_validate(cr, uid, ids, context=context)
\ No newline at end of file
diff --git a/addons/portal_sale/i18n/zh_CN.po b/addons/portal_sale/i18n/zh_CN.po
new file mode 100644
index 00000000000..0816131b680
--- /dev/null
+++ b/addons/portal_sale/i18n/zh_CN.po
@@ -0,0 +1,438 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-28 17:12+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "订单号必须在一个公司范围内唯一"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.product_normal_action
+msgid "There are no public products."
+msgstr "没有公共产品"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_picking_tree
+msgid "You don't have any delivery order."
+msgstr "你没有任何发运单"
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
+"or ''}"
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr "查看在线支付选项"
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr "也显示支付按钮给员工"
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+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 '报价单' or "
+"'订单'} (Ref ${object.name or 'n/a' })"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and '草稿' or ''}"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "You don't have any sale order."
+msgstr "你还没有任何销售订单"
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr "${object.company_id.name} 发票 (编号 ${object.number or 'n/a' })"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.product_normal_action
+#: model:ir.ui.menu,name:portal_sale.portal_products
+msgid "Products"
+msgstr "产品"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "You don't have any invoice."
+msgstr "你没有任何发票"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr "报价单"
+
+#. module: portal_sale
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "发票号必须在公司范围内唯一"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr "门户支付选项"
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "You don't have any quotation."
+msgstr "你没有任何报价单"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr "发票列表"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_vouchers
+#: model:ir.ui.menu,name:portal_sale.portal_payments
+msgid "Refunds/Payments"
+msgstr "退款/支付"
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_vouchers
+msgid "You don't have any refunds or payments."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr "发票"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sale Orders"
+msgstr "销售订单"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_picking_tree
+#: model:ir.ui.menu,name:portal_sale.portal_delivery
+msgid "Delivery Orders"
+msgstr "送货单"
+
+#. module: portal_sale
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "BBA传输结构有误！"
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index d6c2f288205..0a10c80e3ef 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -33,59 +33,39 @@
             <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
-            <field name="help">You don't have any quotation.</field>
+            <field name="help">We haven't sent you any quotation.</field>
         </record>
 
         <record id="action_orders_portal" model="ir.actions.act_window">
             <field name="name">Sale Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
             <field name="context">{"search_default_sales":1}</field>
-            <field name="help">You don't have any sale order.</field>
-        </record>
-
-        <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Delivery Orders</field>
-            <field name="res_model">stock.picking.out</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
-            <field name="search_view_id" ref="stock.view_picking_out_search"/>
-            <field name="help">You don't have any delivery order.</field>
-        </record>
-
-        <record id="product_normal_action" model="ir.actions.act_window">
-            <field name="name">Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="view_id" ref="product.product_kanban_view"/>
-            <field name="search_view_id" ref="product.product_search_form_view"/>
-            <field name="help">There are no public products.</field>
+            <field name="help">We haven't sent you any sale order.</field>
         </record>
 
         <record id="portal_action_invoices" model="ir.actions.act_window">
             <field name="name">Invoices</field>
             <field name="res_model">account.invoice</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','in',['out_invoice','out_refund'])]</field>
+            <field name="context">{'type':['out_invoice','out_refund'], 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">You don't have any invoice.</field>
+            <field name="help">We haven't sent you any invoice.</field>
         </record>
+
         <record id="portal_action_invoices_tree_spec" model="ir.actions.act_window.view">
             <field name="act_window_id" ref="portal_action_invoices"/>
             <field name="view_id" ref="account.invoice_tree"/>
             <field name="view_mode">tree</field>
             <field name="sequence" eval="0"/>
         </record>
+
         <record id="portal_action_invoices_form_spec" model="ir.actions.act_window.view">
             <field name="act_window_id" ref="portal_action_invoices"/>
             <field name="view_id" ref="account.invoice_form"/>
@@ -93,27 +73,12 @@
             <field name="sequence" eval="1"/>
         </record>
 
-        <record id="portal_action_vouchers" model="ir.actions.act_window">
-            <field name="name">Refunds/Payments</field>
-            <field name="res_model">account.voucher</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
-            <field name="context">{'type':'receipt'}</field>
-            <field name="search_view_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
-            <field name="target">current</field>
-            <field name="help">You don't have any refunds or payments.</field>
-        </record>
-
-        <menuitem id="portal_quotations" parent="portal.portal_orders"
+        <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
             action="action_quotations_portal" sequence="10"/>
-        <menuitem id="portal_sales_orders" parent="portal.portal_orders"
+        <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders"
             action="action_orders_portal" sequence="20"/>
-        <menuitem id="portal_delivery" parent="portal.portal_orders"
-            action="action_picking_tree" sequence="30"/>
-        <menuitem id="portal_products" parent="portal.portal_orders"
-            action="product_normal_action" sequence="40"/>
-        <menuitem id="portal_invoices" parent="portal.portal_invoices_payements"
-            action="portal_action_invoices" sequence="10"/>
-        <menuitem id="portal_payments" parent="portal.portal_invoices_payements"
-            action="portal_action_vouchers" sequence="20"/>
+        <menuitem name="Invoices" id="portal_invoices" parent="portal.portal_orders"
+            action="portal_action_invoices" sequence="30"/>
+
     </data>
 </openerp>
diff --git a/addons/portal_sale/sale.py b/addons/portal_sale/sale.py
new file mode 100644
index 00000000000..aa8b6e57689
--- /dev/null
+++ b/addons/portal_sale/sale.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+
+    def action_button_confirm(self, cr, uid, ids, context=None):
+        # fetch the partner's id and subscribe the partner to the sale order
+        partner = self.browse(cr, uid, ids[0], context=context)['partner_id']
+        if partner.id not in self.browse(cr, uid, ids[0], context=context)['message_follower_ids']:
+            self.message_subscribe(cr, uid, ids, [partner.id], context=context)
+            document = self.browse(cr, uid, ids[0], context=context)
+            mail_values = {
+                'email_from': self.pool.get('res.users').browse(cr, uid, uid, context=context)['partner_id']['email'],
+                'email_to': partner.email,
+                'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
+                'auto_delete': True,
+            }
+            mail_obj = self.pool.get('mail.mail')
+            mail_id = mail_obj.create(cr, uid, mail_values, context=context)
+            mail_obj.send(cr, uid, [mail_id], recipient_ids=[partner.id], context=context)
+        return super(sale_order, self).action_button_confirm(cr, uid, ids, context=context)
+
+sale_order()
+
+class mail_mail(osv.osv):
+    _inherit = 'mail.mail'
+
+    def _postprocess_sent_message(self, cr, uid, mail, context=None):
+        if mail.model == 'sale.order':
+            so_obj = self.pool.get('sale.order')
+            partner = so_obj.browse(cr, uid, mail.res_id, context=context)['partner_id']
+            if partner.id not in so_obj.browse(cr, uid, mail.res_id, context=context)['message_follower_ids']:
+                so_obj.message_subscribe(cr, uid, [mail.res_id], [partner.id], context=context)
+        return super(mail_mail, self)._postprocess_sent_message(cr, uid, mail=mail, context=context)
+
+mail_mail()
\ No newline at end of file
diff --git a/addons/portal_sale/security/ir.model.access.csv b/addons/portal_sale/security/ir.model.access.csv
index 751c0b9baff..c73be67e8c9 100644
--- a/addons/portal_sale/security/ir.model.access.csv
+++ b/addons/portal_sale/security/ir.model.access.csv
@@ -1,10 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sale_order,sale.order,sale.model_sale_order,portal.group_portal,1,0,0,0
 access_sale_order_line,sale.order.line,sale.model_sale_order_line,portal.group_portal,1,0,0,0
-access_stock_picking,stock.picking,stock.model_stock_picking,portal.group_portal,1,0,0,0
-access_stock_picking.out,stock.picking.out,stock.model_stock_picking_out,portal.group_portal,1,0,0,0
-access_stock_move,stock.move,stock.model_stock_move,portal.group_portal,1,0,0,0
-access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,portal.group_portal,1,0,0,0
 access_account_invoice,account.invoice,account.model_account_invoice,portal.group_portal,1,0,0,0
 access_account_invoice_tax,account.invoice.tax,account.model_account_invoice_tax,portal.group_portal,1,0,0,0
 access_account_invoice_line,account.invoice.line,account.model_account_invoice_line,portal.group_portal,1,0,0,0
@@ -17,17 +13,9 @@ access_account_move_reconcile,account.move.reconcile,account.model_account_move_
 access_account_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,portal.group_portal,1,0,0,0
 access_sale_shop,sale.shop,sale.model_sale_shop,portal.group_portal,1,0,0,0
 access_product_list,product.pricelist,product.model_product_pricelist,portal.group_portal,1,0,0,0
-access_product,product.product,product.model_product_product,portal.group_portal,1,0,0,0
 access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
-access_product_uom,product.uom,product.model_product_uom,portal.group_portal,1,0,0,0
 access_account_tax,account.tax,account.model_account_tax,portal.group_portal,1,0,0,0
-access_mrp_property,mrp.property,procurement.model_mrp_property,portal.group_portal,1,0,0,0
-access_product_template,product.template,product.model_product_template,portal.group_portal,1,0,0,0
-access_stock_warehouse,stock.warehouse,stock.model_stock_warehouse,portal.group_portal,1,0,0,0
-access_stock_location,stock.location,stock.model_stock_location,portal.group_portal,1,0,0,0
 access_account_fiscalyear,account.fiscalyear,account.model_account_fiscalyear,portal.group_portal,1,0,0,0
 access_res_partner_category,res.partner.category,base.model_res_partner_category,portal.group_portal,1,0,0,0
-access_product_supplierinfo,product.supplierinfo,product.model_product_supplierinfo,portal.group_portal,1,0,0,0
-access_product_packaging,product.packaging,product.model_product_packaging,portal.group_portal,1,0,0,0
 access_account_period,account.period,account.model_account_period,portal.group_portal,1,0,0,0
 access_account_account,account.account,account.model_account_account,portal.group_portal,1,0,0,0
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index e86258dcdd2..428474487fe 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -26,20 +26,6 @@ their documents through the portal.</field>
             <field eval="0" name="perm_create"/>
         </record>
 
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Portal Personal Delivery Orders</field>
-            <field name="model_id" ref="stock.model_stock_picking"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Portal Personal Delivery Orders Out</field>
-            <field name="model_id" ref="stock.model_stock_picking_out"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
         <record id="portal_account_invoice_user_rule" model="ir.rule">
             <field name="name">Portal Personal Account Invoices</field>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -47,13 +33,6 @@ their documents through the portal.</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
-        <record id="portal_personal_payment" model="ir.rule">
-            <field name="name">Portal Personal Payments</field>
-            <field name="model_id" ref="account_voucher.model_account_voucher"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
         <record id="portal_personal_contact" model="ir.rule">
             <field name="name">Portal Personal Contacts</field>
             <field name="model_id" ref="base.model_res_partner"/>
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index dd650aa85e5..b102f8279d3 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -7,28 +7,28 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-12-31 10:31+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 09:53+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr "处理节点"
+msgstr "流程节点"
 
 #. module: process
 #: help:process.process,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
-msgstr "此字段设为 False 将隐藏流程而不是删除它。"
+msgstr "如果活动字段设为 False 将隐藏流程而无需删除。"
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -38,7 +38,7 @@ msgstr "相关菜单"
 #. module: process
 #: selection:process.node,kind:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -72,7 +72,7 @@ msgstr "启动流程"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr "处理节点"
+msgstr "流程节点"
 
 #. module: process
 #: view:process.process:0
@@ -136,7 +136,7 @@ msgstr "工作流迁移"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "Last modified by:"
-msgstr ""
+msgstr "最后修改者:"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -148,7 +148,7 @@ msgstr "动作ID"
 #: code:addons/process/static/src/xml/process.xml:7
 #, python-format
 msgid "Process View"
-msgstr ""
+msgstr "业务流程视图"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition
@@ -196,7 +196,7 @@ msgstr "启动迁移"
 #: code:addons/process/static/src/xml/process.xml:54
 #, python-format
 msgid "Related:"
-msgstr ""
+msgstr "相关的："
 
 #. module: process
 #: view:process.node:0
@@ -212,14 +212,14 @@ msgstr "备注"
 #: code:addons/process/static/src/xml/process.xml:88
 #, python-format
 msgid "Edit Process"
-msgstr ""
+msgstr "编辑业务流程"
 
 #. module: process
 #. openerp-web
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "N/A"
-msgstr ""
+msgstr "无"
 
 #. module: process
 #: view:process.process:0
@@ -251,7 +251,7 @@ msgstr "动作"
 #: code:addons/process/static/src/xml/process.xml:67
 #, python-format
 msgid "Select Process"
-msgstr ""
+msgstr "选择业务流程"
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -338,7 +338,7 @@ msgstr "节点类型"
 #: code:addons/process/static/src/xml/process.xml:42
 #, python-format
 msgid "Subflows:"
-msgstr ""
+msgstr "子工作流："
 
 #. module: process
 #: view:process.node:0
@@ -351,7 +351,7 @@ msgstr "迁移出口"
 #: code:addons/process/static/src/xml/process.xml:36
 #, python-format
 msgid "Notes:"
-msgstr ""
+msgstr "备注："
 
 #. module: process
 #: selection:process.node,kind:0
@@ -375,7 +375,7 @@ msgstr "对象方法"
 #: code:addons/process/static/src/xml/process.xml:77
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "选择"
 
 #~ msgid "State"
 #~ msgstr "状态"
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index 731bee53b36..8e9be9cc311 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/i18n/fr.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2012-11-28 17:23+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -74,7 +73,7 @@ msgstr "Prix Unitaire Moyen"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: product_margin
 #: sql_constraint:product.product:0
@@ -243,7 +242,7 @@ msgstr "Ventes"
 #: view:product.product:0
 #, python-format
 msgid "Product Margins"
-msgstr "Marges par produits"
+msgstr "Marges par articles"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -288,7 +287,7 @@ msgstr ""
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr "Marge du produit"
+msgstr "Marge de l'article"
 
 #~ msgid ""
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 635ccf2469c..178a8b15dbf 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -7,20 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-02-06 16:52+0000\n"
-"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2012-11-28 23:08+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:35+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: project
 #: view:project.project:0
 msgid "Email Interface"
-msgstr ""
+msgstr "Interfaccia Email"
 
 #. module: project
 #: help:account.analytic.account,use_tasks:0
@@ -86,7 +85,7 @@ msgstr "Inizia Attività"
 #: code:addons/project/project.py:962
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Attenzione !"
 
 #. module: project
 #: help:project.project,message_unread:0
@@ -137,7 +136,7 @@ msgstr ""
 #: code:addons/project/project.py:1416
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attenzione!"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -147,7 +146,7 @@ msgstr "Partner"
 #. module: project
 #: field:project.config.settings,group_manage_delegation_task:0
 msgid "Allow task delegation"
-msgstr ""
+msgstr "Permette la delega delle attività"
 
 #. module: project
 #: field:project.task.delegate,planned_hours:0
@@ -164,7 +163,7 @@ msgstr "Reimpostare come Progetto"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Attività in corso"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -174,7 +173,7 @@ msgstr "Percentuale di attività chiuse in base alle attività da completare."
 #. module: project
 #: model:ir.actions.client,name:project.action_client_project_menu
 msgid "Open Project Menu"
-msgstr ""
+msgstr "Apre Menu del Progetto"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -196,12 +195,12 @@ msgstr "Titolo attività di convalida"
 #. module: project
 #: model:res.groups,name:project.group_delegate_task
 msgid "Task Delegation"
-msgstr ""
+msgstr "Delega Attività"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -233,7 +232,7 @@ msgstr "Assegnato a"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Molto importante"
 
 #. module: project
 #: view:project.project:0
@@ -274,7 +273,7 @@ msgstr "Delega attività progetto"
 #: code:addons/project/project.py:551
 #, python-format
 msgid "Project has been <b>created</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>creato</b>."
 
 #. module: project
 #: view:project.config.settings:0
@@ -506,7 +505,7 @@ msgstr "Ri-include la descrizione dell'attività nell'attività dell'utente"
 #. module: project
 #: view:project.project:0
 msgid "Project Settings"
-msgstr ""
+msgstr "Impostazioni del progetto"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -821,7 +820,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Close Project"
-msgstr ""
+msgstr "Chiudi il progetto"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -914,7 +913,7 @@ msgstr ""
 #: code:addons/project/project.py:560
 #, python-format
 msgid "Project has been <b>canceled</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>annullato</b>."
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -941,7 +940,7 @@ msgstr "Annulla"
 #: code:addons/project/project.py:563
 #, python-format
 msgid "Project has been <b>closed</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>chiuso</b>."
 
 #. module: project
 #: view:project.project:0
@@ -1053,13 +1052,13 @@ msgstr "Cronologia Lavoro"
 #: code:addons/project/project.py:557
 #, python-format
 msgid "Project is now <b>pending</b>."
-msgstr ""
+msgstr "Il Progetto adesso è <b>sospeso</b>."
 
 #. module: project
 #: code:addons/project/project.py:554
 #, python-format
 msgid "Project has been <b>opened</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>aperto</b>."
 
 #. module: project
 #: view:project.project:0
@@ -1077,7 +1076,7 @@ msgstr "Template"
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Riaprire il progetto"
 
 #. module: project
 #: help:project.project,priority:0
@@ -1278,7 +1277,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
-msgstr ""
+msgstr "Imposta l'unità di misura usata nei progetti e nelle attività."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1330,7 +1329,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Progetti dei quali sono un membro."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1460,6 +1459,9 @@ msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
 "project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
+"Non è possibile cancellare un progetto contenente attività. E' possibile sia "
+"cancellare tutte le attività del progetto e successivamente cancellare il "
+"progetto o semplicemente disattivare il progetto."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1524,7 +1526,7 @@ msgstr "Ore Totali"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project
 #: view:project.project:0
@@ -1643,12 +1645,12 @@ msgstr "CONTROLLA: "
 #: code:addons/project/project.py:434
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "E' necessario assegnare i membri del progetto '%s' !"
 
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Progetti In Sospeso"
 
 #. module: project
 #: view:project.task:0
diff --git a/addons/project/project.py b/addons/project/project.py
index 68122d1a614..c6577b00e6a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -603,18 +603,13 @@ class task(base_stage, osv.osv):
         stage_obj = self.pool.get('project.task.type')
         order = stage_obj._order
         access_rights_uid = access_rights_uid or uid
-        # lame way to allow reverting search, should just work in the trivial case
         if read_group_order == 'stage_id desc':
             order = '%s desc' % order
-        # retrieve section_id from the context and write the domain
-        # - ('id', 'in', 'ids'): add columns that should be present
-        # - OR ('case_default', '=', True), ('fold', '=', False): add default columns that are not folded
-        # - OR ('project_ids', 'in', project_id), ('fold', '=', False) if project_id: add project columns that are not folded
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
+        search_domain += [('id', 'in', ids)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
@@ -750,7 +745,7 @@ class task(base_stage, osv.osv):
         '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',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', 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,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -936,14 +931,11 @@ class task(base_stage, osv.osv):
         for task in cases:
             if task.project_id:
                 section_ids.append(task.project_id.id)
-        # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain = [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain.append(('case_default', '=', True))
-        # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8bb45ca6738..840d9b47ae0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@
 
         <!-- Project Read/Unread actions -->
         <record id="actions_server_project_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Project: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
@@ -39,7 +39,7 @@
         </record>
 
         <record id="actions_server_project_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Project: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
@@ -63,14 +63,14 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
-                    <button name="set_done" string="Close Project" type="object" states="open,pending"/>
-                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close"/>
-                    <button name="set_pending" string="Pending" type="object" states="open"/>
-                    <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight" groups="base.group_user"/>
+                    <button name="set_done" string="Close Project" type="object" states="open,pending" groups="base.group_user"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" groups="base.group_user"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" groups="base.group_user"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open" groups="base.group_user"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight" groups="base.group_user"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight" groups="base.group_user"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" groups="base.group_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
                 <sheet string="Project">
@@ -85,7 +85,7 @@
                             <label for="use_tasks"/>
                         </div>
                     </div>
-                    <div class="oe_right oe_button_box" name="buttons">
+                    <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
                         <button name="%(act_project_project_2_project_task_all)d" string="Tasks"
                             type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
                         <button name="attachment_tree_view" string="Documents" type="object"/>
@@ -152,7 +152,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues."/>
+                    <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues." groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
@@ -227,7 +227,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Project Settings</a></li></t>
@@ -344,7 +344,7 @@
 
         <!-- Task Read/Unread actions -->
         <record id="actions_server_project_task_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Task: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
@@ -362,7 +362,7 @@
         </record>
 
         <record id="actions_server_project_task_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Task: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
@@ -474,7 +474,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
@@ -488,7 +488,7 @@
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id" >
                     <field name="color"/>
-                    <field name="priority" groups="base.group_user"/>
+                    <field name="priority"/>
                     <field name="stage_id"/>
                     <field name="user_id"/>
                     <field name="user_email"/>
@@ -504,7 +504,7 @@
                     <templates>
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
                                     <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
@@ -531,12 +531,14 @@
                                     <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
                                 </div>
                                 <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
-                                    <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                    <a t-if="record.priority.raw_value == 2" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a>
-                                    <a t-if="record.priority.raw_value == 1 or record.priority.raw_value == 3 or record.priority.raw_value == 4" type="object" string="Normal" name="set_normal_priority" class="oe_e oe_star_off">7</a>
-                                    <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_high_priority" class="oe_e oe_star_very_high_priority">7</a>
+                                    <div groups="base.group_user">
+                                        <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+                                        <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+                                        <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
+                                        <a t-if="record.priority.raw_value == 2" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a>
+                                        <a t-if="record.priority.raw_value == 1 or record.priority.raw_value == 3 or record.priority.raw_value == 4" type="object" string="Normal" name="set_normal_priority" class="oe_e oe_star_off">7</a>
+                                        <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_high_priority" class="oe_e oe_star_very_high_priority">7</a>
+                                    </div>
                                     <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                                 <div class="oe_kanban_footer_left">
@@ -546,11 +548,7 @@
                                     </span>
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
-                                    <div class="oe_left oe_tags">
-                                        <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                            <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                        </t>
-                                    </div>
+                                    <field name="categ_ids"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 38578a6226e..ce8be146e54 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -25,37 +25,12 @@ openerp.project = function(openerp) {
                 });
             });
         },
-        project_display_categ_names: function() {
-            /*
-             * Set proper names to project categories.
-             * In kanban views, many2many fields only return a list of ids.
-             * Therefore, we have to fetch the matching data by ourselves.
-             */
-            var self = this;
-            var categ_ids = [];
-
-            // Collect categories ids
-            self.$el.find('span[data-categ_id]').each(function() {
-                categ_ids.push($(this).data('categ_id'));
-            });
-
-            // Find their matching names
-            var dataset = new openerp.web.DataSetSearch(self, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
-            dataset.read_slice(['id', 'name']).done(function(result) {
-                _.each(result, function(v, k) {
-                    // Set the proper value in the DOM and display the element
-                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
-                });
-            });
-        },
         on_groups_started: function() {
             var self = this;
             self._super.apply(self, arguments);
 
             if (self.dataset.model === 'project.project') {
                 self.project_display_members_names();
-            } else if (self.dataset.model === 'project.task') {
-                self.project_display_categ_names();
             }
         },
         on_record_moved: function(record, old_group, old_index, new_group, new_index){
@@ -74,9 +49,5 @@ openerp.project = function(openerp) {
                 this._super.apply(this, arguments);
             }
         },
-        bind_events: function() {
-            this._super();
-            this.view.project_display_categ_names();
-        },
     });
 };
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index b2e9197cefd..2c5f311c044 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -61,7 +61,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'installable': True,
     'auto_install': False,
     'application': True,
-    'js': ['static/src/js/project_issue.js'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 90640363906..fe5ce9f325b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -89,7 +89,7 @@ class project_issue(base_stage, osv.osv):
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
+        search_domain += [('id', 'in', ids)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
@@ -244,7 +244,7 @@ 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',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -442,11 +442,9 @@ class project_issue(base_stage, osv.osv):
         # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain += [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain.append(('case_default', '=', True))
-        # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e3105127c5d..9e25fbca6a6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -6,7 +6,7 @@
 
         <!-- Project issue Read/Unread actions -->
         <record id="actions_server_project_issue_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Issue: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
@@ -24,7 +24,7 @@
         </record>
 
         <record id="actions_server_project_issue_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Issue: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
@@ -107,25 +107,25 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
-                        <group>
+                        <group groups="base.group_user">
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
                         </group>
                         <group>
-                            <field name="priority"/>
-                            <label for="project_id"/>
-                            <div>
-                                <field name="project_id" required="True" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
+                            <field name="priority" groups="base.group_user"/>
+                            <label for="project_id" groups="base.group_user"/>
+                            <div groups="base.group_user">
+                                <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
                                 <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" class="oe_inline"/>
                             </div>
-                            <label for="task_id"/>
-                            <div>
+                            <label for="task_id" groups="base.group_user"/>
+                            <div groups="base.group_user">
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                             </div>
                             <field name="categ_ids" widget="many2many_tags"/>
-                            <field name="version_id"/>
+                            <field name="version_id" groups="base.group_user"/>
                         </group>
                     </group>
                     <notebook>
@@ -155,7 +155,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
@@ -249,7 +249,7 @@
                         </t>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
@@ -264,11 +264,9 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left oe_tags">
-                                            <field name="categ_ids"/>
-                                        </div>
+                                        <field name="categ_ids"/>
                                         <div class="oe_right">
-                                            <span class="oe_kanban_highlight">
+                                            <span class="oe_kanban_highlight" groups="base.group_user">
                                                 <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                                 <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
                                                    <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js
deleted file mode 100644
index 24e5ff7cc49..00000000000
--- a/addons/project_issue/static/src/js/project_issue.js
+++ /dev/null
@@ -1,13 +0,0 @@
-openerp.portal_project_issue = function(openerp) {
-    openerp.web_kanban.KanbanView.include({
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(this, arguments);
-
-            if (self.dataset.model === 'project.issue') {
-                // Load project's categories names from m2m field
-                self.project_display_categ_names();
-            }
-        }
-    });
-};
diff --git a/addons/project_issue_sheet/i18n/zh_CN.po b/addons/project_issue_sheet/i18n/zh_CN.po
index 11147a226dc..8d721dc7ee5 100644
--- a/addons/project_issue_sheet/i18n/zh_CN.po
+++ b/addons/project_issue_sheet/i18n/zh_CN.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 13:52+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\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 "这个辅助核算项 被挂起的"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
@@ -41,12 +41,12 @@ msgstr "计工单明细"
 #. 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
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
+msgstr "你不能修改在已经确认/完成的计工单的分录。"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
@@ -74,7 +74,7 @@ msgstr "计工单"
 #. module: project_issue_sheet
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
 
 #. module: project_issue_sheet
 #: field:hr.analytic.timesheet,issue_id:0
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index d344a9bd1df..1245cb699f6 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/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-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-27 15:29+0000\n"
+"PO-Revision-Date: 2012-11-28 07:56+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -100,6 +100,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               单击添加 客户合同 联系人。\n"
+"              </p><p>\n"
+"                为了跟踪开票进程，你将在这里找到跟客户项目相关的合同.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 56c46da341e..4e4a63dcb05 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.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-11-24 02:51+0000\n"
-"PO-Revision-Date: 2011-11-07 12:56+0000\n"
+"PO-Revision-Date: 2012-11-28 12:26+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@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: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -274,7 +274,7 @@ msgstr "Адрес доставки:"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Подтвердить заказ"
 
 #. module: purchase
 #: field:purchase.config.settings,module_warning:0
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index e21310eb3fb..c9fef0cad75 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/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-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 12:03+0000\n"
+"PO-Revision-Date: 2012-11-28 11:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -129,19 +129,18 @@ msgstr ""
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>您好 ${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},</p>\n"
 "    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
+"    <p>这是一个 ${object.state in ('draft', 'sent') and '询价单' or '采购单确认函'} 来自  "
+"${object.company_id.name}: </p>\n"
 "    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"       &nbsp;&nbsp;<strong>编号</strong><br />\n"
+"       &nbsp;&nbsp;&nbsp;订单号: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;订单总计: <strong>${object.amount_total} "
 "${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;订单日期: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
@@ -155,8 +154,8 @@ msgstr ""
 "    </p>\n"
 "\n"
 "    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
+"    <p>如果有任何问题，请与我们联系.</p>\n"
+"    <p>谢谢!</p>\n"
 "    <br/>\n"
 "    <br/>\n"
 "    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
@@ -1948,8 +1947,11 @@ msgid ""
 "paid and received, the status becomes 'Done'. If a cancel action occurs in "
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
-"采购订单或者询价单的状态。一个询价单是采购订单的“草稿”状态。然后这个采购单被用户确认后，状态切换为“已经确认”。\r\n"
-"供应商确认这个订单后，改变状态到“批准”。当采购订单被支付和收货以后，状态变成“完成”。\r\n"
+"采购订单或者询价单的状态。\r\n"
+"一个询价单是采购订单的“草稿”状态。\r\n"
+"然后这个采购单被用户确认后，状态切换为“已经确认”。\r\n"
+"供应商确认这个订单后，改变状态到“批准”。\r\n"
+"当采购订单被支付和收货以后，状态变成“完成”。\r\n"
 "如果在开票或者收货过程中出现了 “取消”操作，状态变成了“异常”。"
 
 #. module: purchase
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9397a95c970..f0be9e56dec 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -134,7 +134,7 @@
 
         <!-- Purchase order Read/Unread actions -->
         <record id="actions_server_purchase_order_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Purchase: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
@@ -152,7 +152,7 @@
         </record>
 
         <record id="actions_server_purchase_order_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Purchase: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
diff --git a/addons/purchase_double_validation/i18n/ru.po b/addons/purchase_double_validation/i18n/ru.po
index 2e16dca7d4e..e5a91f0e029 100644
--- a/addons/purchase_double_validation/i18n/ru.po
+++ b/addons/purchase_double_validation/i18n/ru.po
@@ -8,45 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-03-20 07:56+0000\n"
+"PO-Revision-Date: 2012-11-28 12:29+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\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 "Заказы закупки, которые еще ​​не утверждены."
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
 msgid "limit to require a second approval"
-msgstr ""
+msgstr "лимит требующий второго утверждения"
 
 #. 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 "Заказы закупок ожидающие утверждения"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "На утверждение"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
 msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "Сумма после которой требуется утверждение"
 
 #~ msgid "Maximum amount after which validation of purchase is required."
 #~ msgstr "Максимальная сумма, после которой требуется утверждение закупки."
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index 32e76f08f76..8436d0cd322 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.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-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-13 13:59+0000\n"
+"PO-Revision-Date: 2012-11-28 13:43+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -50,7 +50,7 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
@@ -61,7 +61,7 @@ msgstr "Компания"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если установлено, новые сообщения требуют вашего внимания"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/purchase_requisition.py:153
@@ -81,7 +81,7 @@ msgstr "Количество"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_order
@@ -126,6 +126,8 @@ msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
 msgstr ""
+"Вы ввели недопустимую ссылку на баркод EAN13. Вы можете использовать поле "
+"\"Внутренняя ссылка\"."
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -141,7 +143,7 @@ msgstr "Установить в \"Черновик\""
 #: code:addons/purchase_requisition/purchase_requisition.py:153
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -160,17 +162,27 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Нажмите для создания запроса на закупку.\n"
+"          </p><p>\n"
+"            Запрос на закупку это шаг перед запросом цен.\n"
+"            В запросе на закупку (или тендере) вы вводите необходимые\n"
+"            товары и запускаете создание запросов цен у поставщиков.\n"
+"            После переговоров и рассмотрения всех предложений\n"
+"            вы можете утвердить одни и отменить другие.\n"
+"          </p>\n"
+"        "
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: view:purchase.requisition:0
 msgid "Source"
-msgstr ""
+msgstr "Источник"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
@@ -205,7 +217,7 @@ msgstr "Запрос на закупку"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Sent to Suppliers"
-msgstr ""
+msgstr "Отправлено поставщикам"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,message_summary:0
@@ -213,6 +225,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 ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -222,7 +236,7 @@ msgstr "Утверждено поставщиком"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Send to Suppliers"
-msgstr ""
+msgstr "Послать поставщикам"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -248,7 +262,7 @@ msgstr "Запрос"
 #: code:addons/purchase_requisition/purchase_requisition.py:186
 #, python-format
 msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
+msgstr "Запрос на закупку был <b>создан</b>."
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
@@ -278,28 +292,28 @@ msgstr "Дата начала"
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Ед. изм. продукции"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Условия"
 
 #. module: purchase_requisition
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Ошибка! Конечная дата не может быть установлена ​​ранее даты начала."
 
 #. module: purchase_requisition
 #: view:purchase.order:0
@@ -319,13 +333,13 @@ msgstr "Пользователь"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_comment_ids:0
 #: help:purchase.requisition,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Комментарии и эл. письма"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -336,7 +350,7 @@ msgstr "Искать запрос на закупку"
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
 #, python-format
 msgid "No Product in Tender."
-msgstr ""
+msgstr "Нет товаров в тендере."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -346,7 +360,7 @@ msgstr "Отменить заказ на закупку"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итого"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -367,7 +381,7 @@ msgstr "Запрос цен"
 #: code:addons/purchase_requisition/purchase_requisition.py:103
 #, python-format
 msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr ""
+msgstr "Запрос на закупку был <b>отменен</b>."
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
@@ -383,7 +397,7 @@ msgstr "Кол-во"
 #: code:addons/purchase_requisition/purchase_requisition.py:94
 #, python-format
 msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr ""
+msgstr "Черновик запроса был <b>отправлен поставщику</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
@@ -407,6 +421,7 @@ msgid ""
 "Check this box to generates purchase requisition instead of generating "
 "requests for quotation from procurement."
 msgstr ""
+"Отметьте для создания запроса на закупку вместо запроса цен при снабжении."
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
@@ -421,7 +436,7 @@ msgstr "Ссылка на заказ должны быть уникальной
 #. module: purchase_requisition
 #: field:purchase.requisition,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Документ-источник"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -433,7 +448,7 @@ msgstr "Ответственный"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Purchase Done"
-msgstr ""
+msgstr "Закупка сделана"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -461,7 +476,7 @@ msgstr "Описание"
 #: code:addons/purchase_requisition/purchase_requisition.py:97
 #, python-format
 msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
+msgstr "Запрос на закупку был установлен в <b>черновик</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -509,7 +524,7 @@ msgstr "Дата запроса"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -525,7 +540,7 @@ msgstr "Срок запроса"
 #: code:addons/purchase_requisition/purchase_requisition.py:100
 #, python-format
 msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
+msgstr "Запрос на закупку был <b>сделан</b>."
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
diff --git a/addons/purchase_requisition/i18n/zh_CN.po b/addons/purchase_requisition/i18n/zh_CN.po
index 7b827d29521..3d94b02eff2 100644
--- a/addons/purchase_requisition/i18n/zh_CN.po
+++ b/addons/purchase_requisition/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-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-10-25 17:29+0000\n"
+"PO-Revision-Date: 2012-11-28 08:28+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
@@ -59,7 +59,7 @@ msgstr "公司"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/purchase_requisition.py:153
@@ -67,7 +67,7 @@ msgstr ""
 msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
-msgstr ""
+msgstr "你对这个供应商已经有个一个 %s 采购单 ,  你必须取消采购订单再创建新的请购单."
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
@@ -77,7 +77,7 @@ msgstr "数量"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_order
@@ -121,7 +121,7 @@ msgstr "单号"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -137,7 +137,7 @@ msgstr "重置为草稿"
 #: code:addons/purchase_requisition/purchase_requisition.py:153
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -156,17 +156,26 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            单击开始请购单流程。 \n"
+"          </p><p>\n"
+"           请购单是询价单的前面一步，在请购单（采购招标）\n"
+"           中，你能记录你要购买的产品，并产生给供应商的\n"
+"           询价单。谈判后，一旦你复审了所有供应商的 出\n"
+"           价，你能很准一部分，并取消其他的。\n"
+"          </p>\n"
+"        "
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: view:purchase.requisition:0
 msgid "Source"
-msgstr ""
+msgstr "来源"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
@@ -201,14 +210,14 @@ msgstr "采购申请"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Sent to Suppliers"
-msgstr ""
+msgstr "发给供应商"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,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: purchase_requisition
 #: view:purchase.requisition:0
@@ -218,7 +227,7 @@ msgstr "供应商已核审批"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Send to Suppliers"
-msgstr ""
+msgstr "发给供应商"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -244,7 +253,7 @@ msgstr "采购申请"
 #: code:addons/purchase_requisition/purchase_requisition.py:186
 #, python-format
 msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
+msgstr "请购单 <b>被创建</b>."
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
@@ -274,33 +283,33 @@ msgstr "开始日期"
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "条款和条件"
 
 #. module: purchase_requisition
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Purchase Orders with requisition"
-msgstr ""
+msgstr "具有请购的采购单"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -315,13 +324,13 @@ msgstr "用户"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_comment_ids:0
 #: help:purchase.requisition,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -332,7 +341,7 @@ msgstr "搜索采购申请"
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
 #, python-format
 msgid "No Product in Tender."
-msgstr ""
+msgstr "没有产品在投标"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -342,7 +351,7 @@ msgstr "取消采购订单"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -363,7 +372,7 @@ msgstr "请求询价"
 #: code:addons/purchase_requisition/purchase_requisition.py:103
 #, python-format
 msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr ""
+msgstr "请购单被<b>取消</b>."
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
@@ -379,7 +388,7 @@ msgstr "数量"
 #: code:addons/purchase_requisition/purchase_requisition.py:94
 #, python-format
 msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr ""
+msgstr "请购单草稿被 <b>发给供应商</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
@@ -402,7 +411,7 @@ msgstr "取消"
 msgid ""
 "Check this box to generates purchase requisition instead of generating "
 "requests for quotation from procurement."
-msgstr ""
+msgstr "选中此项，产生请购单，而不是生成采购询价单"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
@@ -417,7 +426,7 @@ msgstr "采购订单号必须在一个公司范围内唯一"
 #. module: purchase_requisition
 #: field:purchase.requisition,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源单据"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -429,12 +438,12 @@ msgstr "负责人"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Purchase Done"
-msgstr ""
+msgstr "采购完成"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Purchase Requisition in negociation"
-msgstr ""
+msgstr "谈判中的采购申请"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
@@ -457,7 +466,7 @@ msgstr "描述"
 #: code:addons/purchase_requisition/purchase_requisition.py:97
 #, python-format
 msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
+msgstr "请购单被设为 <b>草稿</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -505,7 +514,7 @@ msgstr "请购日期"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -521,7 +530,7 @@ msgstr "请购截止日期"
 #: code:addons/purchase_requisition/purchase_requisition.py:100
 #, python-format
 msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
+msgstr "请购单已经 <b>完成</b>."
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 4032f45353b..f50e5cc3276 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -7,14 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 13:35+0000\n"
+"PO-Revision-Date: 2012-11-28 17:01+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: sale
+#: help:sale.order,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 "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -106,13 +113,6 @@ msgid "Analytic Account"
 msgstr "辅助核算项"
 
 #. module: sale
-#: help:sale.order,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 "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
-
-#. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
@@ -260,7 +260,7 @@ msgstr "我的报价单"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "允许根据客户或者产品配置警告"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -291,7 +291,7 @@ msgstr "报价单 "
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
 #, python-format
 msgid "Advance of %s %%"
-msgstr ""
+msgstr "%s%% 的预付款"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_exception
@@ -301,7 +301,7 @@ msgstr "销售异常"
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "需要分配特定产品的业务伙伴"
 
 #. module: sale
 #: view:sale.order:0
@@ -535,7 +535,7 @@ msgstr "总金额。"
 #. module: sale
 #: field:sale.config.settings,module_sale_journal:0
 msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
+msgstr "允许通过日记账的发货单批量开票。"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -560,7 +560,7 @@ msgstr "计量单位 "
 #. module: sale
 #: field:sale.config.settings,time_unit:0
 msgid "The default working time unit for services is"
-msgstr ""
+msgstr "默认的服务工作时间单位是"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -601,7 +601,7 @@ msgstr "每个合同里，一个员工能有不同的角色"
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: sale
 #: report:sale.order:0
@@ -617,7 +617,7 @@ msgstr "订单明细"
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
 msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "在销售订单使用多重辅助核算项"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -627,6 +627,8 @@ msgid ""
 "                and perform batch operations on journals.\n"
 "                This installs the module sale_journal."
 msgstr ""
+"允许你对你的销售和发运（分拣单）在不同的分类账之间进行分类, 并且在分类账上进行批量操作。\n"
+"为此要安装模块  sale_journal。"
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -674,6 +676,11 @@ msgid ""
 "             \n"
 "* The 'Cancelled' status is set when a user cancel the sales order related."
 msgstr ""
+"*一个销售定单是草稿的时候，设置为“草稿”状态\n"
+"*销售定被用户确认后，状态切换为“已经确认”。\n"
+"*销售订单发生异常时（发货被取消等），状态为“异常”。\n"
+"*当销售订单收货以后，状态变成“完成”。\n"
+"*当用户取消了销售订单，状态成为“取消”。"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
@@ -715,7 +722,7 @@ msgstr "已送货"
 msgid ""
 "To allow your salesman to make invoices for sale order lines using the menu "
 "'Lines to Invoice'."
-msgstr ""
+msgstr "通过菜单“按行开票”，允许销售员为销售订单行制作发票"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_partner
@@ -727,7 +734,7 @@ msgstr "业务伙伴"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Create and View Invoice"
-msgstr ""
+msgstr "创建和查看发票"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -742,6 +749,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义一个新的销售商店。\n"
+"              </p><p>\n"
+"                每个报价单或者销售订单必须关联到一个\n"
+"               商店。为每次特地销售，商店也定义了产\n"
+"               品将被从哪个仓库发货。\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: report:sale.order:0
@@ -774,7 +789,7 @@ msgstr "产品类别"
 #: code:addons/sale/sale.py:589
 #, python-format
 msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "不能取消这个销售订单！"
 
 #. module: sale
 #: view:sale.order:0
@@ -786,7 +801,7 @@ msgstr "重新生成发票"
 #, python-format
 msgid ""
 "In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
+msgstr "要删除已经确认的销售订单，你必须先取消它！"
 
 #. module: sale
 #: report:sale.order:0
@@ -849,7 +864,7 @@ msgstr "明细没有找到有效的价格表！"
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr ""
+msgstr "显示利润在销售订单"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -896,6 +911,8 @@ msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"找不到匹配这个产品和数量的价格表。\n"
+"你必须修改 产品、数量，或者价格表"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -919,6 +936,8 @@ msgid ""
 "Manage Related Stock.\n"
 "                    This installs the module sale_stock."
 msgstr ""
+"允许使用不同的订单策略 制作报价单、销售订单 并管理相关的库存。\n"
+"                为此要安装模块sale_stock."
 
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
@@ -926,6 +945,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 '报价单' or "
+"'订单'} (Ref ${object.name or 'n/a' })"
 
 #. module: sale
 #: report:sale.order:0
@@ -1061,7 +1082,7 @@ msgstr "未读信息"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr ""
+msgstr "报价单草稿"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1377,7 +1398,7 @@ msgid ""
 "The sale order will automatically create the invoice proposition (draft "
 "invoice).                                              You have to choose  "
 "if you want your invoice based on ordered "
-msgstr ""
+msgstr "销售订单将自动建立发票（草稿）。如果你要发票基于订单，你必须选择。 "
 
 #. module: sale
 #: code:addons/sale/sale.py:431
@@ -1403,6 +1424,9 @@ msgid ""
 "between the Unit Price and Cost Price.\n"
 "                This installs the module sale_margin."
 msgstr ""
+"增加“利润”在销售订单。\n"
+"          通过单价和成本价计算利润率\n"
+"          为此要安装模块  sale_margin."
 
 #. module: sale
 #: report:sale.order:0
@@ -1456,7 +1480,7 @@ msgstr "产品"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "基于销售订单行生成发票"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1468,6 +1492,9 @@ msgid ""
 "Before delivery: A draft invoice is created from the sales order and must be "
 "paid before the products can be delivered."
 msgstr ""
+"立即:当需要时，从销售订单创建发票草稿。\n"
+"发运时：当有产品被发运时，从发运单创建发票草稿。\n"
+"发运前：从销售订单创建发票草稿，并且必须在产品发运前付款。"
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -1484,7 +1511,7 @@ msgstr "开票依据"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Fixed price (deposit)"
-msgstr ""
+msgstr "固定价格（押金）"
 
 #. module: sale
 #: report:sale.order:0
@@ -1504,7 +1531,7 @@ msgstr "手动处理"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_unread
 msgid "Mark unread"
-msgstr ""
+msgstr "标记为未读"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1514,7 +1541,7 @@ msgstr "订单"
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Sale"
-msgstr ""
+msgstr "确认订单"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1540,17 +1567,17 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Some order lines"
-msgstr ""
+msgstr "一些订单行"
 
 #. 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 "订单行折扣"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1569,7 +1596,7 @@ msgid ""
 "Select how you want to invoice this order. This\n"
 "                        will create a draft invoice that can be modified\n"
 "                        before validation."
-msgstr ""
+msgstr "选择怎样为订单开票。这将建立一个可在核准前进行修改的发票草稿。"
 
 #. module: sale
 #: view:board.board:0
@@ -1605,6 +1632,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
+"or ''}"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
@@ -1651,27 +1680,27 @@ msgstr "客户没有定义 ！"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "送货地址"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Sale to Invoice"
-msgstr ""
+msgstr "销售到发票"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Warehouse Features"
-msgstr ""
+msgstr "仓库特性"
 
 #. module: sale
 #: field:sale.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: sale
 #: code:addons/sale/sale.py:350
@@ -1681,7 +1710,7 @@ msgstr ""
 #: code:addons/sale/sale.py:823
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: sale
 #: report:sale.order:0
@@ -1711,12 +1740,12 @@ msgstr "查找未开票明细"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Quotation Sent"
-msgstr ""
+msgstr "报价单发送"
 
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email撰写向导"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1735,7 +1764,7 @@ msgstr "确认日期"
 #: code:addons/sale/sale.py:351
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "轻微公司 \"%s\" (id:%d) 定义销售分类账"
 
 #. module: sale
 #: code:addons/sale/sale.py:273
@@ -1768,7 +1797,7 @@ msgstr "已确认"
 #. module: sale
 #: field:sale.order,note:0
 msgid "Terms and conditions"
-msgstr ""
+msgstr "条款和条件"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1778,7 +1807,7 @@ msgstr "确认"
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: sale
 #: field:sale.order.line,invoice_lines:0
@@ -1788,7 +1817,7 @@ msgstr "发票明细"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_read
 msgid "Mark read"
-msgstr ""
+msgstr "标记为已读"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1800,12 +1829,12 @@ msgstr "销售订单明细"
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Default Options"
-msgstr ""
+msgstr "默认选项"
 
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "销售辅助核算项"
 
 #. module: sale
 #: code:addons/sale/edi/sale_order.py:139
@@ -1833,16 +1862,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 为这个客户创建报价单或者订单。\n"
+"              </p><p>\n"
+"                OpenERP 将帮你有效地处理完整的销售流程：\n"
+"                报价,销售订单,发运,开票已经支付.\n"
+"              </p><p>\n"
+"                社交特性帮你组织每个订单的讨论，并允许你客户跟踪订单的进度。\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Delivery Order"
-msgstr ""
+msgstr "根据发运单"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "参考计量单位"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1863,6 +1901,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单据创建报价单，销售的第一步。\n"
+"              </p><p>\n"
+"                OpenERP 将帮你有效地处理完整的销售流程：\n"
+"                报价,销售订单,发运,开票已经支付.\n"
+"              </p><p>\n"
+"                社交特性帮你组织每个订单的讨论，并允许你客户跟踪订单的进度。.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1901,7 +1948,7 @@ msgstr "12月"
 #: 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 "在这个产品没有定义收益科目: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1927,7 +1974,7 @@ msgstr "预付款发票"
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "打开销售订单"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1937,7 +1984,7 @@ msgstr "草稿"
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
+msgstr "自动从销售订单触发发运单"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -1947,7 +1994,7 @@ msgstr "税额。"
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order "
-msgstr ""
+msgstr "销售订单 "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1979,7 +2026,7 @@ msgstr "11月"
 #: field:sale.order,message_comment_ids:0
 #: help:sale.order,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -1989,7 +2036,7 @@ msgstr "预付款产品"
 #. module: sale
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
+msgstr "给出订单行列表显示的排列顺序"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2004,13 +2051,13 @@ msgstr "销售订单处理中"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "准备基于计工单的发票"
 
 #. module: sale
 #: code:addons/sale/sale.py:689
 #, python-format
 msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
+msgstr "销售订单<em>%s</em> <b>被取消</b>."
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -2026,12 +2073,12 @@ msgstr "承诺延迟"
 #. module: sale
 #: field:sale.report,state:0
 msgid "Order Status"
-msgstr ""
+msgstr "订单状态"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "显示要开票的行"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2063,7 +2110,7 @@ msgstr "没价格表！： "
 #: model:ir.actions.act_window,name:sale.action_orders
 #: model:ir.ui.menu,name:sale.menu_sale_order
 msgid "Sale Orders"
-msgstr ""
+msgstr "销售订单"
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
@@ -2095,7 +2142,7 @@ msgstr "你真的要生成发票吗 ？"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
-msgstr ""
+msgstr "订单编号"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f248f4735e0..dd9cfad066a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -68,7 +68,7 @@
 
         <!-- Sale order Read/Unread actions -->
         <record id="actions_server_sale_order_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Sale: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
@@ -86,7 +86,7 @@
         </record>
 
         <record id="actions_server_sale_order_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Sale: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
@@ -310,7 +310,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
                 </div>
                 </form>
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 1b5fac5f8bd..caa511904df 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-06-07 03:37+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 10:18+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:837
 #, python-format
 msgid "Invitation to collaborate about %s"
-msgstr ""
+msgstr "关于%s的合作邀请"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:775
@@ -90,18 +90,20 @@ msgid ""
 "Hello,\n"
 "\n"
 msgstr ""
+"Hello，\n"
+"\n"
 
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Share Access URL"
-msgstr ""
+msgstr "分享访问URL"
 
 #. module: share
 #: field:share.wizard,email_1:0
 #: field:share.wizard,email_2:0
 #: field:share.wizard,email_3:0
 msgid "New user email"
-msgstr ""
+msgstr "新用户Email"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:882
@@ -113,13 +115,13 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:616
 #, python-format
 msgid "(Modified)"
-msgstr ""
+msgstr "(已修改)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:660
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
-msgstr ""
+msgstr "必须是销售/用户组才能使用 分享向导"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:594
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index e627b555de3..7008b2555f9 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -12,7 +12,7 @@ openerp.share = function(session) {
         }
         if (view.fields_view.type == 'form') rec_name = view.datarecord.name;
         else rec_name = '';
-        self.rpc('/web/session/eval_domain_and_context', {
+        session.web.pyeval.eval_domains_and_contexts({
             domains: [domain],
             contexts: [view.dataset.context]
         }).done(function (result) {
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index 2082fc7ec7d..69f300f1c79 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -8,14 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-05-10 17:18+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 14:29+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr "列首"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -50,7 +61,7 @@ msgstr "文本验证"
 #. module: survey
 #: view:survey:0
 msgid "Answers:"
-msgstr ""
+msgstr "回答："
 
 #. module: survey
 #: view:survey:0
@@ -61,7 +72,7 @@ msgstr "受邀用户"
 #. module: survey
 #: model:survey.type,name:survey.survey_type1
 msgid "Human Resources"
-msgstr ""
+msgstr "人力资源"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -293,7 +304,7 @@ msgstr " 列头"
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "The following surveys are not in open state: %s"
-msgstr ""
+msgstr "下列调查不在开放状态：%s"
 
 #. module: survey
 #: field:survey,tot_comp_survey:0
@@ -328,7 +339,7 @@ msgstr "rating scale"
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
 "first."
-msgstr ""
+msgstr "这些调查没有定义提问。请首先定义提问和答案。"
 
 #. module: survey
 #: field:survey.question,comment_field_type:0
@@ -354,7 +365,7 @@ msgstr ""
 #. module: survey
 #: field:survey,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "颜色索引"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -371,7 +382,7 @@ msgstr "编辑问卷"
 #: code:addons/survey/wizard/survey_answer.py:962
 #, python-format
 msgid "Please enter an integer value."
-msgstr ""
+msgstr "请输入一个整型值"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
@@ -384,7 +395,7 @@ msgstr "菜单选项"
 msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading."
-msgstr ""
+msgstr "你必须在列首输入一个或多个菜单选项"
 
 #. module: survey
 #: selection:survey.question,required_type:0
@@ -433,7 +444,7 @@ msgstr "文本"
 #. module: survey
 #: view:survey:0
 msgid "Edit..."
-msgstr ""
+msgstr "编辑..."
 
 #. module: survey
 #: selection:survey.print,paper_size:0
@@ -490,7 +501,7 @@ msgstr "未验证注释内容"
 #: code:addons/survey/survey.py:534
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
-msgstr ""
+msgstr "你必须在列首输入一个或者多个菜单选择"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -528,7 +539,7 @@ msgstr "评估计划阶段"
 #: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: survey
 #: view:survey:0
@@ -547,7 +558,7 @@ msgstr "打印"
 #. module: survey
 #: view:survey:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
@@ -571,7 +582,7 @@ msgstr "电子邮箱"
 #: code:addons/survey/survey.py:261
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: survey
 #: selection:survey.response,state:0
@@ -597,7 +608,7 @@ msgstr ""
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "报告"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
@@ -624,7 +635,7 @@ msgstr "页码"
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_form
 msgid "Print Surveys"
-msgstr ""
+msgstr "打印调查表"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
@@ -651,7 +662,7 @@ msgstr "无法复制资源！"
 #: code:addons/survey/wizard/survey_answer.py:126
 #, python-format
 msgid "You cannot answer this survey more than %s times."
-msgstr ""
+msgstr "你不能回答这个调查超过 %s 次。"
 
 #. module: survey
 #: field:survey.request,date_deadline:0
@@ -670,11 +681,6 @@ msgid "survey.print"
 msgstr "survey.print"
 
 #. module: survey
-#: sql_constraint:res.users:0
-msgid "OAuth UID must be unique per provider"
-msgstr ""
-
-#. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
@@ -682,15 +688,9 @@ msgid "Survey Page"
 msgstr "问卷页面"
 
 #. module: survey
-#: view:survey.question.column.heading:0
-#: field:survey.question.column.heading,title:0
-msgid "Column Heading"
-msgstr "列头"
-
-#. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr "需要答案"
+msgstr "需要回答的问题"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_request
@@ -736,12 +736,12 @@ msgstr "选项"
 #: code:addons/survey/survey.py:438
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
-msgstr ""
+msgstr "你必须为提问 \"%s\" 输入一个或者多个答案（ %s页）。"
 
 #. module: survey
 #: view:survey:0
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
@@ -785,7 +785,7 @@ msgstr "手工"
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Send"
-msgstr ""
+msgstr "发送(_S)"
 
 #. module: survey
 #: help:survey,responsible_id:0
@@ -846,7 +846,7 @@ msgstr "如果你需要每个用户只提供一份答案，把它设为1"
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
-msgstr ""
+msgstr "你必须为提问 \"%s\" 输入一个或者多个列首（ %s页）。"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
@@ -865,7 +865,7 @@ msgstr "消息"
 msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)."
-msgstr ""
+msgstr "你必须在列首 输入一个或者多个菜单选择（不允许空白）。"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
@@ -1161,7 +1161,7 @@ msgstr "忽略"
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
 "allowed)."
-msgstr ""
+msgstr "你必须在列首 输入一个或者多个菜单选择（不允许空白）。"
 
 #. module: survey
 #: field:survey.print,paper_size:0
@@ -1401,7 +1401,7 @@ msgstr "已答复"
 #. module: survey
 #: field:survey,send_response:0
 msgid "Email Notification on Answer"
-msgstr ""
+msgstr "Email提醒"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:446
@@ -1434,7 +1434,7 @@ msgstr "发送邀请"
 #: code:addons/survey/wizard/survey_selection.py:80
 #, python-format
 msgid "You cannot give response for this survey more than %s times."
-msgstr ""
+msgstr "你不能为回答这个调查多于 %s次。"
 
 #. module: survey
 #: view:survey.question:0
@@ -1482,7 +1482,7 @@ msgstr "纵向打印（纵向）"
 #: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Invitation for %s"
-msgstr ""
+msgstr "邀请 %s"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -1493,13 +1493,13 @@ msgstr "必须为指定的长度"
 #. module: survey
 #: model:survey.type,name:survey.survey_type3
 msgid "Supplier Selection"
-msgstr ""
+msgstr "选择供应商"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:993
 #, python-format
 msgid "You cannot select same answer more than one time.'"
-msgstr ""
+msgstr "你不能选择相同的答案多余1次"
 
 #. module: survey
 #: field:survey.response,date_create:0
@@ -1518,7 +1518,7 @@ msgstr "你输入的最少需要的答复大于答复总数。请用小于%d的�
 #. module: survey
 #: view:survey:0
 msgid "All Open Survey"
-msgstr ""
+msgstr "所有开放的调查"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
@@ -1569,7 +1569,7 @@ msgstr "所有选择总数"
 #. module: survey
 #: view:survey.request:0
 msgid "Request"
-msgstr ""
+msgstr "请求"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
@@ -1633,7 +1633,7 @@ msgstr "错误消息"
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: survey
 #: code:addons/survey/survey.py:467
@@ -1652,7 +1652,7 @@ msgstr "菜单选项"
 #. module: survey
 #: field:survey,id:0
 msgid "ID"
-msgstr ""
+msgstr "编号"
 
 #. module: survey
 #: code:addons/survey/survey.py:489
@@ -1711,7 +1711,7 @@ msgstr "浮点数"
 #: view:survey.print.statistics:0
 #: view:survey.send.invitation:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: survey
 #: field:survey,title:0
@@ -1731,7 +1731,7 @@ msgstr "日期和时间"
 #. module: survey
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: survey
 #: field:survey.question,column_name:0
@@ -1761,7 +1761,7 @@ msgstr "表格(Table)"
 #: code:addons/survey/wizard/survey_answer.py:119
 #, python-format
 msgid "You cannot answer because the survey is not open."
-msgstr ""
+msgstr "你不能回答，因为调查还没开放。"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
diff --git a/addons/web_linkedin/i18n/zh_CN.po b/addons/web_linkedin/i18n/zh_CN.po
new file mode 100644
index 00000000000..af82f070f6e
--- /dev/null
+++ b/addons/web_linkedin/i18n/zh_CN.po
@@ -0,0 +1,139 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-28 09:35+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "here:"
+msgstr ""
+
+#. module: web_linkedin
+#: field:sale.config.settings,api_key:0
+msgid "API Key"
+msgstr "API Key"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:249
+#, python-format
+msgid "No results found"
+msgstr "找不到任何结果"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:84
+#, python-format
+msgid "Ok"
+msgstr "确定"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Log into LinkedIn."
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
+#, python-format
+msgid "People"
+msgstr "用户"
+
+#. module: web_linkedin
+#: model:ir.model,name:web_linkedin.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: web_linkedin
+#: field:sale.config.settings,server_domain:0
+msgid "unknown"
+msgstr "未知"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "https://www.linkedin.com/secure/developer"
+msgstr "https://www.linkedin.com/secure/developer"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
+#, python-format
+msgid "Companies"
+msgstr "公司"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "API key"
+msgstr "API Key"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Copy the"
+msgstr "复制"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:181
+#, python-format
+msgid "LinkedIn search"
+msgstr "LinkedIn 搜索"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:31
+#, python-format
+msgid ""
+"LinkedIn access was not enabled on this server.\n"
+"            Please ask your administrator to configure it in Settings > "
+"Configuration > Sales > Social Network Integration."
+msgstr ""
+"这个服务器不能访问 LinkedIn ，\n"
+"   请要求你的管理员配置它，在菜单 设置->设置->销售-社交网络集成。"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid ""
+"To use the LinkedIn module with this database, an API Key is required. "
+"Please follow this procedure:"
+msgstr "要在这个数据库使用LinkedIn 模块，要求有一个API Key。请遵循下列步骤："
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:82
+#, python-format
+msgid "LinkedIn is not enabled"
+msgstr "LinkedIn 没启用。"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Add a new application and fill the form:"
+msgstr "增加一个新的应用，并填在这个表单："
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Go to this URL:"
+msgstr "浏览这个URL:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "The programming tool is Javascript"
+msgstr "这个编程工具是 JavaScript"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "JavaScript API Domain:"
+msgstr "JavaScript"
diff --git a/addons/web_shortcuts/__init__.py b/addons/web_shortcuts/__init__.py
index 6c74add0cca..99b6a1491e8 100644
--- a/addons/web_shortcuts/__init__.py
+++ b/addons/web_shortcuts/__init__.py
@@ -17,6 +17,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import controllers
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/__init__.py b/addons/web_shortcuts/controllers/__init__.py
deleted file mode 100644
index 9f828025b8e..00000000000
--- a/addons/web_shortcuts/controllers/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import main
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/main.py b/addons/web_shortcuts/controllers/main.py
deleted file mode 100644
index 2cdf232ac0f..00000000000
--- a/addons/web_shortcuts/controllers/main.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import openerp
-
-class Shortcuts(openerp.addons.web.http.Controller):
-    _cp_path = "/web/shortcuts"
-
-    @openerp.addons.web.http.jsonrequest
-    def list(self, req):
-        return req.session.model('ir.ui.view_sc').get_sc(
-            req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index 918feb4634d..a2607e3749e 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -33,7 +33,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
         this.on('display', this, this.display);
         this.on('remove', this, this.remove);
         this.on('click', this, this.click);
-        this.dataset = new instance.web.DataSet(this, 'ir.ui.view_sc');
+        this.model = new instance.web.Model('ir.ui.view_sc');
     },
     start: function() {
         var self = this;
@@ -46,7 +46,11 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     load: function() {
         var self = this;
         this.$el.find('.oe_systray_shortcuts_items').empty();
-        return this.rpc('/web/shortcuts/list', {}).done(function(shortcuts) {
+        return this.model.call('get_sc', [
+            instance.session.uid,
+            'ir.ui.menu',
+            instance.web.pyeval.eval('context', {})
+        ]).done(function(shortcuts) {
             _.each(shortcuts, function(sc) {
                 self.trigger('display', sc);
             });
@@ -54,7 +58,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     },
     add: function (sc) {
         var self = this;
-        this.dataset.create(sc).then(function(out){
+        this.model.call('create', [sc]).then(function(out){
             self.trigger('load');
         });
     },
@@ -69,7 +73,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
         var $shortcut = this.$el.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
         var shortcut_id = $shortcut.data('shortcut-id');
         $shortcut.remove();
-        this.dataset.unlink([shortcut_id]);
+        this.model.call('unlink', [shortcut_id]);
     },
     click: function($link) {
         var self = this,