Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x

This commit is contained in:
Martin Konecny 2013-04-02 12:30:37 -04:00
commit 142ce9c3d2
6 changed files with 3283 additions and 2 deletions

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)

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');

Binary file not shown.

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,

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');