Merge branch '2.5.x' into 2.6.x
This commit is contained in:
Naomi
commit
016d704045
|
|
@ -330,16 +330,19 @@ INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_GB', 'English (Brit
|
|||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_US', 'English (USA)');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('cs_CZ', 'Český');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_DE', 'Deutsch');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_AT', 'Österreichisches Deutsch');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hu_HU', 'Magyar');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_AT', 'Deutsch (Österreich)');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('el_GR', 'Ελληνικά');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('es_ES', 'Español');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('fr_FR', 'Français');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hr_HR', 'Hrvatski');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hu_HU', 'Magyar');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('it_IT', 'Italiano');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ko_KR', '한국어');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pl_PL', 'Polski');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pt_BR', 'Português Brasileiro');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('pt_BR', 'Português (Brasil)');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ru_RU', 'Русский');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('sr_RS', 'Српски (Ћирилица)');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('sr_RS@latin', 'Srpski (Latinica)');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('el_GR', 'Ελληνικά');
|
||||
|
||||
-- end of added in 2.3
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -4,13 +4,14 @@
|
|||
#
|
||||
# Translators:
|
||||
# Sourcefabric <contact@sourcefabric.org>, 2012
|
||||
# vmcarranza <victor.carranza@sourcefabric.org>, 2014
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Airtime\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-12-13 12:58-0500\n"
|
||||
"PO-Revision-Date: 2014-01-29 15:11+0000\n"
|
||||
"Last-Translator: andrey.podshivalov\n"
|
||||
"PO-Revision-Date: 2014-03-12 16:10+0000\n"
|
||||
"Last-Translator: vmcarranza <victor.carranza@sourcefabric.org>\n"
|
||||
"Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/airtime/language/es_ES/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -120,7 +121,7 @@ msgstr "Álbum"
|
|||
#: airtime_mvc/application/controllers/LocaleController.php:81
|
||||
#: airtime_mvc/application/forms/SmartBlockCriteria.php:65
|
||||
msgid "Length"
|
||||
msgstr "Duración:"
|
||||
msgstr "Duración"
|
||||
|
||||
#: airtime_mvc/application/services/HistoryService.php:1109
|
||||
#: airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml:10
|
||||
|
|
@ -136,7 +137,7 @@ msgstr "Género"
|
|||
#: airtime_mvc/application/controllers/LocaleController.php:83
|
||||
#: airtime_mvc/application/forms/SmartBlockCriteria.php:67
|
||||
msgid "Mood"
|
||||
msgstr "Estado de ánimo/estilo (mood)"
|
||||
msgstr "Estilo (mood)"
|
||||
|
||||
#: airtime_mvc/application/services/HistoryService.php:1111
|
||||
#: airtime_mvc/application/models/Block.php:1353
|
||||
|
|
@ -184,7 +185,7 @@ msgstr ""
|
|||
#: airtime_mvc/application/controllers/LocaleController.php:72
|
||||
#: airtime_mvc/application/forms/SmartBlockCriteria.php:53
|
||||
msgid "Conductor"
|
||||
msgstr "Conductor"
|
||||
msgstr "Director"
|
||||
|
||||
#: airtime_mvc/application/services/HistoryService.php:1118
|
||||
#: airtime_mvc/application/models/Block.php:1354
|
||||
|
|
@ -228,7 +229,7 @@ msgstr "Cargar a SoundCloud"
|
|||
#: airtime_mvc/application/services/CalendarService.php:70
|
||||
#: airtime_mvc/application/controllers/LibraryController.php:286
|
||||
msgid "Re-upload to SoundCloud"
|
||||
msgstr "Recargar a SoundCloud"
|
||||
msgstr "Volver a cargar a SoundCloud"
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:77
|
||||
#: airtime_mvc/application/services/CalendarService.php:121
|
||||
|
|
@ -298,11 +299,11 @@ msgstr "No es posible arrastrar y soltar shows que se repiten"
|
|||
|
||||
#: airtime_mvc/application/services/CalendarService.php:263
|
||||
msgid "Can't move a past show"
|
||||
msgstr "No puedes mover un show pasado"
|
||||
msgstr "No se puede mover un show pasado"
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:281
|
||||
msgid "Can't move show into past"
|
||||
msgstr "No puedes mover un show al pasado"
|
||||
msgstr "No se puede mover un show al pasado"
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:288
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:280
|
||||
|
|
@ -311,19 +312,19 @@ msgstr "No puedes mover un show al pasado"
|
|||
#: airtime_mvc/application/forms/AddShowWhen.php:324
|
||||
#: airtime_mvc/application/forms/AddShowWhen.php:329
|
||||
msgid "Cannot schedule overlapping shows"
|
||||
msgstr "No puedes programar shows traslapados"
|
||||
msgstr "No se pueden programar shows traslapados"
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:301
|
||||
msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
|
||||
msgstr "No puedes mover shows grabados menos de 1 hora antes de su retransmisión."
|
||||
msgstr "No se pueden mover shows grabados a menos de 1 hora antes de su retransmisión."
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:311
|
||||
msgid "Show was deleted because recorded show does not exist!"
|
||||
msgstr "El show se eliminó porque el show grabado no existe."
|
||||
msgstr "El show se eliminó porque el show grabado no existe!"
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:318
|
||||
msgid "Must wait 1 hour to rebroadcast."
|
||||
msgstr "Debes esperar 1 hora para retransmitir"
|
||||
msgstr "Debe esperar 1 hora para retransmitir."
|
||||
|
||||
#: airtime_mvc/application/views/scripts/preference/index.phtml:2
|
||||
#: airtime_mvc/application/configs/navigation.php:45
|
||||
|
|
@ -354,7 +355,7 @@ msgstr "Administrar las Carpetas de Medios"
|
|||
|
||||
#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:2
|
||||
msgid "Stream Settings"
|
||||
msgstr "Configuración del stream"
|
||||
msgstr "Configuración de stream"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
|
||||
msgid "Global Settings"
|
||||
|
|
@ -371,11 +372,11 @@ msgstr "Configuración de los streams de salida"
|
|||
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:9
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:27
|
||||
msgid "Choose folder"
|
||||
msgstr "Elige carpeta"
|
||||
msgstr "Elija la carpeta"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:10
|
||||
msgid "Set"
|
||||
msgstr "Crear"
|
||||
msgstr "Fijar"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:19
|
||||
msgid "Current Import Folder:"
|
||||
|
|
@ -386,13 +387,13 @@ msgstr "Carpeta actual de importación:"
|
|||
#: airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml:41
|
||||
#: airtime_mvc/application/views/scripts/playouthistorytemplate/template-contents.phtml:75
|
||||
msgid "Add"
|
||||
msgstr "Añadir:"
|
||||
msgstr "Añadir"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
|
||||
msgid ""
|
||||
"Rescan watched directory (This is useful if it is network mount and may be "
|
||||
"out of sync with Airtime)"
|
||||
msgstr "Re escanear el directorio monitoreado (esto es útil si está instalado en una red o si no está sincronizado con Airtime)"
|
||||
msgstr "Re-escanear el directorio monitoreado (esto es útil si es un directorio montado sobre una red y pudiera no estar en sincronía con Airtime)"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44
|
||||
msgid "Remove watched directory"
|
||||
|
|
@ -400,11 +401,11 @@ msgstr "Remover el directorio monitoreado"
|
|||
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
|
||||
msgid "You are not watching any media folders."
|
||||
msgstr "No estás monitoreando ninguna carpeta de medios."
|
||||
msgstr "No está monitoreando ninguna carpeta de medios."
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:1
|
||||
msgid "Register Airtime"
|
||||
msgstr "Registra Airtime"
|
||||
msgstr "Registrar Airtime"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
|
||||
#, php-format
|
||||
|
|
@ -413,7 +414,7 @@ msgid ""
|
|||
" be collected regularly in order to enhance your user experience.%sClick "
|
||||
"'Yes, help Airtime' and we'll make sure the features you use are constantly "
|
||||
"improving."
|
||||
msgstr "Ayuda a Airtime dándonos a conocer cómo lo estas usado. Esta información se recopila con regularidad para mejorar la experiencia de los usuarios.%s Da clic a 'Sí, ayudar a Airtime' y nos aseguraremos de que las funciones que más utilizas se mantengan bajo constante mejora."
|
||||
msgstr "Ayúdenos a mejorar Airtime dándonos a conocer cómo lo está usando. Esta información se recopila con regularidad para mejorar la experiencia de los usuarios.%s Haga clic en 'Sí, ayudar a Airtime' y nos aseguraremos de que las funciones que más utiliza se mantengan bajo constante mejora."
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
|
||||
#, php-format
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
|
@ -3,14 +3,16 @@
|
|||
# This file is distributed under the same license as the Airtime package.
|
||||
#
|
||||
# Translators:
|
||||
# picizse <picizse@gmail.com>, 2014
|
||||
# picizse <picizse@gmail.com>, 2014
|
||||
# Sourcefabric <contact@sourcefabric.org>, 2012
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Airtime\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-12-13 12:58-0500\n"
|
||||
"PO-Revision-Date: 2014-01-29 15:11+0000\n"
|
||||
"Last-Translator: andrey.podshivalov\n"
|
||||
"PO-Revision-Date: 2014-04-11 13:09+0000\n"
|
||||
"Last-Translator: picizse <picizse@gmail.com>\n"
|
||||
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/airtime/language/hu_HU/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
|
|
@ -2209,7 +2211,7 @@ msgstr "Ez az admin felhasználónév és jelszó az Icecast/SHOUTcast hallgató
|
|||
#: airtime_mvc/application/controllers/LocaleController.php:180
|
||||
msgid ""
|
||||
"Warning: You cannot change this field while the show is currently playing"
|
||||
msgstr ""
|
||||
msgstr "Figyelmeztetés: Nem lehet megváltoztatni a mező tartalmát, míg a jelenlegi műsor tart"
|
||||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:181
|
||||
msgid "No result found"
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,19 @@
|
|||
//Croatian
|
||||
|
||||
{
|
||||
"sProcessing": "Procesiram...",
|
||||
"sLengthMenu": "Prikaži _MENU_ rezultata po stranici",
|
||||
"sZeroRecords": "Ništa nije pronađeno",
|
||||
"sInfo": "Prikazano _START_ do _END_ od _TOTAL_ rezultata",
|
||||
"sInfoEmpty": "Prikazano 0 do 0 od 0 rezultata",
|
||||
"sInfoFiltered": "(filtrirano iz _MAX_ ukupnih rezultata)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "Filter",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Prva",
|
||||
"sPrevious": "Nazad",
|
||||
"sNext": "Naprijed",
|
||||
"sLast": "Zadnja"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
//Serbian Cyrillic
|
||||
|
||||
{
|
||||
"sProcessing": "Обрада...",
|
||||
"sLengthMenu": "_MENU_ Резултати по страници",
|
||||
"sZeroRecords": "Ништа није пронађено",
|
||||
"sInfo": "Резултати: _START_ - _END_ Укупно: _TOTAL_",
|
||||
"sInfoEmpty": "Нула Резултат",
|
||||
"sInfoFiltered": "(филтрирано из _MAX_ укупних резултата)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "Филтер",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Прва",
|
||||
"sPrevious": "Назад",
|
||||
"sNext": "Напред",
|
||||
"sLast": "Задња"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
//Serbian Latin
|
||||
|
||||
{
|
||||
"sProcessing": "Obrada...",
|
||||
"sLengthMenu": "_MENU_ Rezultati po stranici",
|
||||
"sZeroRecords": "Ništa nije pronađeno",
|
||||
"sInfo": "Rezultati: _START_ - _END_ Ukupno: _TOTAL_",
|
||||
"sInfoEmpty": "Nula Rezultat",
|
||||
"sInfoFiltered": "(filtrirano iz _MAX_ ukupnih rezultata)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "Filter",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Prva",
|
||||
"sPrevious": "Nazad",
|
||||
"sNext": "Napred",
|
||||
"sLast": "Zadnja"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
// Croatian
|
||||
plupload.addI18n({
|
||||
'Select files': 'Izaberite datoteke:',
|
||||
'Add files to the upload queue and click the start button.': 'Dodajte datoteke u listu i kliknite Upload.',
|
||||
'Filename': 'Ime datoteke',
|
||||
'Status': 'Status',
|
||||
'Size': 'Veličina',
|
||||
'Add files': 'Dodajte datoteke',
|
||||
'Stop current upload': 'Zaustavi trenutan upload',
|
||||
'Start uploading queue': 'Pokreni Upload',
|
||||
'Uploaded %d/%d files': 'Uploadano %d/%d datoteka',
|
||||
'N/A': 'N/A',
|
||||
'Drag files here.': 'Dovucite datoteke ovdje',
|
||||
'File extension error.': 'Greška ekstenzije datoteke.',
|
||||
'File size error.': 'Greška veličine datoteke.',
|
||||
'Init error.': 'Greška inicijalizacije.',
|
||||
'HTTP Error.': 'HTTP greška.',
|
||||
'Security error.': 'Sigurnosna greška.',
|
||||
'Generic error.': 'Generička greška.',
|
||||
'IO error.': 'I/O greška.',
|
||||
'Stop Upload': 'Zaustavi upload.',
|
||||
'Add Files': 'Dodaj datoteke',
|
||||
'Start Upload': 'Pokreni upload.',
|
||||
'%d files queued': '%d datoteka na čekanju.'
|
||||
});
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
// Serbian Cyrillic
|
||||
plupload.addI18n({
|
||||
'Select files' : 'Изаберите фајлове',
|
||||
'Add files to the upload queue and click the start button.' : 'Додајте фајлове у листу и кликните на дугме Старт.',
|
||||
'Filename' : 'Назив фајла',
|
||||
'Status' : 'Status',
|
||||
'Size' : 'Величина',
|
||||
'Add Files' : 'Додај фајлове',
|
||||
'Stop current upload' : 'Заустави upload',
|
||||
'Start uploading queue' : 'Почни upload',
|
||||
'Drag files here.' : 'Превуци фајлове овде.',
|
||||
'Start Upload': 'Почни upload',
|
||||
'Uploaded %d/%d files': 'Снимљено %d/%d фајлова'
|
||||
});
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
// Serbian Latin
|
||||
plupload.addI18n({
|
||||
'Select files' : 'Izaberite fajlove',
|
||||
'Add files to the upload queue and click the start button.' : 'Dodajte fajlove u listu i kliknite na dugme Start.',
|
||||
'Filename' : 'Naziv fajla',
|
||||
'Status' : 'Status',
|
||||
'Size' : 'Veličina',
|
||||
'Add Files' : 'Dodaj fajlove',
|
||||
'Stop current upload' : 'Zaustavi upload',
|
||||
'Start uploading queue' : 'Počni upload',
|
||||
'Drag files here.' : 'Prevucite fajlove ovde.',
|
||||
'Start Upload': 'Počni upload',
|
||||
'Uploaded %d/%d files': 'Snimljeno %d/%d fajlova'
|
||||
});
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('hr_HR', 'Hrvatski');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('sr_RS', 'Српски (Ћирилица)');
|
||||
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('sr_RS@latin', 'Srpski (Latinica)');
|
||||
|
||||
UPDATE cc_locale SET locale_lang='Deutsch (Österreich)' WHERE locale_code='de_AT';
|
||||
UPDATE cc_locale SET locale_lang='Português Brasileiro' WHERE locale_code='pt_BR';
|
||||
|
|
@ -56,6 +56,8 @@ def get_file_type(file_path):
|
|||
file_type = 'mp3'
|
||||
elif re.search(r'og(g|a)$', file_path, re.IGNORECASE):
|
||||
file_type = 'vorbis'
|
||||
elif re.search(r'm4a$', file_path, re.IGNORECASE):
|
||||
file_type = 'mp4'
|
||||
elif re.search(r'flac$', file_path, re.IGNORECASE):
|
||||
file_type = 'flac'
|
||||
else:
|
||||
|
|
@ -64,6 +66,8 @@ def get_file_type(file_path):
|
|||
file_type = 'mp3'
|
||||
elif 'ogg' in mime_type:
|
||||
file_type = 'vorbis'
|
||||
elif 'mp4' in mime_type:
|
||||
file_type = 'mp4'
|
||||
elif 'flac' in mime_type:
|
||||
file_type = 'flac'
|
||||
|
||||
|
|
@ -111,6 +115,14 @@ def calculate_replay_gain(file_path):
|
|||
search = re.search(r'REPLAYGAIN_TRACK_GAIN=(.*) dB', out)
|
||||
else:
|
||||
logger.warn("vorbisgain/ogginfo not found")
|
||||
elif file_type == 'mp4':
|
||||
if run_process(['which', 'aacgain']) == 0:
|
||||
command = ['nice', '-n', nice_level, 'aacgain', '-q', temp_file_path]
|
||||
out = get_process_output(command)
|
||||
search = re.search(r'Recommended "Track" dB change: (.*)', \
|
||||
out)
|
||||
else:
|
||||
logger.warn("aacgain not found")
|
||||
elif file_type == 'flac':
|
||||
if run_process(['which', 'metaflac']) == 0:
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue