Merge the master branch into Greg's branch #247

Merged
greg6775 merged 19 commits from master into greg-dev 2019-12-24 13:45:37 +01:00

19 commits

Author SHA1 Message Date
Skidder
9b2591317f
Merge pull request #243 from BigBotNetwork/i18n
New Crowdin translations
2019-12-24 13:34:08 +01:00
Skidder
4f08e4f300 New translations Translations_en.properties (German)
New German translation
2019-12-24 13:33:56 +01:00
Skidder
29d16437af
Merge pull request #246 from BigBotNetwork/greg-dev
Merged!
2019-12-24 13:31:21 +01:00
Hax
1b33f84593
Merge branch 'master' into i18n 2019-12-23 19:31:50 +01:00
Skidder
e54918b832 New translations Translations_en.properties (German)
New German translation
2019-12-23 17:21:35 +01:00
Skidder
d02ded46b2 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-23 16:33:06 +01:00
Skidder
44bfa8449b New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-23 16:33:05 +01:00
Skidder
dddc0ffe22 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-23 16:33:03 +01:00
Skidder
fb6c090295 New translations Translations_en.properties (French)
New French translation
2019-12-23 16:33:01 +01:00
Skidder
9275f74558 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-23 16:33:00 +01:00
Skidder
e59f5fcc13 New translations Translations_en.properties (English)
New English translation
2019-12-23 16:32:58 +01:00
Skidder
4b36a903f1 New translations Translations_en.properties (German)
New German translation
2019-12-23 16:32:57 +01:00
Skidder
bfec1f497d
Merge pull request #244 from BigBotNetwork/greg-dev
Merged!
2019-12-23 16:22:52 +01:00
Skidder
7eee000df0 New translations Translations_en.properties (Chinese Simplified)
New Chinese Simplified translation
2019-12-23 14:31:51 +01:00
Skidder
8e075a7b13 New translations Translations_en.properties (Turkish)
New Turkish translation
2019-12-23 14:31:50 +01:00
Skidder
016cadfe24 New translations Translations_en.properties (Russian)
New Russian translation
2019-12-23 14:31:49 +01:00
Skidder
c32ae83467 New translations Translations_en.properties (French)
New French translation
2019-12-23 14:31:47 +01:00
Skidder
8e2b702ed1 New translations Translations_en.properties (Spanish)
New Spanish translation
2019-12-23 14:31:46 +01:00
Skidder
2b72a53fe8 New translations Translations_en.properties (German)
New German translation
2019-12-23 14:31:44 +01:00