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

Conflicts:
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
This commit is contained in:
drigato 2014-05-06 14:50:13 -04:00
commit bc080a26f7
5 changed files with 127 additions and 9 deletions

View file

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Airtime\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-04-23 15:57-0400\n"
"PO-Revision-Date: 2014-02-04 11:29+0000\n"
"POT-Creation-Date: 2013-12-13 12:58-0500\n"
"PO-Revision-Date: 2014-04-24 15:34+0000\n"
"Last-Translator: terwey <terwey@gmail.com>\n"
"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/airtime/language/nl_NL/)\n"
"Language: nl_NL\n"