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

Merge branch '2.3.x' into devel 

Conflicts:
	debian/postinst
This commit is contained in:
Martin Konecny 2013-04-02 12:31:48 -04:00
parent 811abc4baf 142ce9c3d2
commit 563f5b64d2
7 changed files with 3284 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CREDITS
View File

@ -22,6 +22,18 @@ Mikayel Karapetian (michael.karapetian@sourcefabric.org)
Daniel James (daniel.james@sourcefabric.org)
Role: Documentor & QA
Localizations:
Albert (French)
Christoph Rombach, Micz Flor (German)
Claudia Cruz (Spanish)
Katerina Michailidis (Greek)
Hoerich (Austrian)
Luba Sirina (Russian)
Luciano De Fazio (Brazilian Portuguese)
Sebastian Matuszewski (Polish)
Staff Pingu (Italian)
Version 2.2.1
-------------
Martin Konecny (martin.konecny@sourcefabric.org)

5
airtime_mvc/build/sql/defaultdata.sql
View File

@ -325,9 +325,12 @@ INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA');
INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English (Canada)');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_GB', 'English (Britain)');
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 ('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 ('it_IT', 'Italiano');

BIN
airtime_mvc/locale/de_AT/LC_MESSAGES/django.mo Normal file
View File

Binary file not shown.

3261
airtime_mvc/locale/de_AT/LC_MESSAGES/django.po Normal file
View File

File diff suppressed because it is too large Load Diff

2
debian/control vendored
View File

@ -17,6 +17,7 @@ Depends: apache2,
gzip (>= 1.3.12),
libao-ocaml,
libapache2-mod-php5,
libc-bin,
libcamomile-ocaml-data,
libesd0,
libmad-ocaml,
@ -27,6 +28,7 @@ Depends: apache2,
libsoundtouch-ocaml,
libtaglib-ocaml,
liquidsoap (>= 1.0.0~),
locales,
lsof,
monit,
multitail,

2
debian/postinst vendored
View File

@ -229,7 +229,7 @@ case "$1" in
echo "Upgrades from Airtime versions before 2.1.0 are not supported. Please back up your files and perform a clean install."
elif [ "${APACHESETUP}" == "no thanks" ]; then
echo "Please run the ${tmpdir}/install_minimal/airtime-install script after you have set up the web server."
echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have set up the web server."
else

5
install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql
View File

@ -30,9 +30,12 @@ INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA');
INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English (Canada)');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_GB', 'English (Britain)');
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 ('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 ('it_IT', 'Italiano');