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
This commit is contained in:
drigato
commit
ace883c975
|
|
@ -11,6 +11,7 @@ resources.frontController.plugins.putHandler = "Zend_Controller_Plugin_PutHandle
|
|||
resources.modules[] = ""
|
||||
;load everything in the modules directory including models
|
||||
resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/"
|
||||
resources.modules[] = ""
|
||||
resources.view[] =
|
||||
; These are no longer needed. They are specified in /etc/airtime/airtime.conf:
|
||||
;resources.db.adapter = "Pdo_Pgsql"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?
|
||||
<?php
|
||||
|
||||
class Rest_Bootstrap extends Zend_Application_Module_Bootstrap
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1463,6 +1463,12 @@ msgstr "Die Dauer einer Sendung kann nicht länger als 24h sein"
|
|||
#: airtime_mvc/application/forms/AddShowWhen.php:318
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:324
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:329
|
||||
#: airtime_mvc/application/services/CalendarService.php:305
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:287
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:301
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:325
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:331
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:336
|
||||
msgid "Cannot schedule overlapping shows"
|
||||
msgstr "Sendungen können nicht überlappend geplant werden."
|
||||
|
||||
|
|
@ -4035,6 +4041,7 @@ msgstr "Wiederholung von %s am %s"
|
|||
|
||||
#: airtime_mvc/application/models/Preference.php:666
|
||||
#: airtime_mvc/application/models/Preference.php:655
|
||||
#: airtime_mvc/application/models/Preference.php:662
|
||||
msgid "Select Country"
|
||||
msgstr "Land wählen"
|
||||
|
||||
|
|
@ -4314,11 +4321,13 @@ msgstr ""
|
|||
|
||||
#: 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 "Eine Sendung kann nicht in die Vergangenheit verschoben werden."
|
||||
|
||||
#: 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 ""
|
||||
"Eine aufgezeichnete Sendung kann nicht verschoben werden, wenn der Zeitpunkt "
|
||||
|
|
@ -4326,12 +4335,14 @@ 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 ""
|
||||
"Die Sendung wurde gelöscht, weil die aufgezeichnete Sendung nicht existiert."
|
||||
|
||||
#: 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 ""
|
||||
"Das Wiederholen einer Sendung ist erst nach einer Stunde Wartezeit möglich."
|
||||
|
|
|
|||
|
|
@ -1456,6 +1456,12 @@ msgstr "Cannot have duration greater than 24h"
|
|||
#: airtime_mvc/application/forms/AddShowWhen.php:318
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:324
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:329
|
||||
#: airtime_mvc/application/services/CalendarService.php:305
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:287
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:301
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:325
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:331
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:336
|
||||
msgid "Cannot schedule overlapping shows"
|
||||
msgstr "Cannot schedule overlapping shows"
|
||||
|
||||
|
|
@ -3987,6 +3993,7 @@ msgstr "Rebroadcast of %s from %s"
|
|||
|
||||
#: airtime_mvc/application/models/Preference.php:666
|
||||
#: airtime_mvc/application/models/Preference.php:655
|
||||
#: airtime_mvc/application/models/Preference.php:662
|
||||
msgid "Select Country"
|
||||
msgstr "Select Country"
|
||||
|
||||
|
|
@ -4254,21 +4261,25 @@ msgstr "Can't move a past show"
|
|||
|
||||
#: 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 "Can't move show into past"
|
||||
|
||||
#: 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 "Can't move a recorded show less than 1 hour before its rebroadcasts."
|
||||
|
||||
#: 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 "Show was deleted because recorded show does not exist!"
|
||||
|
||||
#: 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 "Must wait 1 hour to rebroadcast."
|
||||
|
||||
|
|
|
|||
|
|
@ -1455,6 +1455,12 @@ msgstr "Não pode ter duração maior que 24 horas"
|
|||
#: airtime_mvc/application/forms/AddShowWhen.php:318
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:324
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:329
|
||||
#: airtime_mvc/application/services/CalendarService.php:305
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:287
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:301
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:325
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:331
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:336
|
||||
msgid "Cannot schedule overlapping shows"
|
||||
msgstr "Não é permitido agendar programas sobrepostos"
|
||||
|
||||
|
|
@ -3985,6 +3991,7 @@ msgstr "Retransmissão de %s a partir de %s"
|
|||
|
||||
#: airtime_mvc/application/models/Preference.php:666
|
||||
#: airtime_mvc/application/models/Preference.php:655
|
||||
#: airtime_mvc/application/models/Preference.php:662
|
||||
msgid "Select Country"
|
||||
msgstr "Selecione o País"
|
||||
|
||||
|
|
@ -4258,11 +4265,13 @@ msgstr "Não é possível mover um programa anterior"
|
|||
|
||||
#: 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 "Não é possível mover um programa anterior"
|
||||
|
||||
#: 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 ""
|
||||
"Não é possível mover um programa gravado menos de 1 hora antes de suas "
|
||||
|
|
@ -4270,11 +4279,13 @@ 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 "O programa foi excluído porque a gravação prévia não existe!"
|
||||
|
||||
#: 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 "É necessário aguardar 1 hora antes de retransmitir."
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue