Merge branch 'master' into assault_rifle

PROGRESS.md

@@ -1,32 +1,32 @@
 # Overview
 | Language | basemodui | closecaption | gameui | reactivedrop | items | statsweb | Strings | Files |
 | --- | --- | --- | --- | --- | --- | --- | --- | --- |
-| [Simplified Chinese](#schinese-简体中文) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
-| [Traditional Chinese](#tchinese-繁體中文) | ✔️ | ✔️ | ✔️ | 92 | ✔️ | ✔️ | ✔️ | 126 |
-| [Czech](#czech-čeština) | 76 | 1810 | 43 | 4233 | 271 | 212 | 977 | 146 |
-| [Danish](#non-curated-languages) | 57 | 231 | 43 | 3760 | 271 | 212 | 707 | 147 |
-| [Dutch](#non-curated-languages) | 56 | 2004 | 43 | 3228 | 271 | 212 | 707 | 146 |
-| [Finnish](#non-curated-languages) | 1 | 2004 | 42 | 3090 | 214 | 152 | 693 | 146 |
-| [French](#french-français) | 32 | 138 | 43 | 2594 | 270 | 212 | 647 | 125 |
+| [Simplified Chinese](#schinese-简体中文) | ✔️ | ✔️ | ✔️ | 3 | ✔️ | ✔️ | ✔️ | ✔️ |
+| [Traditional Chinese](#tchinese-繁體中文) | ✔️ | ✔️ | ✔️ | 95 | ✔️ | ✔️ | ✔️ | 126 |
+| [Czech](#czech-čeština) | 76 | 1810 | 43 | 4236 | 271 | 212 | 977 | 146 |
+| [Danish](#non-curated-languages) | 57 | 231 | 43 | 3763 | 271 | 212 | 707 | 147 |
+| [Dutch](#non-curated-languages) | 56 | 2004 | 43 | 3231 | 271 | 212 | 707 | 146 |
+| [Finnish](#non-curated-languages) | 1 | 2004 | 42 | 3093 | 214 | 152 | 693 | 146 |
+| [French](#french-français) | 32 | 138 | 43 | 2597 | 270 | 212 | 647 | 125 |
 | [German](#german-deutsch) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
-| [Hungarian](#non-curated-languages) | 56 | 138 | 43 | 3228 | 271 | 212 | 972 | 147 |
-| [Indonesian](#indonesian-indonesia) | 1286 | 2004 | 635 | 4244 | 274 | 216 | 977 | 147 |
+| [Hungarian](#non-curated-languages) | 56 | 138 | 43 | 3231 | 271 | 212 | 972 | 147 |
+| [Indonesian](#indonesian-indonesia) | 1149 | 2004 | 635 | 4247 | 274 | 216 | 969 | 147 |
 | [Italian](#italian-italiano) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
 | [Japanese](#japanese-日本語) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | 35 | ✔️ |
 | [Korean](#koreana-한국어) | ✔️ | ✔️ | ✔️ | 67 | ✔️ | ✔️ | 5 | 29 |
-| [Norwegian Bokmål](#non-curated-languages) | 74 | 708 | 48 | 3934 | 271 | 212 | 707 | 147 |
-| [Polish](#polish-polski) | 2 | 2004 | ✔️ | 2872 | ✔️ | ✔️ | 134 | 127 |
-| [European Portuguese](#portuguese-português-europeu) | 5 | 180 | 33 | 2318 | 251 | 33 | 633 | 142 |
-| [Brazilian Portuguese](#brazilian-português) | 1 | ✔️ | ✔️ | 855 | 13 | 3 | 1 | 3 |
-| [Romanian](#non-curated-languages) | 56 | 1996 | 49 | 3940 | 271 | 212 | 972 | 147 |
-| [Russian](#russian-русский) | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ |
-| [European Spanish](#spanish-español-de-españa) | 33 | 2004 | 41 | 2645 | 271 | 212 | 711 | 146 |
-| [Latin American Spanish](#latam-español-latinoamericano) | 1 | 2004 | ✔️ | 4280 | 19 | 3 | 204 | 143 |
-| [Swedish](#swedish-svenska) | ✔️ | ✔️ | ✔️ | 523 | ✔️ | ✔️ | ✔️ | 81 |
-| [Thai](#non-curated-languages) | 971 | 1993 | 51 | 4476 | 271 | 212 | 736 | 147 |
-| [Turkish](#non-curated-languages) | 56 | 137 | 43 | 3228 | 271 | 212 | 972 | 147 |
-| [Ukrainian](#ukrainian-українська) | 32 | 131 | 33 | 2773 | 271 | 212 | 932 | 147 |
-| [Vietnamese](#vietnamese-tiếng-việt) | 1 | 2004 | ✔️ | 3514 | 19 | 3 | 1 | 85 |
+| [Norwegian Bokmål](#non-curated-languages) | 74 | 708 | 48 | 3937 | 271 | 212 | 707 | 147 |
+| [Polish](#polish-polski) | 2 | 2004 | ✔️ | 2875 | ✔️ | ✔️ | 134 | 127 |
+| [European Portuguese](#portuguese-português-europeu) | 5 | 180 | 33 | 2321 | 251 | 33 | 633 | 142 |
+| [Brazilian Portuguese](#brazilian-português) | 1 | ✔️ | ✔️ | 858 | 13 | 3 | 1 | 3 |
+| [Romanian](#non-curated-languages) | 56 | 1996 | 49 | 3943 | 271 | 212 | 972 | 147 |
+| [Russian](#russian-русский) | ✔️ | ✔️ | ✔️ | 3 | ✔️ | ✔️ | ✔️ | ✔️ |
+| [European Spanish](#spanish-español-de-españa) | 33 | 2004 | 41 | 2648 | 271 | 212 | 711 | 146 |
+| [Latin American Spanish](#latam-español-latinoamericano) | 1 | 2004 | ✔️ | 4283 | 19 | 3 | 204 | 143 |
+| [Swedish](#swedish-svenska) | ✔️ | ✔️ | ✔️ | 526 | ✔️ | ✔️ | ✔️ | 81 |
+| [Thai](#non-curated-languages) | 971 | 1993 | 51 | 4479 | 271 | 212 | 736 | 147 |
+| [Turkish](#non-curated-languages) | 56 | 137 | 43 | 3231 | 271 | 212 | 972 | 147 |
+| [Ukrainian](#ukrainian-українська) | 32 | 131 | 33 | 2776 | 271 | 212 | 932 | 147 |
+| [Vietnamese](#vietnamese-tiếng-việt) | 1 | 2004 | ✔️ | 3517 | 19 | 3 | 1 | 85 |
 ### Legend
 - ***Non-capitalized column headers*** are the most important specific files and their number of missing strings. All of these txt-files are located in the resources folder. Except statsweb, which lies in community/stats_website, it's an vdf-file.
 - ***Strings*** is the number of missing strings not included in one of the files which get an individual non-capitalized column.
@@ -41,7 +41,9 @@
 
 </summary>
 
-✓ Up to date!
+### Strings
+
+- [reactivedrop_schinese.txt](resource/reactivedrop_schinese.txt) has 3 untranslated strings.
 
 </details>
 
@@ -53,7 +55,7 @@
 
 ### Strings
 
-- [reactivedrop_tchinese.txt](resource/reactivedrop_tchinese.txt) has 92 untranslated strings.
+- [reactivedrop_tchinese.txt](resource/reactivedrop_tchinese.txt) has 95 untranslated strings.
 
 ### Steam Store and Community
 
@@ -211,7 +213,7 @@
 - [chat_czech.txt](resource/chat_czech.txt) has 8 untranslated strings.
 - [closecaption_czech.txt](resource/closecaption_czech.txt) has 1810 untranslated strings.
 - [gameui_czech.txt](resource/gameui_czech.txt) has 43 untranslated strings.
-- [reactivedrop_czech.txt](resource/reactivedrop_czech.txt) has 4233 untranslated strings.
+- [reactivedrop_czech.txt](resource/reactivedrop_czech.txt) has 4236 untranslated strings.
 - [valve_czech.txt](resource/valve_czech.txt) has 266 untranslated strings.
 
 ### Steam Store and Community
@@ -395,7 +397,7 @@
 - [basemodui_french.txt](resource/basemodui_french.txt) has 32 untranslated strings.
 - [closecaption_french.txt](resource/closecaption_french.txt) has 138 untranslated strings.
 - [gameui_french.txt](resource/gameui_french.txt) has 43 untranslated strings.
-- [reactivedrop_french.txt](resource/reactivedrop_french.txt) has 2594 untranslated strings.
+- [reactivedrop_french.txt](resource/reactivedrop_french.txt) has 2597 untranslated strings.
 - [valve_french.txt](resource/valve_french.txt) has 202 untranslated strings.
 
 ### Steam Store and Community
@@ -565,11 +567,10 @@
 - [misc/signage/signage_indonesian.vdf](misc/signage/signage_indonesian.vdf) has 69 untranslated strings.
 - [platform/servers/serverbrowser_indonesian.txt](platform/servers/serverbrowser_indonesian.txt) has 186 untranslated strings.
 - [platform/vgui_indonesian.txt](platform/vgui_indonesian.txt) has 184 untranslated strings.
-- [basemodui_indonesian.txt](resource/basemodui_indonesian.txt) has 1286 untranslated strings.
-- [chat_indonesian.txt](resource/chat_indonesian.txt) has 8 untranslated strings.
+- [basemodui_indonesian.txt](resource/basemodui_indonesian.txt) has 1149 untranslated strings.
 - [closecaption_indonesian.txt](resource/closecaption_indonesian.txt) has 2004 untranslated strings.
 - [gameui_indonesian.txt](resource/gameui_indonesian.txt) has 635 untranslated strings.
-- [reactivedrop_indonesian.txt](resource/reactivedrop_indonesian.txt) has 4244 untranslated strings.
+- [reactivedrop_indonesian.txt](resource/reactivedrop_indonesian.txt) has 4247 untranslated strings.
 - [valve_indonesian.txt](resource/valve_indonesian.txt) has 266 untranslated strings.
 
 ### Steam Store and Community
@@ -812,7 +813,7 @@
 - [platform/vgui_polish.txt](platform/vgui_polish.txt) has 65 untranslated strings.
 - [basemodui_polish.txt](resource/basemodui_polish.txt) has 2 untranslated strings.
 - [closecaption_polish.txt](resource/closecaption_polish.txt) has 2004 untranslated strings.
-- [reactivedrop_polish.txt](resource/reactivedrop_polish.txt) has 2872 untranslated strings.
+- [reactivedrop_polish.txt](resource/reactivedrop_polish.txt) has 2875 untranslated strings.
 
 ### Steam Store and Community
 
@@ -972,7 +973,7 @@
 - [basemodui_portuguese.txt](resource/basemodui_portuguese.txt) has 5 untranslated strings.
 - [closecaption_portuguese.txt](resource/closecaption_portuguese.txt) has 180 untranslated strings.
 - [gameui_portuguese.txt](resource/gameui_portuguese.txt) has 33 untranslated strings.
-- [reactivedrop_portuguese.txt](resource/reactivedrop_portuguese.txt) has 2318 untranslated strings.
+- [reactivedrop_portuguese.txt](resource/reactivedrop_portuguese.txt) has 2321 untranslated strings.
 - [valve_portuguese.txt](resource/valve_portuguese.txt) has 266 untranslated strings.
 
 ### Steam Store and Community
@@ -1143,7 +1144,7 @@
 - [items_brazilian.vdf](community/inventory_service/items_brazilian.vdf) has 13 untranslated strings.
 - [statsweb_brazilian.vdf](community/stats_website/statsweb_brazilian.vdf) has 3 untranslated strings.
 - [basemodui_brazilian.txt](resource/basemodui_brazilian.txt) has 1 untranslated strings.
-- [reactivedrop_brazilian.txt](resource/reactivedrop_brazilian.txt) has 855 untranslated strings.
+- [reactivedrop_brazilian.txt](resource/reactivedrop_brazilian.txt) has 858 untranslated strings.
 
 ### Steam Store and Community
 
@@ -1162,7 +1163,9 @@
 
 </summary>
 
-✓ Up to date!
+### Strings
+
+- [reactivedrop_russian.txt](resource/reactivedrop_russian.txt) has 3 untranslated strings.
 
 </details>
 
@@ -1187,7 +1190,7 @@
 - [basemodui_spanish.txt](resource/basemodui_spanish.txt) has 33 untranslated strings.
 - [closecaption_spanish.txt](resource/closecaption_spanish.txt) has 2004 untranslated strings.
 - [gameui_spanish.txt](resource/gameui_spanish.txt) has 41 untranslated strings.
-- [reactivedrop_spanish.txt](resource/reactivedrop_spanish.txt) has 2645 untranslated strings.
+- [reactivedrop_spanish.txt](resource/reactivedrop_spanish.txt) has 2648 untranslated strings.
 - [valve_spanish.txt](resource/valve_spanish.txt) has 266 untranslated strings.
 
 ### Steam Store and Community
@@ -1366,7 +1369,7 @@
 - [misc/signage/signage_latam.vdf](misc/signage/signage_latam.vdf) has 69 untranslated strings.
 - [basemodui_latam.txt](resource/basemodui_latam.txt) has 1 untranslated strings.
 - [closecaption_latam.txt](resource/closecaption_latam.txt) has 2004 untranslated strings.
-- [reactivedrop_latam.txt](resource/reactivedrop_latam.txt) has 4280 untranslated strings.
+- [reactivedrop_latam.txt](resource/reactivedrop_latam.txt) has 4283 untranslated strings.
 
 ### Steam Store and Community
 
@@ -1533,7 +1536,7 @@
 
 ### Strings
 
-- [reactivedrop_swedish.txt](resource/reactivedrop_swedish.txt) has 523 untranslated strings.
+- [reactivedrop_swedish.txt](resource/reactivedrop_swedish.txt) has 526 untranslated strings.
 
 ### Mail and News
 
@@ -1642,7 +1645,7 @@
 - [basemodui_ukrainian.txt](resource/basemodui_ukrainian.txt) has 32 untranslated strings.
 - [closecaption_ukrainian.txt](resource/closecaption_ukrainian.txt) has 131 untranslated strings.
 - [gameui_ukrainian.txt](resource/gameui_ukrainian.txt) has 33 untranslated strings.
-- [reactivedrop_ukrainian.txt](resource/reactivedrop_ukrainian.txt) has 2773 untranslated strings.
+- [reactivedrop_ukrainian.txt](resource/reactivedrop_ukrainian.txt) has 2776 untranslated strings.
 - [valve_ukrainian.txt](resource/valve_ukrainian.txt) has 266 untranslated strings.
 
 ### Steam Store and Community
@@ -1819,7 +1822,7 @@
 - [statsweb_vietnamese.vdf](community/stats_website/statsweb_vietnamese.vdf) has 3 untranslated strings.
 - [basemodui_vietnamese.txt](resource/basemodui_vietnamese.txt) has 1 untranslated strings.
 - [closecaption_vietnamese.txt](resource/closecaption_vietnamese.txt) has 2004 untranslated strings.
-- [reactivedrop_vietnamese.txt](resource/reactivedrop_vietnamese.txt) has 3514 untranslated strings.
+- [reactivedrop_vietnamese.txt](resource/reactivedrop_vietnamese.txt) has 3517 untranslated strings.
 
 ### Steam Store and Community
 

community/inventory_service/rendered/item-schema-strange-crafting.json

@@ -1732,7 +1732,8 @@
 			"itemdefid": 4029,
 			"type": "item",
 			"name": "Crafting Materials Beta - Phase 1 opt-in",
-			"game_only": true
+			"game_only": true,
+			"item_slot": "crafting_material_beta_opt_in"
 		},
 		{
 			"itemdefid": 4030,
@@ -1844,6 +1845,20 @@
 			"auto_stack": true,
 			"tags": "rarity:common;crafting_item:refined",
 			"compressed_dynamic_props": "m_unQuantity"
+		},
+		{
+			"itemdefid": 4033,
+			"type": "item",
+			"name": "Crafting Materials Beta - Phase 2 opt-in",
+			"game_only": true,
+			"item_slot": "crafting_material_beta_opt_in"
+		},
+		{
+			"itemdefid": 4034,
+			"type": "bundle",
+			"name": "Crafting Materials Beta - Phase 2 bundle",
+			"description": "beta phase 2 opt-in token, 1x strange weapon choice, 2x strange device choice, 1x bonus crafting material location discovery",
+			"bundle": "4033x1;4000x1;4001x2;7003x1"
 		}
 	]
 }

community/inventory_service/template/item-schema-strange-crafting.json

@@ -349,7 +349,8 @@
 			"itemdefid": 4029,
 			"type": "item",
 			"name": "Crafting Materials Beta - Phase 1 opt-in",
-			"game_only": true
+			"game_only": true,
+			"item_slot": "crafting_material_beta_opt_in"
 		},
 		{
 			"itemdefid": 4030,
@@ -381,6 +382,20 @@
 			"auto_stack": true,
 			"tags": "rarity:common;crafting_item:refined",
 			"compressed_dynamic_props": "m_unQuantity"
+		},
+		{
+			"itemdefid": 4033,
+			"type": "item",
+			"name": "Crafting Materials Beta - Phase 2 opt-in",
+			"game_only": true,
+			"item_slot": "crafting_material_beta_opt_in"
+		},
+		{
+			"itemdefid": 4034,
+			"type": "bundle",
+			"name": "Crafting Materials Beta - Phase 2 bundle",
+			"description": "beta phase 2 opt-in token, 1x strange weapon choice, 2x strange device choice, 1x bonus crafting material location discovery",
+			"bundle": "4033x1;4000x1;4001x2;7003x1"
 		}
 	]
 }

credits/asw_credits_koreana.txt

@@ -248,8 +248,8 @@
 "asw_credits_"	"Lorenzo Wang - 3D 모델"
 "asw_credits_"	"Christine Liu - 3D 모델"
 "asw_credits_"	"Patrick Phelan - 사운드"
-"asw_credits_"	"Niek Beernink - QA"
-"asw_credits_"	"Teemu Salmela - QA"
+"asw_credits_"	"Niek Beernink - 검수"
+"asw_credits_"	"Teemu Salmela - 검수"
 "asw_credits_"	"http://www.digitalgraphiclabs.com/"
 "asw_credits_"	""
 "asw_credits_"	""