Commit Graph

244 Commits

Author SHA1 Message Date
Albert Santoni b2a2153572 Merge branch '2.5.x' into saas 2015-02-24 12:04:11 -05:00
localizer 19851efbe5 updated translation resources 2015-02-20 11:24:14 +00:00
Albert Santoni 3c064b13a9 Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
2015-02-18 16:03:14 -05:00
Daniel James 0c14f51455 Removed more obsolete files, more complete versions are now in ja directory 2015-02-18 11:05:46 +00:00
Daniel James ebf2b49108 Removed obsolete localization files, now in hy_AM 2015-02-18 11:02:36 +00:00
localizer cd994c0928 updated translation resources 2015-02-05 10:32:16 +00:00
drigato ca9750f415 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/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	CREDITS
2015-01-22 11:29:38 -05:00
localizer 974d419951 updated translation resources 2015-01-19 13:52:08 +00:00
localizer 5980f599e7 updated translation resources 2015-01-19 13:02:11 +00:00
localizer c614f4d711 updated translation resources 2015-01-15 11:12:14 +00:00
drigato ad16683858 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 2015-01-07 14:17:02 -05:00
drigato e5c806f658 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2015-01-07 14:13:36 -05:00
localizer 59d7c23450 updated translation resources 2014-12-23 10:10:38 +00:00
localizer cceddd57d8 updated translation resources 2014-12-05 10:33:17 +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
localizer 37e358630d updated translation resources 2014-11-27 14:57:16 +00: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 b5575d9953 updated translation resources 2014-11-14 10:53:06 +00:00
localizer 9d29b84081 updated translation resources 2014-11-14 10:49:07 +00: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
omniton 2eb1fee4a7 fixed po file format 2014-11-13 12:09:06 +03:00
Albert Santoni a4ae1a7842 Translation update, and fixed bad merge in fr_FR 2014-11-11 18:19:49 -05:00
Albert Santoni fbdd3f1dc4 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2014-11-10 09:59:51 -05:00
Albert Santoni 3618433792 Add separate pro.po file for Airtime Pro strings 2014-11-10 09:59:37 -05:00
Duncan Sommerville 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
localizer 6c27606aa7 updated translation resources 2014-11-05 10:56:11 +00:00
localizer a67397d0cf updated translation resources 2014-11-04 16:44:18 +00:00
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00
Robert Elder 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +00:00
Albert Santoni f439072422 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-10 11:21:49 -04:00
localizer 736acda14e updated translation resources 2014-10-09 04:27:12 +00:00
drigato c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
localizer b861375959 updated translation resources 2014-10-07 13:42:14 +00:00
localizer cf1d65363c updated translation resources 2014-10-03 05:39:12 +00:00
localizer ff16cefa62 updated translation resources 2014-09-29 06:43:17 +00:00
localizer 657a47a576 updated translation resources 2014-09-22 02:46:15 +00:00
Duncan Sommerville 365184c2b1 Merging upstream pull 2014-09-19 13:15:53 -04:00
drigato 8b20ee459c Merge branch '2.5.x' into saas 2014-09-19 11:12:49 -04:00
localizer e5e350dfe4 updated translation resources 2014-09-17 23:49:10 +00:00
Duncan Sommerville 63d1bf08f7 Merged 2.5.x into saas 2014-09-17 13:30:37 -04:00
Duncan Sommerville 0cb6e27306 Language updates 2014-09-17 13:26:51 -04:00
drigato 646c3b34f5 Merge branch '2.5.x' into saas 2014-09-16 16:54:28 -04:00
localizer 66e73cac57 updated translation resources 2014-09-16 00:12:10 +00:00
drigato ac60a927d4 Merge branch '2.5.x' into saas 2014-09-12 16:31:58 -04:00