6 Commits

Author SHA1 Message Date
Samuel Georges
7fcf7347c4 Translate strings used by "important update" process
Clean up / rename existing strings
2015-07-11 15:29:20 +10:00
Samuel Georges
961509839e Manually merge Pull Requests that are prepared incorrectly
Fixes #1229
Fixes #1259
Fixes #1260
Fixes #1261
Fixes #1262
Fixes #1263
Fixes #1264
Fixes #1277
Thanks @felixinx @awaysoft @tsioukas @Freakspot
2015-07-11 14:36:38 +10:00
Samuel Georges
d283d6b143 Merge remote-tracking branch 'remotes/krisawzm/develop' into develop
Conflicts:
	modules/backend/models/BackendPreferences.php
	modules/system/lang/ru/lang.php
	modules/system/lang/sv/lang.php
2015-04-11 10:48:59 +10:00
krisawzm
5d79be79eb Added Norwegian language support 2015-03-26 23:16:29 +01:00
刘星
5baac47519 修改翻译 2015-03-25 14:30:05 +08:00
刘星
4044911057 Update Chinese language 2015-03-24 12:42:35 +08:00