Merge branch 'release/3.11.1'

.tx/config

@@ -7,7 +7,7 @@ source_lang = en
 trans.sq = data/lang/albanian.lng
 trans.ar = data/lang/arabic.lng
 ;trans.ca = data/lang/catalan.lng
-;trans.zh_CN = data/lang/chinese-china.lng
+trans.zh_CN = data/lang/chinese-china.lng
 trans.zh_TW = data/lang/chinese-taiwan.lng
 trans.cs = data/lang/czech.lng
 trans.da = data/lang/danish.lng
@@ -37,7 +37,7 @@ source_lang = en
 ;trans.sq = techs/megapack/lang/megapack_albanian.lng
 ;trans.ar = techs/megapack/lang/megapack_arabic.lng
 ;trans.ca = techs/megapack/lang/megapack_catalan.lng
-;trans.zh_CN = techs/megapack/lang/megapack_chinese-china.lng
+trans.zh_CN = techs/megapack/lang/megapack_chinese-china.lng
 trans.zh_TW = techs/megapack/lang/megapack_chinese-taiwan.lng
 trans.cs = techs/megapack/lang/megapack_czech.lng
 ;trans.da = techs/megapack/lang/megapack_danish.lng
@@ -67,7 +67,7 @@ source_lang = en
 ;trans.sq = data/lang/hint/hint_albanian.lng
 trans.ar = data/lang/hint/hint_arabic.lng
 ;trans.ca = data/lang/hint/hint_catalan.lng
-;trans.zh_CN = data/lang/hint/hint_chinese-china.lng
+trans.zh_CN = data/lang/hint/hint_chinese-china.lng
 trans.zh_TW = data/lang/hint/hint_chinese-taiwan.lng
 trans.cs = data/lang/hint/hint_czech.lng
 trans.da = data/lang/hint/hint_danish.lng
@@ -83,7 +83,7 @@ trans.ja = data/lang/hint/hint_japanese.lng
 trans.nqo = data/lang/hint/hint_nko.lng
 trans.pl = data/lang/hint/hint_polish.lng
 trans.pt = data/lang/hint/hint_portuguese.lng
-;trans.pt_BR = data/lang/hint/hint_portuguese-brazil.lng
+trans.pt_BR = data/lang/hint/hint_portuguese-brazil.lng
 trans.ro = data/lang/hint/hint_romanian.lng
 trans.ru = data/lang/hint/hint_russian.lng
 ;trans.sl = data/lang/hint/hint_slovenian.lng
@@ -97,7 +97,7 @@ source_lang = en
 trans.sq = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_albanian.lng
 trans.ar = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_arabic.lng
 ;trans.ca = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_catalan.lng
-;trans.zh_CN = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_chinese-china.lng
+trans.zh_CN = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_chinese-china.lng
 trans.zh_TW = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_chinese-taiwan.lng
 trans.cs = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_czech.lng
 trans.da = tutorials/1_very_basic_tutorial/1_very_basic_tutorial_danish.lng
@@ -127,7 +127,7 @@ source_lang = en
 trans.sq = tutorials/2_basic_tutorial/2_basic_tutorial_albanian.lng
 trans.ar = tutorials/2_basic_tutorial/2_basic_tutorial_arabic.lng
 ;trans.ca = tutorials/2_basic_tutorial/2_basic_tutorial_catalan.lng
-;trans.zh_CN = tutorials/2_basic_tutorial/2_basic_tutorial_chinese-china.lng
+trans.zh_CN = tutorials/2_basic_tutorial/2_basic_tutorial_chinese-china.lng
 trans.zh_TW = tutorials/2_basic_tutorial/2_basic_tutorial_chinese-taiwan.lng
 trans.cs = tutorials/2_basic_tutorial/2_basic_tutorial_czech.lng
 trans.da = tutorials/2_basic_tutorial/2_basic_tutorial_danish.lng
@@ -157,7 +157,7 @@ source_lang = en
 ;trans.sq = tutorials/3_advanced_tutorial/3_advanced_tutorial_albanian.lng
 trans.ar = tutorials/3_advanced_tutorial/3_advanced_tutorial_arabic.lng
 ;trans.ca = tutorials/3_advanced_tutorial/3_advanced_tutorial_catalan.lng
-;trans.zh_CN = tutorials/3_advanced_tutorial/3_advanced_tutorial_chinese-china.lng
+trans.zh_CN = tutorials/3_advanced_tutorial/3_advanced_tutorial_chinese-china.lng
 trans.zh_TW = tutorials/3_advanced_tutorial/3_advanced_tutorial_chinese-taiwan.lng
 trans.cs = tutorials/3_advanced_tutorial/3_advanced_tutorial_czech.lng
 trans.da = tutorials/3_advanced_tutorial/3_advanced_tutorial_danish.lng
@@ -187,7 +187,7 @@ source_lang = en
 ;trans.sq = scenarios/amazones/amazones_albanian.lng
 trans.ar = scenarios/amazones/amazones_arabic.lng
 ;trans.ca = scenarios/amazones/amazones_catalan.lng
-;trans.zh_CN = scenarios/amazones/amazones_chinese-china.lng
+trans.zh_CN = scenarios/amazones/amazones_chinese-china.lng
 trans.zh_TW = scenarios/amazones/amazones_chinese-taiwan.lng
 trans.cs = scenarios/amazones/amazones_czech.lng
 trans.da = scenarios/amazones/amazones_danish.lng
@@ -217,7 +217,7 @@ source_lang = en
 ;trans.sq = scenarios/amazones_light/amazones_light_albanian.lng
 trans.ar = scenarios/amazones_light/amazones_light_arabic.lng
 ;trans.ca = scenarios/amazones_light/amazones_light_catalan.lng
-;trans.zh_CN = scenarios/amazones_light/amazones_light_chinese-china.lng
+trans.zh_CN = scenarios/amazones_light/amazones_light_chinese-china.lng
 trans.zh_TW = scenarios/amazones_light/amazones_light_chinese-taiwan.lng
 trans.cs = scenarios/amazones_light/amazones_light_czech.lng
 trans.da = scenarios/amazones_light/amazones_light_danish.lng
@@ -247,7 +247,7 @@ source_lang = en
 ;trans.sq = scenarios/capture_enemy_flag/capture_enemy_flag_albanian.lng
 trans.ar = scenarios/capture_enemy_flag/capture_enemy_flag_arabic.lng
 ;trans.ca = scenarios/capture_enemy_flag/capture_enemy_flag_catalan.lng
-;trans.zh_CN = scenarios/capture_enemy_flag/capture_enemy_flag_chinese-china.lng
+trans.zh_CN = scenarios/capture_enemy_flag/capture_enemy_flag_chinese-china.lng
 trans.zh_TW = scenarios/capture_enemy_flag/capture_enemy_flag_chinese-taiwan.lng
 trans.cs = scenarios/capture_enemy_flag/capture_enemy_flag_czech.lng
 trans.da = scenarios/capture_enemy_flag/capture_enemy_flag_danish.lng
@@ -277,7 +277,7 @@ source_lang = en
 ;trans.sq = scenarios/storming/storming_albanian.lng
 trans.ar = scenarios/storming/storming_arabic.lng
 ;trans.ca = scenarios/storming/storming_catalan.lng
-;trans.zh_CN = scenarios/storming/storming_chinese-china.lng
+trans.zh_CN = scenarios/storming/storming_chinese-china.lng
 trans.zh_TW = scenarios/storming/storming_chinese-taiwan.lng
 trans.cs = scenarios/storming/storming_czech.lng
 trans.da = scenarios/storming/storming_danish.lng