Merge remote-tracking branch 'origin/master' into vulkan2

2024-11-26 14:01:45 +00:00 · 2019-04-16 08:11:53 -04:00 · 2019-04-16 08:11:53 -04:00 · 5913f72c9f
commit 5913f72c9f
parent 09a2b53b21 89a11d1a9d
79 changed files with 3 additions and 1 deletions
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@ -2709,8 +2709,10 @@ OptionString "LanguageOptions"
 	"es", "Español (España)"
 	"esm", "Español (Latino)"
 	"fr", "Français"
 	"ko", "한국의 (Korean)"
 	"it", "Italiano"
-	"ru", "Русский"
+	"pt", "Portugues do Brasil"
 	"ru", "Русский (Russian)"
 }
 /*=======================================
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca1.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca1.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca2a8.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca2a8.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca3a7.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca3a7.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca4a6.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca4a6.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca5.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyca5.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb1.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb1.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb2b8.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb2b8.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb3b7.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb3b7.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb4b6.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb4b6.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb5.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycb5.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc1.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc1.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc2c8.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc2c8.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc3c7.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc3c7.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc4c6.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc4c6.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc5.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycc5.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd1.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd1.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd2d8.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd2d8.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd3d7.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd3d7.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd4d6.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd4d6.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd5.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycd5.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce1.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce1.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce2e8.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce2e8.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce3e7.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce3e7.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce4e6.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce4e6.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce5.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyce5.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf1.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf1.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf2f8.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf2f8.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf3f7.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf3f7.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf4f6.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf4f6.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf5.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycf5.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg1.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg1.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg2g8.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg2g8.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg3g7.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg3g7.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg4g6.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg4g6.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg5.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycg5.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plych0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plych0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyci0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyci0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycj0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycj0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyck0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyck0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycl0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycl0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycm0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycm0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycn0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycn0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyco0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyco0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycp0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycp0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycq0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycq0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycr0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycr0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycs0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycs0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyct0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plyct0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycu0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycu0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycv0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycv0.lmp
--- a/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycw0.lmp
+++ b/wadsrc_extra/static/filter/doom.id/sprites/plyc/plycw0.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/010C.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/010C.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/010E.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/010E.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/011A.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/011A.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0147.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0147.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0158.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0158.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0160.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0160.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0164.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/0164.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/016E.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/016E.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigfont/017D.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigfont/017D.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010C.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010C.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010D.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010D.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010E.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010E.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010F.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/010F.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/011A.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/011A.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/011B.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/011B.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0147.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0147.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0148.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0148.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0158.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0158.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0159.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0159.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0160.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0160.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0161.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0161.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0164.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0164.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0165.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/0165.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/016E.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/016E.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/016F.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/016F.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/017D.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/017D.lmp
--- a/wadsrc_extra/static/filter/game-doom/fonts/bigupper/017E.lmp
+++ b/wadsrc_extra/static/filter/game-doom/fonts/bigupper/017E.lmp