Commit graph

38 commits

Author SHA1 Message Date
Localizer
4b882064f2 updated translation resources 2015-09-30 11:32:44 +00:00
Localizer
57e3059c16 updated translation resources 2015-09-05 08:34:23 +00:00
Albert Santoni
8499fd989c Regenerate the translation files 2015-09-04 11:17:18 -04:00
Localizer
d257daa510 updated translation resources 2015-09-04 08:16:31 +00:00
Albert Santoni
9071c8d4b6 Update the translations 2015-09-03 10:26:33 -04:00
Localizer
34a7019c5b updated translation resources 2015-08-31 17:07:52 +00:00
Duncan Sommerville
574fdf4b27 Merged 2.5.x into saas 2015-04-27 14:01:28 -04:00
localizer
ef3fc14b50 updated translation resources 2015-04-17 20:43:07 +00:00
localizer
4bf234d108 updated translation resources 2015-04-17 20:35:08 +00:00
localizer
f7d9363fff updated translation resources 2015-04-17 12:51:13 +00:00
Albert Santoni
f0bcc1e42b Merge branch '2.5.x' into saas 2015-04-15 16:44:26 -04:00
localizer
87b6f0db48 updated translation resources 2015-04-13 19:40:08 +00:00
localizer
5d3ec4ab13 updated translation resources 2015-04-13 19:27:07 +00:00
localizer
90b03a06a2 updated translation resources 2015-04-13 19:12:15 +00:00
drigato
cf9eabbc74 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
drigato
f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
Albert Santoni
2494e66bb0 Merge branch '2.5.x' into saas 2014-11-14 11:56:01 -05:00
localizer
ee0d89913b updated translation resources 2014-11-14 09:59:25 +00:00
Albert Santoni
0a0e7cb8f3 Regenerate the .po files... 2014-11-13 14:31:41 -05:00
Albert Santoni
21ea2a2933 Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
localizer
9e74b26fc4 updated translation resources 2014-11-13 19:07:10 +00:00
Albert Santoni
0681e80afd Regenerated the .po files 2014-11-13 13:56:47 -05:00
Albert Santoni
a4ae1a7842 Translation update, and fixed bad merge in fr_FR 2014-11-11 18:19:49 -05:00
Albert Santoni
3618433792 Add separate pro.po file for Airtime Pro strings 2014-11-10 09:59:37 -05:00
drigato
9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
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
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
Albert Santoni
1803e1fd8f Logging::warning bugfix and updated translations 2014-07-25 15:05:35 -04: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
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
ce819b18e7 updated translation resources 2014-02-04 11:32:05 +00:00