Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas

Browse source 
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
This commit is contained in:
drigato 2014-12-03 13:35:32 -05:00
commit cf9eabbc74
42 changed files with 5355 additions and 1681 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
View file

@ -1564,6 +1564,7 @@ msgstr "Ne peut pas avoir une durée supérieure à 24h"
#: airtime_mvc/application/forms/AddShowWhen.php:325
#: airtime_mvc/application/forms/AddShowWhen.php:331
#: airtime_mvc/application/forms/AddShowWhen.php:336
#: airtime_mvc/application/services/CalendarService.php:305
msgid "Cannot schedule overlapping shows"
msgstr "Ne peux pas programmer des émissions qui se chevauchent"
@ -4400,6 +4401,7 @@ msgstr "Rediffusion de %s à %s"
#: airtime_mvc/application/models/Preference.php:666
#: airtime_mvc/application/models/Preference.php:655
#: airtime_mvc/application/models/Preference.php:650
#: airtime_mvc/application/models/Preference.php:662
msgid "Select Country"
msgstr "Selectionner le Pays"
@ -4674,11 +4676,13 @@ msgstr "Ne peux pas déplacer une émission diffusée"
#: airtime_mvc/application/services/CalendarService.php:297
#: airtime_mvc/application/services/CalendarService.php:281
#: airtime_mvc/application/services/CalendarService.php:298
msgid "Can't move show into past"
msgstr "Ne peux pas déplacer une émission dans le passé"
#: airtime_mvc/application/services/CalendarService.php:317
#: airtime_mvc/application/services/CalendarService.php:301
#: airtime_mvc/application/services/CalendarService.php:318
msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
msgstr ""
"Impossible de déplacer une émission enregistrée à moins d'1 heure avant ses "
@ -4686,6 +4690,7 @@ msgstr ""
#: airtime_mvc/application/services/CalendarService.php:327
#: airtime_mvc/application/services/CalendarService.php:311
#: airtime_mvc/application/services/CalendarService.php:328
msgid "Show was deleted because recorded show does not exist!"
msgstr ""
"L'Emission a été éffacée parce que l'enregistrement de l'émission n'existe "
@ -4693,6 +4698,7 @@ msgstr ""
#: airtime_mvc/application/services/CalendarService.php:334
#: airtime_mvc/application/services/CalendarService.php:318
#: airtime_mvc/application/services/CalendarService.php:335
msgid "Must wait 1 hour to rebroadcast."
msgstr "Doit attendre 1 heure pour retransmettre."