Commit graph

9 commits

Author SHA1 Message Date
Albert Santoni
2494e66bb0 Merge branch '2.5.x' into saas 2014-11-14 11:56:01 -05:00
localizer
ee0d89913b updated translation resources 2014-11-14 09:59:25 +00:00
Albert Santoni
0a0e7cb8f3 Regenerate the .po files... 2014-11-13 14:31:41 -05:00
Albert Santoni
21ea2a2933 Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
localizer
9e74b26fc4 updated translation resources 2014-11-13 19:07:10 +00:00
Albert Santoni
0681e80afd Regenerated the .po files 2014-11-13 13:56:47 -05:00
Albert Santoni
a4ae1a7842 Translation update, and fixed bad merge in fr_FR 2014-11-11 18:19:49 -05:00
Albert Santoni
3618433792 Add separate pro.po file for Airtime Pro strings 2014-11-10 09:59:37 -05:00
localizer
8851efaecf updated translation resources 2014-08-21 14:12:15 +00:00