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

BIN
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
View file

Binary file not shown.

2
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
View file

@ -3096,6 +3096,8 @@ msgstr ""
msgid ""
"Warning: You cannot change this field while the show is currently playing"
msgstr ""
"Attention: Vous ne pouvez pas modifier ce champ alors que l'émission est en "
"cours de lecture"
#: airtime_mvc/application/controllers/LocaleController.php:181
msgid "No result found"