Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Sep 2013 15:53:13 +0000 (17:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 11 Sep 2013 15:53:13 +0000 (17:53 +0200)
Conflicts:
tine20/Calendar/translations/bg.po
tine20/Calendar/translations/ca.po
tine20/Calendar/translations/cs.po
tine20/Calendar/translations/da.po
tine20/Calendar/translations/de.po
tine20/Calendar/translations/es_MX.po
tine20/Calendar/translations/et.po
tine20/Calendar/translations/fa_IR.po
tine20/Calendar/translations/fi.po
tine20/Calendar/translations/fr.po
tine20/Calendar/translations/hr_HR.po
tine20/Calendar/translations/hu.po
tine20/Calendar/translations/it.po
tine20/Calendar/translations/ja.po
tine20/Calendar/translations/ko_KR.po
tine20/Calendar/translations/lt.po
tine20/Calendar/translations/nb.po
tine20/Calendar/translations/nl_NL.po
tine20/Calendar/translations/pl.po
tine20/Calendar/translations/pt_BR.po
tine20/Calendar/translations/sk.po
tine20/Calendar/translations/sv_SE.po
tine20/Calendar/translations/tr_TR.po
tine20/Calendar/translations/vi.po
tine20/Calendar/translations/zh_CN.po
tine20/Calendar/translations/zh_TW.po
tine20/Courses/translations/bg.po
tine20/Courses/translations/ca.po
tine20/Courses/translations/ja.po
tine20/HumanResources/translations/cs.po
tine20/HumanResources/translations/da.po
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/es_MX.po
tine20/HumanResources/translations/et.po
tine20/HumanResources/translations/fa_IR.po
tine20/HumanResources/translations/fi.po
tine20/HumanResources/translations/fr.po
tine20/HumanResources/translations/hr_HR.po
tine20/HumanResources/translations/hu.po
tine20/HumanResources/translations/it.po
tine20/HumanResources/translations/ko_KR.po
tine20/HumanResources/translations/lt.po
tine20/HumanResources/translations/nl_NL.po
tine20/HumanResources/translations/pl.po
tine20/HumanResources/translations/pt_BR.po
tine20/HumanResources/translations/sk.po
tine20/HumanResources/translations/sv_SE.po
tine20/HumanResources/translations/tr_TR.po
tine20/HumanResources/translations/vi.po
tine20/HumanResources/translations/zh_CN.po
tine20/HumanResources/translations/zh_TW.po
tine20/Phone/translations/de.po
tine20/Sales/translations/bg.po
tine20/Sales/translations/ca.po
tine20/Sales/translations/cs.po
tine20/Sales/translations/da.po
tine20/Sales/translations/de.po
tine20/Sales/translations/es_MX.po
tine20/Sales/translations/et.po
tine20/Sales/translations/fa_IR.po
tine20/Sales/translations/fi.po
tine20/Sales/translations/fr.po
tine20/Sales/translations/hr_HR.po
tine20/Sales/translations/hu.po
tine20/Sales/translations/it.po
tine20/Sales/translations/ja.po
tine20/Sales/translations/ko_KR.po
tine20/Sales/translations/lt.po
tine20/Sales/translations/nb.po
tine20/Sales/translations/nl_NL.po
tine20/Sales/translations/pl.po
tine20/Sales/translations/pt_BR.po
tine20/Sales/translations/sk.po
tine20/Sales/translations/sv_SE.po
tine20/Sales/translations/tr_TR.po
tine20/Sales/translations/vi.po
tine20/Sales/translations/zh_CN.po
tine20/Sales/translations/zh_TW.po
tine20/Sipgate/translations/cs.po
tine20/Sipgate/translations/da.po
tine20/Sipgate/translations/de.po
tine20/Sipgate/translations/es_MX.po
tine20/Sipgate/translations/et.po
tine20/Sipgate/translations/fa_IR.po
tine20/Sipgate/translations/fi.po
tine20/Sipgate/translations/fr.po
tine20/Sipgate/translations/hr_HR.po
tine20/Sipgate/translations/hu.po
tine20/Sipgate/translations/it.po
tine20/Sipgate/translations/ko_KR.po
tine20/Sipgate/translations/lt.po
tine20/Sipgate/translations/nl_NL.po
tine20/Sipgate/translations/pl.po
tine20/Sipgate/translations/pt_BR.po
tine20/Sipgate/translations/sk.po
tine20/Sipgate/translations/sv_SE.po
tine20/Sipgate/translations/tr_TR.po
tine20/Sipgate/translations/vi.po
tine20/Sipgate/translations/zh_CN.po
tine20/Sipgate/translations/zh_TW.po
tine20/Tasks/translations/bg.po
tine20/Tasks/translations/ca.po
tine20/Tasks/translations/cs.po
tine20/Tasks/translations/da.po
tine20/Tasks/translations/de.po
tine20/Tasks/translations/es_MX.po
tine20/Tasks/translations/et.po
tine20/Tasks/translations/fa_IR.po
tine20/Tasks/translations/fi.po
tine20/Tasks/translations/fr.po
tine20/Tasks/translations/hr_HR.po
tine20/Tasks/translations/hu.po
tine20/Tasks/translations/it.po
tine20/Tasks/translations/ja.po
tine20/Tasks/translations/ko_KR.po
tine20/Tasks/translations/lt.po
tine20/Tasks/translations/nb.po
tine20/Tasks/translations/nl_NL.po
tine20/Tasks/translations/pl.po
tine20/Tasks/translations/pt_BR.po
tine20/Tasks/translations/sk.po
tine20/Tasks/translations/sv_SE.po
tine20/Tasks/translations/tr_TR.po
tine20/Tasks/translations/vi.po
tine20/Tasks/translations/zh_CN.po
tine20/Tasks/translations/zh_TW.po
tine20/Timetracker/translations/bg.po
tine20/Timetracker/translations/ca.po
tine20/Timetracker/translations/cs.po
tine20/Timetracker/translations/da.po
tine20/Timetracker/translations/de.po
tine20/Timetracker/translations/es_MX.po
tine20/Timetracker/translations/et.po
tine20/Timetracker/translations/fa_IR.po
tine20/Timetracker/translations/fi.po
tine20/Timetracker/translations/fr.po
tine20/Timetracker/translations/hr_HR.po
tine20/Timetracker/translations/hu.po
tine20/Timetracker/translations/it.po
tine20/Timetracker/translations/ko_KR.po
tine20/Timetracker/translations/lt.po
tine20/Timetracker/translations/nb.po
tine20/Timetracker/translations/nl_NL.po
tine20/Timetracker/translations/pl.po
tine20/Timetracker/translations/pt_BR.po
tine20/Timetracker/translations/sk.po
tine20/Timetracker/translations/sv_SE.po
tine20/Timetracker/translations/tr_TR.po
tine20/Timetracker/translations/vi.po
tine20/Timetracker/translations/zh_CN.po
tine20/Timetracker/translations/zh_TW.po
tine20/Tinebase/translations/bg.po
tine20/Tinebase/translations/ca.po
tine20/Tinebase/translations/cs.po
tine20/Tinebase/translations/da.po
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/es_MX.po
tine20/Tinebase/translations/et.po
tine20/Tinebase/translations/fa_IR.po
tine20/Tinebase/translations/fi.po
tine20/Tinebase/translations/fr.po
tine20/Tinebase/translations/hr_HR.po
tine20/Tinebase/translations/hu.po
tine20/Tinebase/translations/it.po
tine20/Tinebase/translations/ja.po
tine20/Tinebase/translations/ko_KR.po
tine20/Tinebase/translations/lt.po
tine20/Tinebase/translations/nb.po
tine20/Tinebase/translations/nl_NL.po
tine20/Tinebase/translations/pl.po
tine20/Tinebase/translations/pt_BR.po
tine20/Tinebase/translations/sk.po
tine20/Tinebase/translations/sv_SE.po
tine20/Tinebase/translations/tr_TR.po
tine20/Tinebase/translations/vi.po
tine20/Tinebase/translations/zh_CN.po
tine20/Tinebase/translations/zh_TW.po
tine20/Voipmanager/translations/bg.po
tine20/Voipmanager/translations/ca.po
tine20/Voipmanager/translations/cs.po
tine20/Voipmanager/translations/da.po
tine20/Voipmanager/translations/de.po
tine20/Voipmanager/translations/es_MX.po
tine20/Voipmanager/translations/et.po
tine20/Voipmanager/translations/fa_IR.po
tine20/Voipmanager/translations/fi.po
tine20/Voipmanager/translations/fr.po
tine20/Voipmanager/translations/hr_HR.po
tine20/Voipmanager/translations/hu.po
tine20/Voipmanager/translations/it.po
tine20/Voipmanager/translations/ja.po
tine20/Voipmanager/translations/ko_KR.po
tine20/Voipmanager/translations/lt.po
tine20/Voipmanager/translations/nb.po
tine20/Voipmanager/translations/nl_NL.po
tine20/Voipmanager/translations/pl.po
tine20/Voipmanager/translations/pt_BR.po
tine20/Voipmanager/translations/sk.po
tine20/Voipmanager/translations/sv_SE.po
tine20/Voipmanager/translations/tr_TR.po
tine20/Voipmanager/translations/vi.po
tine20/Voipmanager/translations/zh_CN.po
tine20/Voipmanager/translations/zh_TW.po

1  2 
tine20/Admin/js/Applications.js

Simple merge