Julian Lam 10fc991a7b Merge branch 'master' of github.com:MrHohenheim/NodeBB into MrHohenheim-master ...

Conflicts:
	public/language/hu/global.json
	public/language/hu/topic.json

2014-03-31 22:06:44 -04:00

..

category.json

latest translations

2014-03-31 18:04:29 -04:00

footer.json

okay, ACTUALLY adding those language strings.

2014-02-03 22:33:59 -05:00

global.json

Merge branch 'master' of github.com:MrHohenheim/NodeBB into MrHohenheim-master

2014-03-31 22:06:44 -04:00

language.json

dir settings for languages

2014-02-09 15:48:49 -05:00

login.json

Update login.json

2014-03-31 23:26:27 +02:00

modules.json

Hungarian, Norwegian, and Polish translation strings updated from Tx

2014-02-16 11:40:59 -05:00

notifications.json

Update notifications.json

2014-03-31 23:27:41 +02:00

pages.json

Update pages.json

2014-03-31 23:29:24 +02:00

recent.json

updating translations

2014-02-15 12:28:46 -05:00

register.json

okay, ACTUALLY adding those language strings.

2014-02-03 22:33:59 -05:00

reset_password.json

Update reset_password.json

2014-03-31 23:31:09 +02:00

topic.json

Merge branch 'master' of github.com:MrHohenheim/NodeBB into MrHohenheim-master

2014-03-31 22:06:44 -04:00

unread.json

updating translations

2014-02-15 12:28:46 -05:00

user.json

Update user.json

2014-03-31 23:15:28 +02:00

users.json

okay, ACTUALLY adding those language strings.

2014-02-03 22:33:59 -05:00