Commit Graph

276 Commits

Author SHA1 Message Date
Localizer 96e6038d87 updated translation resources 2015-10-14 15:49:16 +00:00
Localizer 4b882064f2 updated translation resources 2015-09-30 11:32:44 +00:00
Localizer fe5db4761e updated translation resources 2015-09-14 10:01:23 +00:00
Localizer b80c18c288 updated translation resources 2015-09-07 10:34:19 +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 d4287e9abd updated translation resources 2015-09-04 14:47:15 +00: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 8f59d18f34 Merge branch '2.5.x-installer' into saas-dev 2015-06-17 14:11:30 -04:00
localizer e011d61b81 updated translation resources 2015-05-28 09:35:12 +00:00
localizer 266bf75765 updated translation resources 2015-05-22 09:27:12 +00:00
localizer 617fdb971f updated translation resources 2015-05-21 14:18:07 +00:00
localizer 6c015950de updated translation resources 2015-05-21 11:00:11 +00:00
localizer c1c1a6c7f9 updated translation resources 2015-05-20 10:52:16 +00:00
localizer dc11e88b0e updated translation resources 2015-05-19 07:39:13 +00:00
Albert Santoni 3d99c423a9 Merge branch '2.5.x' into saas 2015-05-11 11:08:52 -04:00
localizer 7676ec5643 updated translation resources 2015-05-07 08:04:23 +00:00
Duncan Sommerville 574fdf4b27 Merged 2.5.x into saas 2015-04-27 14:01:28 -04:00
localizer 3d8a1cf9a6 updated translation resources 2015-04-24 10:43:06 +00:00
localizer ff94efc214 updated translation resources 2015-04-24 09:09:12 +00:00
localizer b3f66e28f7 updated translation resources 2015-04-21 11:54:12 +00: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 a286597826 updated translation resources 2015-04-17 13:03:07 +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
localizer c8ccd38075 updated translation resources 2015-03-05 10:03:16 +00:00
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