From 6b8303ed05c1bb43bb98d8a730a5ac74e33405d0 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 19 Feb 2019 21:47:14 +0100 Subject: [PATCH] - moved the lump/resource names in the string table to their own file and removed them from other language files. These are neither supposed to be translated nor overridden by other language tables. Doing so may break later Dehacked refactorings. --- wadsrc/static/language.def | 91 ++++++++++++++++++++++++++++++++++++++ wadsrc/static/language.enu | 86 ----------------------------------- wadsrc/static/language.ptb | 13 ------ wadsrc/static/language.rus | 86 ----------------------------------- 4 files changed, 91 insertions(+), 185 deletions(-) create mode 100644 wadsrc/static/language.def diff --git a/wadsrc/static/language.def b/wadsrc/static/language.def new file mode 100644 index 000000000..4639aca99 --- /dev/null +++ b/wadsrc/static/language.def @@ -0,0 +1,91 @@ +[default] + +// The contents of this file are not supposed to be translated!!! +// These strings are needed in the string table only so that they can be replaced by Dehacked. + + +// Music names for Doom. +// Note that these names are not prefixed with 'd_' because that's how Dehacked patches expect them. + +MUSIC_E1M1 = "e1m1"; +MUSIC_E1M2 = "e1m2"; +MUSIC_E1M3 = "e1m3"; +MUSIC_E1M4 = "e1m4"; +MUSIC_E1M5 = "e1m5"; +MUSIC_E1M6 = "e1m6"; +MUSIC_E1M7 = "e1m7"; +MUSIC_E1M8 = "e1m8"; +MUSIC_E1M9 = "e1m9"; +MUSIC_E2M1 = "e2m1"; +MUSIC_E2M2 = "e2m2"; +MUSIC_E2M3 = "e2m3"; +MUSIC_E2M4 = "e2m4"; +MUSIC_E2M5 = "e2m5"; +MUSIC_E2M6 = "e2m6"; +MUSIC_E2M7 = "e2m7"; +MUSIC_E2M8 = "e2m8"; +MUSIC_E2M9 = "e2m9"; +MUSIC_E3M1 = "e3m1"; +MUSIC_E3M2 = "e3m2"; +MUSIC_E3M3 = "e3m3"; +MUSIC_E3M4 = "e3m4"; +MUSIC_E3M5 = "e3m5"; +MUSIC_E3M6 = "e3m6"; +MUSIC_E3M7 = "e3m7"; +MUSIC_E3M8 = "e3m8"; +MUSIC_E3M9 = "e3m9"; +MUSIC_INTER = "inter"; +MUSIC_INTRO = "intro"; +MUSIC_BUNNY = "bunny"; +MUSIC_VICTOR = "victor"; +MUSIC_INTROA = "introa"; +MUSIC_RUNNIN = "runnin"; +MUSIC_STALKS = "stalks"; +MUSIC_COUNTD = "countd"; +MUSIC_BETWEE = "betwee"; +MUSIC_DOOM = "doom"; +MUSIC_THE_DA = "the_da"; +MUSIC_SHAWN = "shawn"; +MUSIC_DDTBLU = "ddtblu"; +MUSIC_IN_CIT = "in_cit"; +MUSIC_DEAD = "dead"; +MUSIC_STLKS2 = "stlks2"; +MUSIC_THEDA2 = "theda2"; +MUSIC_DOOM2 = "doom2"; +MUSIC_DDTBL2 = "ddtbl2"; +MUSIC_RUNNI2 = "runni2"; +MUSIC_DEAD2 = "dead2"; +MUSIC_STLKS3 = "stlks3"; +MUSIC_ROMERO = "romero"; +MUSIC_SHAWN2 = "shawn2"; +MUSIC_MESSAG = "messag"; +MUSIC_COUNT2 = "count2"; +MUSIC_DDTBL3 = "ddtbl3"; +MUSIC_AMPIE = "ampie"; +MUSIC_THEDA3 = "theda3"; +MUSIC_ADRIAN = "adrian"; +MUSIC_MESSG2 = "messg2"; +MUSIC_ROMER2 = "romer2"; +MUSIC_TENSE = "tense"; +MUSIC_SHAWN3 = "shawn3"; +MUSIC_OPENIN = "openin"; +MUSIC_EVIL = "evil"; +MUSIC_ULTIMA = "ultima"; +MUSIC_READ_M = "read_m"; +MUSIC_DM2TTL = "dm2ttl"; +MUSIC_DM2INT = "dm2int"; + + +// MBF (BOOM?) narration backgrounds + +bgflatE1 = "FLOOR4_8"; +bgflatE2 = "SFLR6_1"; +bgflatE3 = "MFLR8_4"; +bgflatE4 = "MFLR8_3"; +bgflat06 = "SLIME16"; +bgflat11 = "RROCK14"; +bgflat20 = "RROCK07"; +bgflat30 = "RROCK17"; +bgflat15 = "RROCK13"; +bgflat31 = "RROCK19"; +bgcastcall = "BOSSBACK"; diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index c6d0eea82..1c525409a 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -634,19 +634,6 @@ PD_ALL6 = "You need all six keys to open this door"; PD_ALL6O = "You need all six keys to activate this object"; PD_ALLKEYS = "You need all the keys"; -// MBF (BOOM?) narration backgrounds -bgflatE1 = "FLOOR4_8"; -bgflatE2 = "SFLR6_1"; -bgflatE3 = "MFLR8_4"; -bgflatE4 = "MFLR8_3"; -bgflat06 = "SLIME16"; -bgflat11 = "RROCK14"; -bgflat20 = "RROCK07"; -bgflat30 = "RROCK17"; -bgflat15 = "RROCK13"; -bgflat31 = "RROCK19"; -bgcastcall = "BOSSBACK"; - // Gameflow messages TXT_FRAGLIMIT = "Fraglimit hit."; TXT_TIMELIMIT = "Timelimit hit."; @@ -2722,79 +2709,6 @@ OB_MPPHASEZORCH = "%o was phase zorched by %k."; OB_MPLAZ_BOOM = "%o fell prey to %k's LAZ device."; OB_MPLAZ_SPLASH = "%o was lazzed by %k."; -// Music names for Doom. These are needed in the string table only so that they can -// be replaced by Dehacked. -// Note that these names are not prefixed with 'd_' because that's how Dehacked patches -// expect them. - -MUSIC_E1M1 = "e1m1"; -MUSIC_E1M2 = "e1m2"; -MUSIC_E1M3 = "e1m3"; -MUSIC_E1M4 = "e1m4"; -MUSIC_E1M5 = "e1m5"; -MUSIC_E1M6 = "e1m6"; -MUSIC_E1M7 = "e1m7"; -MUSIC_E1M8 = "e1m8"; -MUSIC_E1M9 = "e1m9"; -MUSIC_E2M1 = "e2m1"; -MUSIC_E2M2 = "e2m2"; -MUSIC_E2M3 = "e2m3"; -MUSIC_E2M4 = "e2m4"; -MUSIC_E2M5 = "e2m5"; -MUSIC_E2M6 = "e2m6"; -MUSIC_E2M7 = "e2m7"; -MUSIC_E2M8 = "e2m8"; -MUSIC_E2M9 = "e2m9"; -MUSIC_E3M1 = "e3m1"; -MUSIC_E3M2 = "e3m2"; -MUSIC_E3M3 = "e3m3"; -MUSIC_E3M4 = "e3m4"; -MUSIC_E3M5 = "e3m5"; -MUSIC_E3M6 = "e3m6"; -MUSIC_E3M7 = "e3m7"; -MUSIC_E3M8 = "e3m8"; -MUSIC_E3M9 = "e3m9"; -MUSIC_INTER = "inter"; -MUSIC_INTRO = "intro"; -MUSIC_BUNNY = "bunny"; -MUSIC_VICTOR = "victor"; -MUSIC_INTROA = "introa"; -MUSIC_RUNNIN = "runnin"; -MUSIC_STALKS = "stalks"; -MUSIC_COUNTD = "countd"; -MUSIC_BETWEE = "betwee"; -MUSIC_DOOM = "doom"; -MUSIC_THE_DA = "the_da"; -MUSIC_SHAWN = "shawn"; -MUSIC_DDTBLU = "ddtblu"; -MUSIC_IN_CIT = "in_cit"; -MUSIC_DEAD = "dead"; -MUSIC_STLKS2 = "stlks2"; -MUSIC_THEDA2 = "theda2"; -MUSIC_DOOM2 = "doom2"; -MUSIC_DDTBL2 = "ddtbl2"; -MUSIC_RUNNI2 = "runni2"; -MUSIC_DEAD2 = "dead2"; -MUSIC_STLKS3 = "stlks3"; -MUSIC_ROMERO = "romero"; -MUSIC_SHAWN2 = "shawn2"; -MUSIC_MESSAG = "messag"; -MUSIC_COUNT2 = "count2"; -MUSIC_DDTBL3 = "ddtbl3"; -MUSIC_AMPIE = "ampie"; -MUSIC_THEDA3 = "theda3"; -MUSIC_ADRIAN = "adrian"; -MUSIC_MESSG2 = "messg2"; -MUSIC_ROMER2 = "romer2"; -MUSIC_TENSE = "tense"; -MUSIC_SHAWN3 = "shawn3"; -MUSIC_OPENIN = "openin"; -MUSIC_EVIL = "evil"; -MUSIC_ULTIMA = "ultima"; -MUSIC_READ_M = "read_m"; -MUSIC_DM2TTL = "dm2ttl"; -MUSIC_DM2INT = "dm2int"; - // GZDoom exclusive: DSPLYMNU_GLOPT = "OpenGL Renderer"; diff --git a/wadsrc/static/language.ptb b/wadsrc/static/language.ptb index 75ae54222..c3187eb8b 100644 --- a/wadsrc/static/language.ptb +++ b/wadsrc/static/language.ptb @@ -582,19 +582,6 @@ PD_ALL6 = "Precisa das 6 chaves para abrir a porta"; PD_ALL6O = "Precisa das 6 chaves para ativar este objeto"; PD_ALLKEYS = "Precisa de todas as chaves"; -// MBF (BOOM?) narration backgrounds -bgflatE1 = "FLOOR4_8"; -bgflatE2 = "SFLR6_1"; -bgflatE3 = "MFLR8_4"; -bgflatE4 = "MFLR8_3"; -bgflat06 = "SLIME16"; -bgflat11 = "RROCK14"; -bgflat20 = "RROCK07"; -bgflat30 = "RROCK17"; -bgflat15 = "RROCK13"; -bgflat31 = "RROCK19"; -bgcastcall = "BOSSBACK"; - // Mensagens de fim de partida online TXT_FRAGLIMIT = "Pontuao atingida."; TXT_TIMELIMIT = "Tempo atingido."; diff --git a/wadsrc/static/language.rus b/wadsrc/static/language.rus index d43087eeb..496d452f3 100644 --- a/wadsrc/static/language.rus +++ b/wadsrc/static/language.rus @@ -657,19 +657,6 @@ PD_ALL6 = "Для активации требуются все шесть клю PD_ALL6O = "Для активации требуются все шесть ключей"; PD_ALLKEYS = "Для активации требуются все ключи"; -// MBF (BOOM?) narration backgrounds -bgflatE1 = "FLOOR4_8"; -bgflatE2 = "SFLR6_1"; -bgflatE3 = "MFLR8_4"; -bgflatE4 = "MFLR8_3"; -bgflat06 = "SLIME16"; -bgflat11 = "RROCK14"; -bgflat20 = "RROCK07"; -bgflat30 = "RROCK17"; -bgflat15 = "RROCK13"; -bgflat31 = "RROCK19"; -bgcastcall = "BOSSBACK"; - // Gameflow messages TXT_FRAGLIMIT = "Достигнут лимит фрагов."; TXT_TIMELIMIT = "Достигнут лимит времени."; @@ -2705,79 +2692,6 @@ OB_MPPHASEZORCH = "%o was phase zorched by %k."; OB_MPLAZ_BOOM = "%o fell prey to %k LAZ device."; OB_MPLAZ_SPLASH = "%o was lazzed by %k."; -// Music names for Doom. These are needed in the string table only so that they can -// be replaced by Dehacked. -// Note that these names are not prefixed with 'd_' because that's how Dehacked patches -// expect them. - -MUSIC_E1M1 = "e1m1"; -MUSIC_E1M2 = "e1m2"; -MUSIC_E1M3 = "e1m3"; -MUSIC_E1M4 = "e1m4"; -MUSIC_E1M5 = "e1m5"; -MUSIC_E1M6 = "e1m6"; -MUSIC_E1M7 = "e1m7"; -MUSIC_E1M8 = "e1m8"; -MUSIC_E1M9 = "e1m9"; -MUSIC_E2M1 = "e2m1"; -MUSIC_E2M2 = "e2m2"; -MUSIC_E2M3 = "e2m3"; -MUSIC_E2M4 = "e2m4"; -MUSIC_E2M5 = "e2m5"; -MUSIC_E2M6 = "e2m6"; -MUSIC_E2M7 = "e2m7"; -MUSIC_E2M8 = "e2m8"; -MUSIC_E2M9 = "e2m9"; -MUSIC_E3M1 = "e3m1"; -MUSIC_E3M2 = "e3m2"; -MUSIC_E3M3 = "e3m3"; -MUSIC_E3M4 = "e3m4"; -MUSIC_E3M5 = "e3m5"; -MUSIC_E3M6 = "e3m6"; -MUSIC_E3M7 = "e3m7"; -MUSIC_E3M8 = "e3m8"; -MUSIC_E3M9 = "e3m9"; -MUSIC_INTER = "inter"; -MUSIC_INTRO = "intro"; -MUSIC_BUNNY = "bunny"; -MUSIC_VICTOR = "victor"; -MUSIC_INTROA = "introa"; -MUSIC_RUNNIN = "runnin"; -MUSIC_STALKS = "stalks"; -MUSIC_COUNTD = "countd"; -MUSIC_BETWEE = "betwee"; -MUSIC_DOOM = "doom"; -MUSIC_THE_DA = "the_da"; -MUSIC_SHAWN = "shawn"; -MUSIC_DDTBLU = "ddtblu"; -MUSIC_IN_CIT = "in_cit"; -MUSIC_DEAD = "dead"; -MUSIC_STLKS2 = "stlks2"; -MUSIC_THEDA2 = "theda2"; -MUSIC_DOOM2 = "doom2"; -MUSIC_DDTBL2 = "ddtbl2"; -MUSIC_RUNNI2 = "runni2"; -MUSIC_DEAD2 = "dead2"; -MUSIC_STLKS3 = "stlks3"; -MUSIC_ROMERO = "romero"; -MUSIC_SHAWN2 = "shawn2"; -MUSIC_MESSAG = "messag"; -MUSIC_COUNT2 = "count2"; -MUSIC_DDTBL3 = "ddtbl3"; -MUSIC_AMPIE = "ampie"; -MUSIC_THEDA3 = "theda3"; -MUSIC_ADRIAN = "adrian"; -MUSIC_MESSG2 = "messg2"; -MUSIC_ROMER2 = "romer2"; -MUSIC_TENSE = "tense"; -MUSIC_SHAWN3 = "shawn3"; -MUSIC_OPENIN = "openin"; -MUSIC_EVIL = "evil"; -MUSIC_ULTIMA = "ultima"; -MUSIC_READ_M = "read_m"; -MUSIC_DM2TTL = "dm2ttl"; -MUSIC_DM2INT = "dm2int"; - // GZDoom exclusive: DSPLYMNU_GLOPT = "Рендерер OpenGL";