[MERGE]: merging from same branch

addons/account/i18n/pl.po

addons/account/invoice.py

addons/account_analytic_plans/i18n/it.po

addons/account_tax_include/i18n/oc.po

addons/analytic_user_function/i18n/oc.po

addons/base_module_record/base_module_record.py

addons/crm/crm.py

addons/crm/i18n/es.po

addons/crm/scripts/openerp_mailgate/openerp_mailgate.py

addons/crm_profiling/i18n/ru.po

addons/hr_holidays/i18n/es.po

addons/olap_crm/i18n/de.po

addons/profile_manufacturing/i18n/pt_BR.po

addons/smtpclient/smtpclient.py

addons/stock/i18n/es.po

addons/stock/wizard/stock_change_standard_price.py

addons/thunderbird/__init__.py

addons/thunderbird/__openerp__.py

addons/thunderbird/installer.py

addons/thunderbird/partner/partner.py