Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
This commit is contained in:
Albert Santoni
commit
79af606418
Binary file not shown.
|
|
@ -8,7 +8,7 @@ msgstr ""
|
|||
"Project-Id-Version: Airtime 2.5\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-10-08 11:46-0400\n"
|
||||
"PO-Revision-Date: 2013-10-10 17:18+0100\n"
|
||||
"PO-Revision-Date: 2013-10-24 11:00+0100\n"
|
||||
"Last-Translator: Daniel James <daniel.james@sourcefabric.org>\n"
|
||||
"Language-Team: Sourcefabric <contact@sourcefabric.org>\n"
|
||||
"Language: cs_CZ\n"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -8,10 +8,9 @@ msgstr ""
|
|||
"Project-Id-Version: Airtime 2.5\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2013-10-08 11:46-0400\n"
|
||||
"PO-Revision-Date: 2013-10-11 15:34+0100\n"
|
||||
"PO-Revision-Date: 2013-11-20 10:54+0100\n"
|
||||
"Last-Translator: Daniel James <daniel.james@sourcefabric.org>\n"
|
||||
"Language-Team: Hungarian Localization <contact@sourcefabric.org>\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
|
@ -137,7 +136,7 @@ msgstr "Fejezési Idő"
|
|||
|
||||
#: airtime_mvc/application/services/HistoryService.php:1150
|
||||
msgid "Played"
|
||||
msgstr "Lejátszott"
|
||||
msgstr "Lejátszva"
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:50
|
||||
msgid "Record file doesn't exist"
|
||||
|
|
@ -160,7 +159,7 @@ msgstr "Feltöltés a SoundCloud-ra"
|
|||
#: airtime_mvc/application/services/CalendarService.php:70
|
||||
#: airtime_mvc/application/controllers/LibraryController.php:286
|
||||
msgid "Re-upload to SoundCloud"
|
||||
msgstr "Újra-feltöltés a SoundCloud -ra"
|
||||
msgstr "Újra-feltöltés a SoundCloud-ra"
|
||||
|
||||
#: airtime_mvc/application/services/CalendarService.php:77
|
||||
#: airtime_mvc/application/services/CalendarService.php:105
|
||||
|
|
@ -883,7 +882,7 @@ msgstr "Az állomásom közzététele a Sourcefabric.org-on"
|
|||
#: airtime_mvc/application/forms/SupportSettings.php:148
|
||||
#, php-format
|
||||
msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
|
||||
msgstr "A mező bejelölésével, elfogadom a Sourcefabric %sadatvédelmi irányelveket%s."
|
||||
msgstr "A mező bejelölésével, elfogadom a Sourcefabric %sadatvédelmi irányelveit%s."
|
||||
|
||||
#: airtime_mvc/application/forms/RegisterAirtime.php:166
|
||||
#: airtime_mvc/application/forms/SupportSettings.php:171
|
||||
|
|
@ -2129,7 +2128,7 @@ msgstr "Hibakód:"
|
|||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:104
|
||||
msgid "Error msg: "
|
||||
msgstr "MSG hiba:"
|
||||
msgstr "Hibaüzenet:"
|
||||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:105
|
||||
msgid "Input must be a positive number"
|
||||
|
|
@ -2182,7 +2181,7 @@ msgstr "Lejátszási lista mentve"
|
|||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:120
|
||||
msgid "Playlist shuffled"
|
||||
msgstr "Kevert lejátszási lista"
|
||||
msgstr "Lejátszási lista megkeverve"
|
||||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:122
|
||||
msgid "Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore."
|
||||
|
|
@ -2291,11 +2290,11 @@ msgstr "Ha az Airtime mögött van egy router vagy egy tűzfal, akkor be kell á
|
|||
#: airtime_mvc/application/controllers/LocaleController.php:167
|
||||
#, php-format
|
||||
msgid "For more details, please read the %sAirtime Manual%s"
|
||||
msgstr "A további részletekért, kérjük olvassa el az %sAirtime Kézikönyvét%s"
|
||||
msgstr "A további részletekért, kérjük, olvassa el az %sAirtime Kézikönyvét%s"
|
||||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:169
|
||||
msgid "Check this option to enable metadata for OGG streams (stream metadata is the track title, artist, and show name that is displayed in an audio player). VLC and mplayer have a serious bug when playing an OGG/VORBIS stream that has metadata information enabled: they will disconnect from the stream after every song. If you are using an OGG stream and your listeners do not require support for these audio players, then feel free to enable this option."
|
||||
msgstr "Jelölje be ezt az opciót: metaadatok engedélyezése OGG-os adásfolyamra (adatfolyam metaadatok: a műsorszám címe, előadó, műsornév, amely megjelenik egy audió lejátszóban). A VLC és mplayer lejátszóknál súlyos hibák előfordulhatnak, OGG/Vorbis adatfolyam játszásakor, amelynél a metaadatok küldése engedélyezett: ilyenkor akadozik az adatfolyam. Ha az OGG-os adatfolyam és a hallgatói nem igényelnek támogatást az ilyen jellegű audió lejátszókhoz, akkor nyugodtan engedélyezze ezt az opciót."
|
||||
msgstr "Jelölje be és ellenőrizze ezt az opciót: metaadatok engedélyezése OGG-os adásfolyamra (adatfolyam metaadatok: a műsorszám címe, előadó, műsornév, amely megjelenik egy audió lejátszóban). A VLC és mplayer lejátszóknál súlyos hibák előfordulhatnak, OGG/Vorbis adatfolyam játszásakor, amelynél a metaadatok küldése engedélyezett: ilyenkor akadozik az adatfolyam. Ha az OGG-os adatfolyam és a hallgatói nem igényelnek támogatást az ilyen jellegű audió lejátszókhoz, akkor nyugodtan engedélyezze ezt az opciót."
|
||||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:170
|
||||
msgid "Check this box to automatically switch off Master/Show source upon source disconnection."
|
||||
|
|
@ -2344,7 +2343,7 @@ msgstr "Figyelem: a Műsorokat nem lehet újra-linkelni"
|
|||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:186
|
||||
msgid "By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows"
|
||||
msgstr "By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows - fordításra vár"
|
||||
msgstr "Az ismétlődő műsorok összekötésével, minden ütemezett médiai elem, az összes ismétlődő műsorban, ugyanazt a sorrendet kapja, mint a többi ismétlődő műsorban"
|
||||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:187
|
||||
msgid "Timezone is set to the station timezone by default. Shows in the calendar will be displayed in your local time defined by the Interface Timezone in your user settings."
|
||||
|
|
@ -2880,7 +2879,7 @@ msgstr "Belépés Létrehozása"
|
|||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:389
|
||||
msgid "Edit History Record"
|
||||
msgstr "Rögzítési Előzmények Szerkesztése"
|
||||
msgstr "Előzmények Szerkesztése"
|
||||
|
||||
#: airtime_mvc/application/controllers/LocaleController.php:392
|
||||
#, php-format
|
||||
|
|
@ -2911,7 +2910,7 @@ msgstr "a műsor nem található"
|
|||
|
||||
#: airtime_mvc/application/controllers/ListenerstatController.php:56
|
||||
msgid "Please make sure admin user/password is correct on System->Streams page."
|
||||
msgstr "Kérjük, győződjön meg arról, hogy az admin felhasználónév/jelszó helyes-e a Rendszer-> Streams oldalon."
|
||||
msgstr "Kérjük, győződjön meg arról, hogy az admin felhasználónév/jelszó helyes-e a Rendszer-> Adásfolyamok oldalon."
|
||||
|
||||
#: airtime_mvc/application/controllers/ApiController.php:60
|
||||
#: airtime_mvc/application/controllers/ApiController.php:79
|
||||
|
|
@ -3056,7 +3055,7 @@ msgstr "Következő:"
|
|||
|
||||
#: airtime_mvc/application/views/scripts/partialviews/header.phtml:24
|
||||
msgid "Source Streams"
|
||||
msgstr "Adásfolyam Források"
|
||||
msgstr "Az Adásfolyam Forrásai"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/partialviews/header.phtml:29
|
||||
msgid "Master Source"
|
||||
|
|
@ -3360,7 +3359,7 @@ msgstr "Vissza a belépéshez"
|
|||
|
||||
#: airtime_mvc/application/views/scripts/login/index.phtml:7
|
||||
msgid "Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'."
|
||||
msgstr "Üdvözöljük az online Aitime demó változatában! Jelentkezzen be 'admin' felhasználónévvel és 'admin' jelszóval."
|
||||
msgstr "Üdvözöljük az online Airtime demó változatában! Jelentkezzen be 'admin' felhasználónévvel és 'admin' jelszóval."
|
||||
|
||||
#: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
|
||||
#: airtime_mvc/application/views/scripts/form/login.phtml:34
|
||||
|
|
@ -3583,7 +3582,7 @@ msgstr "Műsorok Keresése"
|
|||
|
||||
#: airtime_mvc/application/views/scripts/form/showbuilder.phtml:12
|
||||
msgid "Filter By Show:"
|
||||
msgstr "Szűrés Műsor Alapján:"
|
||||
msgstr "Műsor Alapján:"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:2
|
||||
msgid "Input Stream Settings"
|
||||
|
|
@ -3610,7 +3609,7 @@ msgstr "NULLÁZÁS"
|
|||
|
||||
#: airtime_mvc/application/views/scripts/form/preferences_livestream.phtml:153
|
||||
msgid "Show Source Connection URL:"
|
||||
msgstr "Műsor Kapcsolat Forrása URL:"
|
||||
msgstr "Műsor Kapcsolati Forrás URL:"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/edit-user.phtml:1
|
||||
#, php-format
|
||||
|
|
@ -3641,11 +3640,11 @@ msgstr "Segítse az Airtime fejlesztését azáltal, hogy a Sourcefabric tudja,
|
|||
#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
|
||||
#, php-format
|
||||
msgid "Click the box below to promote your station on %sSourcefabric.org%s."
|
||||
msgstr "Kattintson az alábbi mezőbe, hogy hírdesse saját állomását %sSourcefabric.org%s."
|
||||
msgstr "Kattintson az alábbi mezőbe, hogy hírdesse a saját állomását %sSourcefabric.org%s."
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
|
||||
msgid "(In order to promote your station, 'Send support feedback' must be enabled)."
|
||||
msgstr "(Annak érdekében, hogy hírdetni tudja állomását, a 'Támogatási Visszajelzés Küldését' engedélyeznie kell.)"
|
||||
msgstr "(Annak érdekében, hogy hírdetni tudja az állomását, a 'Támogatási Visszajelzés Küldését' engedélyeznie kell.)"
|
||||
|
||||
#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
|
||||
msgid "Sourcefabric Privacy Policy"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,32 @@
|
|||
airtime (2.5.1-1) unstable; urgency=low
|
||||
|
||||
* Nightly development snapshot of Airtime 2.5.x series
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Thu, 24 Oct 2013 11:04:56 +0100
|
||||
|
||||
airtime (2.5.0-1) unstable; urgency=low
|
||||
|
||||
* Upstream 2.5.0-ga release
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Wed, 23 Oct 2013 14:56:21 +0100
|
||||
|
||||
airtime (2.4.1-1) unstable; urgency=low
|
||||
|
||||
* Upstream 2.4.1-ga release
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Wed, 28 Aug 2013 11:53:10 +0100
|
||||
|
||||
airtime (2.4.0-1) unstable; urgency=low
|
||||
|
||||
* Nightly development snapshot of Airtime 2.4.x series
|
||||
* Upstream 2.4.0-ga release
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Tue, 19 Mar 2013 16:39:23 +0000
|
||||
-- Daniel James <daniel@64studio.com> Tue, 25 Jun 2013 14:26:55 +0100
|
||||
|
||||
airtime (2.3.1-1) unstable; urgency=low
|
||||
|
||||
* Upstream 2.3.1 release
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Wed, 20 Mar 2013 09:43:15 +0000
|
||||
|
||||
airtime (2.3.0-2) unstable; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ Section: web
|
|||
Priority: optional
|
||||
Maintainer: Daniel James <daniel@64studio.com>
|
||||
Build-Depends: debhelper (>= 7.0.50~), po-debconf
|
||||
Standards-Version: 3.8.4
|
||||
Homepage: http://www.sourcefabric.org/en/products/airtime_overview/
|
||||
Standards-Version: 3.9.3
|
||||
Homepage: http://www.sourcefabric.org/en/airtime/
|
||||
|
||||
Package: airtime
|
||||
Architecture: all
|
||||
|
|
@ -15,48 +15,40 @@ Depends: apache2,
|
|||
ecasound,
|
||||
flac,
|
||||
gzip (>= 1.3.12),
|
||||
libao-ocaml,
|
||||
libapache2-mod-php5,
|
||||
libc-bin,
|
||||
libcamomile-ocaml-data,
|
||||
libesd0,
|
||||
libmad-ocaml,
|
||||
libmp3lame0,
|
||||
libportaudio2,
|
||||
libpulse0,
|
||||
libsamplerate0,
|
||||
libsoundtouch-ocaml,
|
||||
libtaglib-ocaml,
|
||||
liquidsoap (>= 1.0.0~),
|
||||
liquidsoap (>= 1.1.1~),
|
||||
locales,
|
||||
lsof,
|
||||
monit,
|
||||
mp3gain,
|
||||
multitail,
|
||||
odbc-postgresql,
|
||||
patch,
|
||||
php-db,
|
||||
php5-cli,
|
||||
php5-curl,
|
||||
php-db,
|
||||
php5-gd,
|
||||
php-pear,
|
||||
php5-pgsql,
|
||||
pwgen,
|
||||
python,
|
||||
rabbitmq-server,
|
||||
silan (>= 0.3.1~),
|
||||
silan (>= 0.3.1~),
|
||||
sudo,
|
||||
sysv-rc,
|
||||
tar (>= 1.22),
|
||||
unzip,
|
||||
vorbisgain,
|
||||
vorbis-tools,
|
||||
zendframework | libzend-framework-php,
|
||||
${misc:Depends}
|
||||
Recommends: icecast2, php-apc
|
||||
Suggests: airtime-audio-samples,
|
||||
alsa-utils
|
||||
Description: open radio software for scheduling and remote station management.
|
||||
Description: open broadcast software for scheduling and station management.
|
||||
Airtime is an open source application that provides remote automation
|
||||
of a radio station.
|
||||
of a broadcast station.
|
||||
.
|
||||
Major features:
|
||||
.
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ includefile="${configdir}/apache.conf"
|
|||
a2tplfile="${configdir}/apache.vhost.tpl"
|
||||
phpinifile="${configdir}/airtime.ini"
|
||||
OLDVERSION="$2"
|
||||
NEWVERSION="2.4.0"
|
||||
NEWVERSION="2.5.1"
|
||||
|
||||
case "$1" in
|
||||
configure|reconfigure)
|
||||
|
|
@ -46,6 +46,8 @@ case "$1" in
|
|||
# temporarily disable an existing virtual host
|
||||
if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then
|
||||
a2dissite airtime-vhost
|
||||
elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then
|
||||
a2dissite airtime-vhost.conf
|
||||
fi
|
||||
|
||||
db_get airtime/apache-servername
|
||||
|
|
@ -57,12 +59,12 @@ case "$1" in
|
|||
install -d -m755 /etc/$webserver/sites-available/
|
||||
fi
|
||||
sed -e "s/__SERVER_ADMIN__/${SA}/;s/__SERVER_NAME__/${SN}/" \
|
||||
${a2tplfile} > /etc/$webserver/sites-available/airtime-vhost
|
||||
${a2tplfile} > /etc/$webserver/sites-available/airtime-vhost.conf
|
||||
|
||||
command -v a2ensite > /dev/null
|
||||
RETVAL=$?
|
||||
if [ $RETVAL -eq 0 ]; then
|
||||
a2ensite airtime-vhost
|
||||
a2ensite airtime-vhost.conf
|
||||
fi
|
||||
|
||||
# insert a specific hostname, if provided, into API configuration
|
||||
|
|
@ -92,7 +94,9 @@ case "$1" in
|
|||
db_get airtime/apache-deldefault
|
||||
if [ "$RET" == "remove default" ]; then
|
||||
if [ -f /etc/apache2/sites-available/default ]; then
|
||||
a2dissite default
|
||||
a2dissite default
|
||||
elif [ -f /etc/apache2/sites-available/000-default.conf ]; then
|
||||
a2dissite 000-default.conf
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -154,6 +158,7 @@ case "$1" in
|
|||
if [ -f /etc/default/monit ]; then
|
||||
echo "Setting up monit configuration..."
|
||||
sed -i 's:startup=.*:startup=1:g' /etc/default/monit
|
||||
sed -i 's:START=.*:START=yes:g' /etc/default/monit
|
||||
|
||||
MONITCONFIGURED=$(grep "include /etc/monit/conf.d" /etc/monit/monitrc || true)
|
||||
if [ -z "$MONITCONFIGURED" ]; then
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ case "$1" in
|
|||
|
||||
if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then
|
||||
a2dissite airtime-vhost &>/dev/null || true
|
||||
elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then
|
||||
a2dissite airtime-vhost.conf &>/dev/null || true
|
||||
# TODO: if airtime-vhost is not modified -> delete it
|
||||
restart="$webserver $restart"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Script for generating nightly Airtime snapshot packages
|
||||
# Run from the directory containg the files checked out from git
|
||||
|
||||
VERSION=2.4.0~$(date "+%Y%m%d")
|
||||
VERSION=2.5.1~$(date "+%Y%m%d")
|
||||
BUILDDEST=/tmp/airtime-${VERSION}/
|
||||
DEBDIR=`pwd`/debian
|
||||
|
||||
|
|
@ -23,9 +23,9 @@ cd ${BUILDDEST} || exit
|
|||
|
||||
# Set the version of the snapshot package
|
||||
|
||||
sed -i "1s:(2.4.0-1):(${VERSION}):g" debian/changelog
|
||||
sed -i "1s:(2.5.1-1):(${VERSION}):g" debian/changelog
|
||||
|
||||
# FIXES for 2.3.0 #############
|
||||
# FIXES for 2.5.1 #############
|
||||
|
||||
# these are all moved to debian/copyright
|
||||
rm airtime/python_apps/pypo/LICENSE
|
||||
|
|
@ -46,6 +46,12 @@ rm -r airtime/airtime_mvc/library/ZFDebug/
|
|||
#Strip un-needed install scripts
|
||||
rm -r airtime/install_full/
|
||||
|
||||
#Remove dev tools and files
|
||||
rm -r airtime/dev_tools/
|
||||
rm -r airtime/docs/
|
||||
rm airtime/.gitignore
|
||||
rm airtime/.zfproject.xml
|
||||
|
||||
#############################
|
||||
|
||||
echo "running the build..."
|
||||
|
|
|
|||
Loading…
Reference in New Issue