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

Merge branch '2.5.x' into saas

Browse source 
Conflicts:
	airtime_mvc/application/models/Show.php
This commit is contained in:
Albert Santoni 2014-11-13 14:22:25 -05:00
commit 21ea2a2933
29 changed files with 23643 additions and 3318 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,19 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Airtime\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-07-25 14:36-0400\n"
"PO-Revision-Date: 2014-01-29 15:10+0000\n"
"Last-Translator: andrey.podshivalov\n"
"Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/"
"language/fr_FR/)\n"
"Language: fr_FR\n"
=======
"POT-Creation-Date: 2013-12-13 12:58-0500\n"
"PO-Revision-Date: 2014-09-11 09:33+0000\n"
"Last-Translator: AlbertFR <albert.bruc.ab@gmail.com>\n"
"Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/language/fr_FR/)\n"
>>>>>>> 2.5.x
"Language: fr_FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"