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

Translation update, and fixed bad merge in fr_FR

Browse source
This commit is contained in:
Albert Santoni 2014-11-11 18:19:49 -05:00
parent 024923ba6a
commit a4ae1a7842
56 changed files with 17100 additions and 27320 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2224,6 +2224,7 @@ 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"
@ -2503,15 +2504,10 @@ msgstr "Editeur de Point d'E/S"
#: airtime_mvc/application/controllers/LocaleController.php:289
msgid ""
<<<<<<< HEAD
"Waveform features are available in a browser supporting the Web Audio API"
msgstr ""
"Les caractéristiques de la forme d'onde sont disponibles dans un navigateur "
"supportant l'API Web Audio"
=======
"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"
>>>>>>> 2.5.x
#: airtime_mvc/application/controllers/LocaleController.php:292
msgid "Select all"

7
airtime_mvc/locale/fr_FR/LC_MESSAGES/pro.po
View file

@ -0,0 +1,7 @@
#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
msgstr ""
#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
msgstr ""