[MERGE] trunk-some_typo (fix capitalization and typos in labels)

bzr revid: rco@openerp.com-20120510151939-fdadjh0rgll6uihr

diff --cc addons/account/i18n/account.pot
Simple merge

diff --cc addons/account/i18n/ar.po
Simple merge

diff --cc addons/account/i18n/bg.po
Simple merge

diff --cc addons/account/i18n/br.po
Simple merge

diff --cc addons/account/i18n/bs.po
Simple merge

diff --cc addons/account/i18n/ca.po
Simple merge

diff --cc addons/account/i18n/cs.po
Simple merge

diff --cc addons/account/i18n/da.po
Simple merge

diff --cc addons/account/i18n/de.po
Simple merge

diff --cc addons/account/i18n/el.po
Simple merge

diff --cc addons/account/i18n/en_GB.po
Simple merge

diff --cc addons/account/i18n/en_US.po
Simple merge

diff --cc addons/account/i18n/es.po
Simple merge

diff --cc addons/account/i18n/es_AR.po
Simple merge

diff --cc addons/account/i18n/es_CL.po
Simple merge

diff --cc addons/account/i18n/es_CR.po
Simple merge

diff --cc addons/account/i18n/es_EC.po
Simple merge

diff --cc addons/account/i18n/es_MX.po
Simple merge

diff --cc addons/account/i18n/es_PY.po
Simple merge

diff --cc addons/account/i18n/es_VE.po
Simple merge

diff --cc addons/account/i18n/et.po
Simple merge

diff --cc addons/account/i18n/eu.po
Simple merge

diff --cc addons/account/i18n/fa.po
Simple merge

diff --cc addons/account/i18n/fa_AF.po
Simple merge

diff --cc addons/account/i18n/fi.po
Simple merge

diff --cc addons/account/i18n/fr.po
Simple merge

diff --cc addons/account/i18n/fr_BE.po
Simple merge

diff --cc addons/account/i18n/gl.po
Simple merge

diff --cc addons/account/i18n/gu.po
Simple merge

diff --cc addons/account/i18n/he.po
Simple merge

diff --cc addons/account/i18n/hi.po
Simple merge

diff --cc addons/account/i18n/hr.po
Simple merge

diff --cc addons/account/i18n/hu.po
Simple merge

diff --cc addons/account/i18n/id.po
Simple merge

diff --cc addons/account/i18n/it.po
Simple merge

diff --cc addons/account/i18n/ja.po
Simple merge

diff --cc addons/account/i18n/kab.po
Simple merge

diff --cc addons/account/i18n/kk.po
Simple merge

diff --cc addons/account/i18n/ko.po
Simple merge

diff --cc addons/account/i18n/lo.po
Simple merge

diff --cc addons/account/i18n/lt.po
Simple merge

diff --cc addons/account/i18n/lv.po
Simple merge

diff --cc addons/account/i18n/mk.po
Simple merge

diff --cc addons/account/i18n/mn.po
Simple merge

diff --cc addons/account/i18n/nb.po
Simple merge

diff --cc addons/account/i18n/nl.po
Simple merge

diff --cc addons/account/i18n/nl_BE.po
Simple merge

diff --cc addons/account/i18n/oc.po
Simple merge

diff --cc addons/account/i18n/pl.po
Simple merge

diff --cc addons/account/i18n/pt.po
Simple merge

diff --cc addons/account/i18n/pt_BR.po
Simple merge

diff --cc addons/account/i18n/ro.po
Simple merge

diff --cc addons/account/i18n/ru.po
Simple merge

diff --cc addons/account/i18n/si.po
Simple merge

diff --cc addons/account/i18n/sk.po
Simple merge

diff --cc addons/account/i18n/sl.po
Simple merge

diff --cc addons/account/i18n/sq.po
Simple merge

diff --cc addons/account/i18n/sr.po
Simple merge

diff --cc addons/account/i18n/sr@latin.po
Simple merge

diff --cc addons/account/i18n/sv.po
Simple merge

diff --cc addons/account/i18n/ta.po
Simple merge

diff --cc addons/account/i18n/te.po
Simple merge

diff --cc addons/account/i18n/th.po
Simple merge

diff --cc addons/account/i18n/tlh.po
Simple merge

diff --cc addons/account/i18n/tr.po
Simple merge

diff --cc addons/account/i18n/ug.po
Simple merge

diff --cc addons/account/i18n/uk.po
Simple merge

diff --cc addons/account/i18n/ur.po
Simple merge

diff --cc addons/account/i18n/vi.po
Simple merge

diff --cc addons/account/i18n/zh_CN.po
Simple merge

diff --cc addons/account/i18n/zh_HK.po
Simple merge

diff --cc addons/account/i18n/zh_TW.po
Simple merge

diff --cc addons/auction/i18n/lt.po
Simple merge

diff --cc addons/base_calendar/i18n/af.po
Simple merge

diff --cc addons/base_calendar/i18n/ar.po
Simple merge

diff --cc addons/base_calendar/i18n/base_calendar.pot
Simple merge

diff --cc addons/base_calendar/i18n/bg.po
Simple merge

diff --cc addons/base_calendar/i18n/bn.po
Simple merge

diff --cc addons/base_calendar/i18n/bs.po
Simple merge

diff --cc addons/base_calendar/i18n/ca.po
Simple merge

diff --cc addons/base_calendar/i18n/cs.po
Simple merge

diff --cc addons/base_calendar/i18n/da.po
Simple merge

diff --cc addons/base_calendar/i18n/de.po
Simple merge

diff --cc addons/base_calendar/i18n/el.po
Simple merge

