Commit Graph

89 Commits

Author SHA1 Message Date
Albert Santoni d438587ddc Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/airtime/CcShow.php
	airtime_mvc/application/services/SchedulerService.php
	airtime_mvc/application/services/ShowService.php
2014-08-25 18:09:51 -04:00
localizer 8851efaecf updated translation resources 2014-08-21 14:12:15 +00:00
localizer 3a77931fcd updated translation resources 2014-07-31 10:12:13 +00:00
localizer 606560b187 updated translation resources 2014-07-29 09:56:25 +00:00
localizer 46e5625444 updated translation resources 2014-07-28 11:50:20 +00:00
localizer c2deeb5a5f updated translation resources 2014-07-28 11:17:15 +00:00
localizer cec7c86ce4 updated translation resources 2014-07-28 10:42:19 +00:00
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 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
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
root 3f15bf6e80 updated translation resources 2014-01-30 17:06:38 +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
denise 2165000f82 Update airtime version in po files 2013-10-08 12:06:50 -04:00
denise 1b3adcd375 i18n - Update mo files 2013-10-08 11:56:25 -04:00
denise 38634810a3 Update .po files 2013-10-08 11:48:24 -04:00
Naomi Aro 59f6578e2e CC-5334 : Localize Ryerson History Feature
adding string "New log sheet template"
2013-09-24 09:58:53 +02:00
Naomi Aro 9ec6156c92 CC-5334 : Localize Ryerson History Feature 2013-09-23 14:57:44 +02:00
denise 28ddde3523 Updated version number in all .po files
Updated fr_FR and de_AT .po files with completed translations
2013-05-30 11:28:09 -04:00
denise 67e50354e9 CC-5189: Typo: Stream type's tooltip 2013-05-30 11:14:46 -04:00
denise f9645980a4 Updating .po files with new string added 2013-05-29 15:28:26 -04:00
Daniel James 18a1c7ad98 Localization updates for fixes in CC-5166 and CC-5168 2013-05-22 10:55:14 +01:00
denise fb605ccb71 Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
denise 0f1a94532e CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action
Fixed. Also had to prepare the warning message for localization.
2013-05-17 14:47:34 -04:00
denise 5bf91d513d CC-5127: Library -> Scheduled and Playlist columns needs better icon
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
denise 8901d6b4d9 Committing new compiled .po files 2013-05-14 16:14:19 -04:00
denise e1d0dc9b95 Updated .po files 2013-05-14 16:08:21 -04:00
Naomi 0dd8138c2b CC-5131 : Please give user a message that Browser other than Chrome can't use waveform 2013-05-14 14:15:54 -04:00
Daniel James a7cdaa9629 Updated translation files against current strings 2013-04-11 18:20:25 +01:00
Daniel James 2935670455 Refined Brazilian Portuguese localization, thanks to Luciano De Fazio! 2013-02-07 10:21:45 +00:00
Daniel James f0a1c9983d First commit of Brazilian Portuguese localization, thanks to Luciano De Fazio! 2013-01-21 11:16:40 +00:00