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

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

Browse source 
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
This commit is contained in:
Albert Santoni 2014-04-25 00:43:22 -04:00
commit 446eca057c
20 changed files with 257 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
install_minimal/upgrades/airtime-2.5.2/data/upgrade.sql Normal file
View file

@ -0,0 +1,8 @@
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';
-- NOTE BECAUSE OF CACHING NOW ANY UPGRADES TO cc_pref MUST NOT BE DONE HERE.