diff --cc addons/base_calendar/i18n/es.po
Simple merge

diff --cc addons/base_calendar/i18n/es_CR.po
Simple merge

diff --cc addons/base_calendar/i18n/es_EC.po
Simple merge

diff --cc addons/base_calendar/i18n/es_MX.po
Simple merge

diff --cc addons/base_calendar/i18n/es_PY.po
Simple merge

diff --cc addons/base_calendar/i18n/es_VE.po
Simple merge

diff --cc addons/base_calendar/i18n/et.po
Simple merge

diff --cc addons/base_calendar/i18n/fa.po
Simple merge

diff --cc addons/base_calendar/i18n/fi.po
Simple merge

diff --cc addons/base_calendar/i18n/fr.po
Simple merge

diff --cc addons/base_calendar/i18n/gl.po
Simple merge

diff --cc addons/base_calendar/i18n/hr.po
Simple merge

diff --cc addons/base_calendar/i18n/hu.po
Simple merge

diff --cc addons/base_calendar/i18n/it.po
Simple merge

diff --cc addons/base_calendar/i18n/ln.po
Simple merge

diff --cc addons/base_calendar/i18n/lt.po
Simple merge

diff --cc addons/base_calendar/i18n/lv.po
Simple merge

diff --cc addons/base_calendar/i18n/mn.po
Simple merge

diff --cc addons/base_calendar/i18n/nb.po
Simple merge

diff --cc addons/base_calendar/i18n/nl.po
Simple merge

diff --cc addons/base_calendar/i18n/pl.po
Simple merge

diff --cc addons/base_calendar/i18n/pt.po
Simple merge

diff --cc addons/base_calendar/i18n/pt_BR.po
Simple merge

diff --cc addons/base_calendar/i18n/ro.po
Simple merge

diff --cc addons/base_calendar/i18n/ru.po
Simple merge

diff --cc addons/base_calendar/i18n/sk.po
Simple merge

diff --cc addons/base_calendar/i18n/sl.po
Simple merge

diff --cc addons/base_calendar/i18n/sq.po
Simple merge

diff --cc addons/base_calendar/i18n/sr.po
Simple merge

diff --cc addons/base_calendar/i18n/sr@latin.po
Simple merge

diff --cc addons/base_calendar/i18n/sv.po
Simple merge

diff --cc addons/base_calendar/i18n/th.po
Simple merge

diff --cc addons/base_calendar/i18n/tr.po
Simple merge

diff --cc addons/base_calendar/i18n/zh_CN.po
Simple merge

diff --cc addons/base_calendar/i18n/zh_TW.po
Simple merge

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

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/crm/i18n/lt.po
Simple merge

diff --cc addons/email_template/i18n/ar.po
Simple merge

diff --cc addons/email_template/i18n/bg.po
Simple merge

diff --cc addons/email_template/i18n/ca.po
Simple merge

diff --cc addons/email_template/i18n/da.po
Simple merge

diff --cc addons/email_template/i18n/de.po
Simple merge

diff --cc addons/email_template/i18n/email_template.pot
Simple merge

diff --cc addons/email_template/i18n/es.po
Simple merge

diff --cc addons/email_template/i18n/es_CR.po
Simple merge

diff --cc addons/email_template/i18n/es_EC.po
Simple merge

diff --cc addons/email_template/i18n/et.po
Simple merge

diff --cc addons/email_template/i18n/fi.po
Simple merge

diff --cc addons/email_template/i18n/fr.po
Simple merge

diff --cc addons/email_template/i18n/hr.po
Simple merge

diff --cc addons/email_template/i18n/hu.po
Simple merge

diff --cc addons/email_template/i18n/it.po
Simple merge

diff --cc addons/email_template/i18n/ja.po
Simple merge

diff --cc addons/email_template/i18n/mn.po
Simple merge

diff --cc addons/email_template/i18n/nb.po
Simple merge

diff --cc addons/email_template/i18n/nl.po
Simple merge

diff --cc addons/email_template/i18n/pl.po
Simple merge

diff --cc addons/email_template/i18n/pt.po
Simple merge

diff --cc addons/email_template/i18n/pt_BR.po
Simple merge

diff --cc addons/email_template/i18n/ro.po
Simple merge

diff --cc addons/email_template/i18n/ru.po
Simple merge

diff --cc addons/email_template/i18n/sr.po
Simple merge

diff --cc addons/email_template/i18n/sr@latin.po
Simple merge

diff --cc addons/email_template/i18n/sv.po
Simple merge

diff --cc addons/email_template/i18n/tr.po
Simple merge

diff --cc addons/email_template/i18n/zh_CN.po
Simple merge

diff --cc addons/hr/i18n/lt.po
Simple merge

diff --cc addons/hr_attendance/i18n/fi.po
Simple merge

diff --cc addons/idea/i18n/mn.po
Simple merge

diff --cc addons/import_sugarcrm/i18n/ja.po
Simple merge

diff --cc addons/project/project_view.xml
index 19a1d0d,6d0cf1b..30b8354
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -53,9 -49,8 +53,9 @@@
                                  <field name="effective_hours" widget="float_time" />
                                  <field name="resource_calendar_id"/>
                              </group>
 +                            <newline/>
                              <group col="2" colspan="2" name="misc">
-                                 <separator colspan="4" string="Miscelleanous"/>
+                                 <separator colspan="4" string="Miscellaneous"/>
                                  <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
                                  <field name="warn_manager"/>
                                  <field name="priority"/>

diff --cc addons/project_long_term/project_long_term_view.xml
Simple merge

diff --cc addons/stock/i18n/mn.po
Simple merge