Commit Graph

172 Commits

Author SHA1 Message Date
Albert Santoni 1803e1fd8f Logging::warning bugfix and updated translations 2014-07-25 15:05:35 -04:00
Albert Santoni 490a9c0d06 Merge branch 'cc-5709-airtime-analyzer' into saas 2014-07-15 16:46:20 -04:00
Albert Santoni 1aa99e2896 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-07-15 16:41:29 -04:00
localizer 3b6b0f8b69 updated translation resources 2014-07-02 12:02:12 +00:00
Albert Santoni 72ef576f03 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-23 15:28:50 -04:00
Albert Santoni 24d842c4a6 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
2014-06-23 15:26:53 -04:00
localizer f573257dc6 updated translation resources 2014-06-23 12:32:13 +00:00
Albert Santoni fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -04:00
Albert Santoni 560d1a9b14 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
2014-06-09 11:36:51 -04:00
localizer 3873e510f1 updated translation resources 2014-06-03 09:53:10 +00:00
drigato be69d956aa Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
2014-05-06 14:52:50 -04:00
drigato bc080a26f7 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
2014-05-06 14:50:13 -04:00
localizer 2be889f2af updated translation resources 2014-04-25 15:58:16 +00:00
Albert Santoni 571e903871 Overwrite locale files with those from 2.5.x 2014-04-24 13:13:23 -04:00
Albert Santoni caa82f2091 Regenerate messed up translations 2014-04-24 12:53:31 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-23 15:58:39 -04:00
localizer abe3b79fed updated translation resources 2014-04-11 13:13:12 +00:00
Albert Santoni 8fb95316f2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
2014-04-09 15:01:11 -04:00
Albert Santoni 1e62908e66 CC-5709: Airtime Analyzer
* Bounce files with file extensions we don't support in MediaController
* Added translation stuff for Recent Uploads
2014-04-09 11:28:41 -04:00
localizer a33c85b38a updated translation resources 2014-04-02 12:25:06 +00:00
localizer 4d480f613a updated translation resources 2014-04-02 12:15:06 +00:00
localizer ce8ab2edcd updated translation resources 2014-04-02 12:14:06 +00:00
localizer 09ae38914b updated translation resources 2014-04-02 12:13:06 +00:00
localizer f893f74221 updated translation resources 2014-04-02 10:51:07 +00:00
localizer 505b3a9878 updated translation resources 2014-04-02 10:50:06 +00:00
localizer 168af47e9f updated translation resources 2014-04-02 10:48:06 +00:00
localizer 53eb4d3130 updated translation resources 2014-04-02 09:55:14 +00:00
Albert Santoni 6e6d20d3fc Merge branch '2.5.x-serbian-croatian' of https://github.com/danielhjames/Airtime into 2.5.x
Conflicts:
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.mo
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
2014-04-01 10:30:00 -04:00
localizer 5dca00c593 updated translation resources 2014-03-13 16:49:36 +00:00
localizer e0386f9752 updated translation resources 2014-03-12 09:34:44 +00:00
localizer 9a803b1da5 updated translation resources 2014-03-12 09:30:20 +00:00
localizer 003f9ed6b2 updated translation resources 2014-02-12 10:54:11 +00:00
localizer b7b92fc19e updated translation resources 2014-02-11 20:09:12 +00:00
localizer c84c6d9d22 updated translation resources 2014-02-04 18:20:15 +00:00
localizer 93eb5ff1de updated translation resources 2014-02-04 14:07:13 +00:00
localizer f056eeac0a updated translation resources 2014-02-04 11:49:16 +00:00
localizer ce819b18e7 updated translation resources 2014-02-04 11:32:05 +00:00
localizer c549544146 updated translation resources 2014-02-04 11:31:56 +00:00
localizer 2d61459620 updated translation resources 2014-02-04 11:25:37 +00:00
localizer f2ce85a212 updated translation resources 2014-02-04 11:24:32 +00:00
localizer b209c58dbf updated translation resources 2014-02-04 10:32:05 +00:00
localizer 5d19a22b2d updated translation resources 2014-02-03 12:35:10 +00:00
localizer 4a39097daf updated translation resources 2014-01-31 07:52:07 +00:00
localizer 5730c13da6 updated translation resources 2014-01-30 20:37:06 +00:00
root 3f15bf6e80 updated translation resources 2014-01-30 17:06:38 +00:00
Daniel James eb35dcac5f Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00
drigato d841f11de3 CC-5638: Shows become unlinked when moving the end time back
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
Daniel James e9362e6429 Corrections to Hungarian localization 2013-11-20 10:55:34 +00:00
Daniel James d30ee4ecc5 Refined Hungarian translation, thanks Zsolt! 2013-11-12 15:06:26 +00:00
Daniel James 0392ce1971 Update Czech translation binary 2013-10-24 11:01:29 +01:00