[MERGE] merge with latest trunk

bzr revid: amb@tinyerp.com-20130813110637-nwi1lao9wegqz5ro

diff --cc addons/account/account.py
Simple merge

diff --cc addons/base_calendar/base_calendar.py
Simple merge

diff --cc addons/crm/i18n/es_AR.po
index 7b09f19,524cdd9..818abea
--- 1/addons/crm/i18n/es_AR.po
--- 2/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@@ -4,17 -5,17 +5,17 @@@
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: OpenERP Server 5.0.0\n"
- "Report-Msgid-Bugs-To: support@openerp.com\n"
+ "Project-Id-Version: openobject-addons\n"
+ "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
  "POT-Creation-Date: 2012-12-21 17:04+0000\n"
- "PO-Revision-Date: 2009-09-15 15:45+0000\n"
- "Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
- "Language-Team: \n"
 -"PO-Revision-Date: 2013-08-15 15:46+0000\n"
++"PO-Revision-Date: 2013-08-13 02:17+0000\n"
+ "Last-Translator: Laureano Kloss <Unknown>\n"
+ "Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2013-03-16 05:09+0000\n"
- "X-Generator: Launchpad (build 16532)\n"
 -"X-Launchpad-Export-Date: 2013-08-16 05:12+0000\n"
++"X-Launchpad-Export-Date: 2013-08-13 05:00+0000\n"
+ "X-Generator: Launchpad (build 16723)\n"
  
  #. module: crm
  #: view:crm.lead.report:0
@@@ -703,10 -769,10 +753,10 @@@ msgstr "
  #. module: crm
  #: view:board.board:0
  msgid "Statistics Dashboard"
 -msgstr "Tablero de estadísticas"
 +msgstr ""
  
  #. module: crm
- #: code:addons/crm/crm_lead.py:861
+ #: code:addons/crm/crm_lead.py:878
  #: model:crm.case.stage,name:crm.stage_lead2
  #: selection:crm.case.stage,type:0
  #: view:crm.lead:0
@@@ -766,10 -834,10 +816,10 @@@ msgid "Exclusive
  msgstr "Exclusivo"
  
  #. module: crm
- #: code:addons/crm/crm_lead.py:584
+ #: code:addons/crm/crm_lead.py:600
  #, python-format
  msgid "From %s : %s"
 -msgstr "Desde %s : %s"
 +msgstr ""
  
  #. module: crm
  #: view:crm.lead2opportunity.partner.mass:0

diff --cc addons/project/i18n/zh_CN.po
index 885dbd1,242bca1..2bb41d2
--- 1/addons/project/i18n/zh_CN.po
--- 2/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@@ -13,8 -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: 2013-06-28 05:42+0000\n"
- "X-Generator: Launchpad (build 16681)\n"
 -"X-Launchpad-Export-Date: 2013-08-14 04:54+0000\n"
++"X-Launchpad-Export-Date: 2013-08-13 05:00+0000\n"
+ "X-Generator: Launchpad (build 16723)\n"
  
  #. module: project
  #: view:project.project:0

diff --cc addons/project/project.py
Simple merge

diff --cc addons/project/project_demo.xml
Simple merge

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_issue/project_issue_view.xml
Simple merge