Merge branch '2.5.x' into cc-5709-airtime-analyzer

Conflicts: airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00 · 2014-11-26 10:35:48 -05:00 · f08535cc10
commit f08535cc10
parent 7db571d103 00fbda193e
99 changed files with 30547 additions and 20010 deletions
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/si/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/si/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/si/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/si/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/template/airtime.po
+++ b/airtime_mvc/locale/template/airtime.po
--- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po