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

Merge branch '2.5.x' into cc-5709-airtime-analyzer

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
This commit is contained in:
drigato 2014-10-08 11:46:08 -04:00
commit c4692cc0d7
33 changed files with 1807 additions and 1149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/Locale.php
View file

@ -15,7 +15,7 @@ class Application_Model_Locale
"hr_HR" => "Hrvatski",
"hu_HU" => "Magyar",
"it_IT" => "Italiano",
//"ja" => "日本語",
"ja_JP" => "日本語",
"ko_KR" => "한국어",
"pl_PL" => "Polski",
"pt_BR" => "Português (Brasil)",