Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,679 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

314 Commits

Author SHA1 Message Date
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
localizer e1bb017c9a updated translation resources 2014-09-12 00:51:07 +00:00
localizer db49ab3c7f updated translation resources 2014-09-11 09:34:10 +00:00
localizer 9e7bffb02a updated translation resources 2014-09-09 13:14:14 +00:00
Albert Santoni 142060d600 Merge remote-tracking branch 'origin/2.5.x' into saas 2014-09-08 20:47:38 -04:00
localizer fd88fc09aa updated translation resources 2014-09-08 00:38:12 +00:00
localizer 1117984032 updated translation resources 2014-09-05 05:45:12 +00:00
drigato ace883c975 Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04 
Conflicts:
	airtime_mvc/application/configs/application.ini
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/models/Cache.php
 2014-08-28 17:01:03 -04:00
drigato 52f3ed816e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 12:01:42 -04: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
drigato 46f93c2f8e Merge branch '2.5.x' into saas 2014-08-27 16:54:59 -04:00
localizer 6843b528b6 updated translation resources 2014-08-27 01:20:18 +00: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 fb4699433b updated translation resources 2014-08-25 02:35:12 +00: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 08cc19749b updated translation resources 2014-07-28 13:38:07 +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 a888eb6b00 updated translation resources 2014-07-28 11:02:06 +00:00
localizer f985ff868e updated translation resources 2014-07-28 10:53:06 +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 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
xheii01 4cc3b1cbfc Update airtime.po 2013-10-17 12:18:21 +02:00
Albert Santoni 0d74d744da Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-16 16:49:15 -04:00
Daniel James cbd2d72d60 Improved Austrian localization, thanks Erich! 2013-10-16 15:39:09 +01:00
Daniel James 9ee29d77f5 Updated German localization, thanks again to Erich! 2013-10-14 12:28:06 +01:00
Daniel James 49d2d8f0ef Updated Greek localization, thanks Kat! 2013-10-14 12:16:59 +01:00
Daniel James 678282ef90 Updated Hungarian translation for 2.5.0, thanks Zsolt! 2013-10-11 15:35:03 +01:00
Daniel James 1203c9924e Updated Austrian localization, thanks Erich! 2013-10-11 10:36:45 +01:00
cliff.wang 0309e96933 Update Chinese translation 2013-10-10 16:58:00 -04:00
Daniel James 9808a21c25 Updated Czech localization header 2013-10-10 17:19:49 +01:00
Daniel James 6db5535631 Updated Czech localization, thanks to Pavla Holcova! 2013-10-10 17:10:24 +01:00
Daniel James bd36b13d23 Updated French localization for 2.5.0, thanks Albert! 2013-10-10 14:30:01 +01:00
Daniel James f58dafbc1d Updated US English localization 2013-10-10 11:28:17 +01:00
Daniel James 81fe322c91 Updated British localization 2013-10-10 10:47:01 +01: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
cliff.wang 68f715587c Update Chinese translation 
Update Chinese translation after CC-5334
 2013-09-23 11:58:40 -04:00
Naomi Aro 9ec6156c92 CC-5334 : Localize Ryerson History Feature 2013-09-23 14:57:44 +02:00
drigato 39d108ffb3 Merge branch '2.4.x' of https://github.com/bitdevil/Airtime into 2.4.x 2013-06-20 14:12:42 -04:00
drigato bc16ac0793 Updated ko_KR po file. Thanks James Moon! 2013-06-19 10:46:28 -04:00
Silvio M. c90aa2f7db update de_DE .po file 
merged and revised version (de_DE, de_AT)
 2013-06-15 19:48:10 +02:00
denise 3f43fc9e8a Merge branch '2.4.x' of https://github.com/danielhjames/Airtime into 2.4.x 2013-06-13 13:38:15 -04:00
Daniel James a7576009fa Updated Greek localization, thanks Kat! 2013-06-13 17:08:20 +01:00
picizse 204ee94535 Update airtime.po 
finished :)
 2013-06-13 17:18:41 +02:00
Daniel James 4d0f93270d Added new string to all English localizations 2013-06-11 17:16:15 +01:00
denise 26c6a7659e Update to de_DE .po file 2013-05-31 09:28:25 -04:00
denise 4d2a569cb1 Fixed de_AT .po file encoding 2013-05-30 13:36:03 -04:00
denise 046c543fae CC-5189: Typo: Stream type's tooltip 2013-05-30 13:31:06 -04:00
denise 21ea3d2aac Fixed typo in fr_FR .po file 2013-05-30 11:59:09 -04:00
denise 4261c48a53 Fixed fr_FR .po file encoding 2013-05-30 11:56:54 -04: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
cliff.wang 5d168ef7de Little correction about Chinese translation 2013-05-30 11:02:52 -04:00
cliff.wang adc52d7ff5 Update Chinese mo and po files. 
Update Chinese mo and po files.
 2013-05-30 10:54:28 -04:00
denise f9645980a4 Updating .po files with new string added 2013-05-29 15:28:26 -04:00
drigato 84dfe127b6 Updating de_DE .po file. Thanks to Silvio Mende 2013-05-24 10:27:02 -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 2f6e2e7de6 Merged in new string into updated de_DE .po file 2013-05-17 14:13:01 -04:00
denise 29225a8ea3 Updating de_DE .po file. Thanks Silvio Mende! 2013-05-17 14:09:19 -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
denise 3010d014b4 Hungarian translation 2013-05-16 12:47:40 -04:00
Martin Konecny 3208ab0fd1 Merge branch 'patch-2' of git://github.com/picizse/Airtime into picizse-patch-2 2013-05-16 12:28:23 -04:00
cliff.wang 70b734c940 Update Chinese po file 2013-05-16 11:16:36 -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 1bb5f171a8 Updated Canadian localization, eh? :-) 2013-04-11 17:05:33 +01:00
Daniel James de6ccd9c72 Updated US English localization 2013-04-11 17:02:53 +01:00
picizse f1cbca1ed8 Hungarian Translate 
Hungarian Translate

Translated by Magyar Zsolt
 2013-04-11 06:18:23 +03:00
Daniel James ebbb9f1b9c Added Austrian German localization, thanks Hoerich! 2013-04-02 17:06:16 +01:00
Daniel James 06dbcfbcf8 Shorten Greek translation of 'Scheduled Play' (CC-4947) 2013-02-14 17:18:45 +00:00
Daniel James 5f9f342e07 Added strings to Greek localization 2013-02-08 11:14:19 +00:00
Daniel James 192db754ea Fixed typos in US localization 2013-02-08 11:11:20 +00:00