Most of language code fixes

data/ca_ES/lang.inc

@@ -1 +1 @@
-lang fix ca
+lang fix ca_ES

data/ca_ES/settings/kolibri.lbl

@@ -1,7 +1,7 @@
 KolibriOS
 version 0770
 svnr 4483
-language ca
+language ca_ES
 
 ;just comment
 ; Hi, curious person! :-)

data/en_US/lang.inc

@@ -1 +1 @@
-lang fix en
+lang fix en_US

data/en_US/settings/kolibri.lbl

@@ -1,7 +1,7 @@
 KolibriOS
 version 0770
 svnr 4483
-language EN
+language en_US
 
 ;just comment
 ; Hi, curious person! :-)

data/es_ES/lang.inc

@@ -1 +1 @@
-lang fix sp
+lang fix es_ES

data/es_ES/settings/kolibri.lbl

@@ -1,7 +1,7 @@
 KolibriOS
 version 0770
 svnr 4483
-language SP
+language es_ES
 
 ;just comment
 ; Hi, curious person! :-)

data/et_EE/lang.inc

@@ -1 +1 @@
-lang fix et
+lang fix et_EE

data/et_EE/settings/kolibri.lbl

@@ -1,7 +1,7 @@
 KolibriOS
 version 0770
 svnr 4483
-language ET
+language et_EE
 
 ;just comment
 ; Hi, curious person! :-)

data/it_IT/lang.inc

@@ -1 +1 @@
-lang fix it
+lang fix it_IT

data/it_IT/settings/kolibri.lbl

@@ -1,7 +1,7 @@
 KolibriOS
 version 0770
 svnr 4483
-language IT
+language it_IT
 
 ;just comment
 ; Hi, curious person! :-)

data/ru_RU/lang.inc

@@ -1 +1 @@
-lang fix ru
+lang fix ru_RU

data/ru_RU/settings/kolibri.lbl

@@ -1,7 +1,7 @@
 KolibriOS
 version 0770
 svnr 4483
-language RU
+language ru_RU
 
 ;just comment
 ; Hi, curious person! :-)

programs/build_all.bat

@@ -37,7 +37,7 @@ goto :eof
 
 
 :MAIN
-set languages=en ru ge et
+set languages=en_US ru_RU de_DE et_EE
 set __CPU_type=p5 p6 k6
 set BIN=bin
 

programs/demos/3dcube2/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"3DCUBE2.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "3DCUBE2")

programs/demos/3dcube2/trunk/ascgl.inc

@@ -1,4 +1,4 @@
-lang equ ru
+lang equ ru_RU
 
 ;
 ;   Assembler

programs/demos/3dcube2/trunk/ascl.inc

@@ -1,4 +1,4 @@
-lang equ ru ; ru en fr ge fi
+lang equ ru_RU ; ru_RU en_US fr_FR de_DE fi_FI
 
 ;
 ;   Assembler

programs/demos/3dcube2/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm 3dcube2.asm 3dcube2
 @erase lang.inc
 @kpack 3dcube2

programs/demos/3dcube2/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm 3dcube2.asm 3dcube2
 @erase lang.inc
 @kpack 3dcube2

programs/demos/3detx60b/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"3DETX60B.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "3DETX60B")

programs/demos/3detx60b/trunk/ascgl.inc

@@ -1,4 +1,4 @@
-lang equ ru
+lang equ ru_RU
 
 ;
 ;   Assembler

programs/demos/3detx60b/trunk/ascl.inc

@@ -1,4 +1,4 @@
-lang equ ru ; ru en fr ge fi
+lang equ ru_RU ; ru_RU en_US fr_FR de_DE fi_FI
 
 ;
 ;   Assembler

programs/demos/3detx60b/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm 3detx60b.asm 3detx60b
 @erase lang.inc
 @pause

programs/demos/3detx60b/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm 3detx60b.asm 3detx60b
 @erase lang.inc
 @pause

programs/demos/3dtcub10/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"3DTCUB10.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "3DTCUB10")

programs/demos/3dtcub10/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm 3dtcub10.asm 3dtcub10
 @erase lang.inc
 @pause

programs/demos/3dtcub10/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm 3dtcub10.asm 3dtcub10
 @erase lang.inc
 @pause

programs/demos/ScreenRuler/BUILD_EN.BAT

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm ScreenRuler.asm ScreenRuler
 @kpack ScreenRuler
 @erase lang.inc

programs/demos/ScreenRuler/BUILD_RU.BAT

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm ScreenRuler.asm ScreenRuler
 @kpack ScreenRuler
 @erase lang.inc

programs/demos/ScreenRuler/ScreenRuler.asm

@@ -240,7 +240,7 @@ draw_magnify:
         ret
 
 ;------------------------- Data area
-        if      lang eq ru
+        if      lang eq ru_RU
 labelt:
         db      3, 'Измеритель', 0
 start_pix:

programs/demos/ScreenRuler/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HEL
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"ScreenRuler.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ScreenRuler")

programs/demos/bcdclk/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"bcdclk.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bcdclk")

programs/demos/bcdclk/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm bcdclk.asm bcdclk
 @erase lang.inc
 @pause

programs/demos/bcdclk/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm bcdclk.asm bcdclk
 @erase lang.inc
 @pause

programs/demos/colorref/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"colorref.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "colorref")

programs/demos/colorref/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm colorref.asm colorref
 @erase lang.inc
 @pause

programs/demos/colorref/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm colorref.asm colorref
 @erase lang.inc
 @pause

programs/demos/crownscr/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"crownscr.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "crownscr")

programs/demos/crownscr/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm crownscr.asm crownscr
 @erase lang.inc
 @pause

programs/demos/crownscr/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm crownscr.asm crownscr
 @erase lang.inc
 @pause

programs/demos/cslide/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"cslide.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cslide")

programs/demos/cslide/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm cslide.asm cslide
 @erase lang.inc
 @pause

programs/demos/cslide/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm cslide.asm cslide
 @erase lang.inc
 @pause

programs/demos/eyes/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"eyes.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "eyes")

programs/demos/eyes/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm eyes.asm eyes
 @erase lang.inc
 @pause

programs/demos/eyes/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm eyes.asm eyes
 @erase lang.inc
 @pause

programs/demos/free3d04/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"free3d04.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "free3d04")

programs/demos/free3d04/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm free3d04.asm free3d04
 @erase lang.inc
 @pause

programs/demos/free3d04/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm free3d04.asm free3d04
 @erase lang.inc
 @pause

programs/demos/life/trunk/ascl.inc

@@ -1,4 +1,4 @@
-lang equ ru ; ru en fr ge fi
+lang equ ru_RU ; ru_RU en_US fr_FR de_DE fi_FI
 
 ;
 ;   Assembler

programs/demos/life/trunk/build_en.bat

@@ -1,4 +1,4 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm life.asm life
 @pause

programs/demos/life/trunk/build_ru.bat

@@ -1,4 +1,4 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm life.asm life
 @pause

programs/demos/magnify/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"magnify.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "magnify")

programs/demos/magnify/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm magnify.asm magnify
 @kpack magnify
 @erase lang.inc

programs/demos/magnify/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm magnify.asm magnify
 @kpack magnify
 @erase lang.inc

programs/demos/magnify/trunk/magnify.asm

@@ -134,7 +134,7 @@ draw_magnify:
 ;---------------------------------------------------------------------
 ; DATA AREA
 ;---------------------------------------------------------------------
-if lang eq ru
+if lang eq ru_RU
 labelt:
     db   'Magnifier - <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20>㯠', 0
 else

programs/demos/movback/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"movback.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "movback")

programs/demos/movback/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm movback.asm movback
 @erase lang.inc
 @pause

programs/demos/movback/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm movback.asm movback
 @erase lang.inc
 @pause

programs/demos/plasma/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"plasma.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "plasma")

programs/demos/plasma/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm plasma.asm plasma
 @erase lang.inc
 @pause

programs/demos/plasma/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm plasma.asm plasma
 @erase lang.inc
 @pause

programs/demos/ray/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HEL
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"ray.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ray")

programs/demos/timer/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"timer.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "timer")

programs/demos/timer/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm timer.asm timer
 @erase lang.inc
 @pause

programs/demos/timer/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm timer.asm timer
 @erase lang.inc
 @pause

programs/demos/timer/trunk/timer.asm

@@ -137,7 +137,7 @@ draw_window:
 
 ; DATA AREA
 
-if lang eq ru
+if lang eq ru_RU
     title   db   '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
 else
     title   db   'TIMER',0

programs/demos/tinyfrac/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"tinyfrac.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tinyfrac")

programs/demos/tinyfrac/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm tinyfrac.asm tinyfrac
 @erase lang.inc
 @pause

programs/demos/tinyfrac/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm tinyfrac.asm tinyfrac
 @erase lang.inc
 @pause

programs/demos/transp/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"transp.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "transp")

programs/demos/transp/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm transp.asm transp
 @erase lang.inc
 @pause

programs/demos/transp/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm transp.asm transp
 @erase lang.inc
 @pause

programs/demos/trantest/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"trantest.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "trantest")

programs/demos/trantest/trunk/ascgl.inc

@@ -1,4 +1,4 @@
-lang equ ru
+lang equ ru_RU
 
 ;
 ;   Assembler

programs/demos/trantest/trunk/ascl.inc

@@ -1,4 +1,4 @@
-lang equ ru ; ru en fr ge fi
+lang equ ru_RU ; ru_RU en_US fr_FR de_DE fi_FI
 
 ;
 ;   Assembler

programs/demos/trantest/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm trantest.asm trantest
 @erase lang.inc
 @pause

programs/demos/trantest/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm trantest.asm trantest
 @erase lang.inc
 @pause

programs/demos/tube/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm tube.asm tube
 @erase lang.inc
 @pause

programs/demos/tube/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm tube.asm tube
 @erase lang.inc
 @pause

programs/demos/use_mb/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HEL
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"use_mb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "use_mb")

programs/demos/use_mb/use_mb.asm

@@ -168,7 +168,7 @@ but_5:
   stdcall [mb_reinit],msgbox_5_2
   jmp still
 
-if lang eq ru
+if lang eq ru_RU
   txt1 db '<27><><EFBFBD><EFBFBD>⮥',0
   txt2 db '3 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
   txt3 db '3 <20><>ப<EFBFBD>',0
@@ -190,7 +190,7 @@ end if
 msgbox_1:
   dw 0
   db 'MBox',0 ;+2 = +MB_TEXT_OFFSET
-if lang eq ru
+if lang eq ru_RU
   db '<27>ਬ<EFBFBD><E0A8AC>',0
   db '<27><><EFBFBD><EFBFBD>',0 ;button1
 else
@@ -201,7 +201,7 @@ end if
 msgbox_2:
   dw 0
   db 'MBox 3 buttons',0 ;+2 = +MB_TEXT_OFFSET
-if lang eq ru
+if lang eq ru_RU
   db '<27>ਬ<EFBFBD><E0A8AC> <20> 3-<2D><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0
   db '<27><>',0 ;button1
   db '<27>⬥<EFBFBD><E2ACA5>',0 ;button2
@@ -219,7 +219,7 @@ msgbox_2_funct:
 msgbox_3:
   dw 0
   db 'MBox 3 lines',0 ;+2 = +MB_TEXT_OFFSET
-if lang eq ru
+if lang eq ru_RU
   db '<27><>ப<EFBFBD> 1',13,'<27><>ப<EFBFBD> 2',13,'<27><>ப<EFBFBD> 3',0
   db '2020 <20>.',0 ;button1
 else
@@ -229,7 +229,7 @@ end if
   db 0
 msgbox_4:
   dw 0
-if lang eq ru
+if lang eq ru_RU
   db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>',0 ;+2 = +MB_TEXT_OFFSET
 else
   db 'Select day',0 ;+2 = +MB_TEXT_OFFSET
@@ -253,7 +253,7 @@ end if
   db '       @......@....@..@....@.....@@..@',13
   db '       @......@....@..@....@.........@',13
   db '        @@@@@@@@@@@@@@@@@@@@@@@@@@@@@',0
-if lang eq ru
+if lang eq ru_RU
   db '<27><>',0,'<27><>',0,'<27><>',0,'<27><>',0,'<27><>',0,'<27><>',0,'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᥭ<EFBFBD><E1A5AD>',0
 else
   db 'Sun',0,'Mon',0,'Tue',0,'Wed',0,'Thu',0,'Fri',0,'Sat',0
@@ -261,7 +261,7 @@ end if
   db 0
 msgbox_5:
   dw 0
-if lang eq ru
+if lang eq ru_RU
   db '<27><><EFBFBD><EFBFBD>饭<EFBFBD><E9A5AD>',0 ;+2 = +MB_TEXT_OFFSET
   db '<27>믮<EFBFBD><EBAFAE><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ...',0
   db '<27><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD><EFBFBD>',0
@@ -275,7 +275,7 @@ end if
   db 0
 msgbox_5_2:
   dw 0
-if lang eq ru
+if lang eq ru_RU
   db '<27><><EFBFBD><EFBFBD>饭<EFBFBD><E9A5AD>',0 ;+2 = +MB_TEXT_OFFSET
   db '<27><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>祭<EFBFBD>',0
   db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>',0
@@ -326,7 +326,7 @@ fun_show_help:
   call draw_square
   ret
 sh_help db 0
-if lang eq ru
+if lang eq ru_RU
 txt_help db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...'
 else
 txt_help db 'Help...'

programs/develop/SPForth/meforth.ASM

@@ -100,7 +100,7 @@ MEMS: 	dd     EM       ; memory for app
 	dd     params
 	dd     cur_dir_path
 
- lang fix ru
+ lang fix ru_RU
  include 'macros.inc'
  include 'proc32.inc'
 

programs/develop/cObj/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"cObj.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cObj")

programs/develop/cObj/trunk/build_en.bat

@@ -1,4 +1,4 @@
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm cObj.asm cObj
 @kpack cObj
 @erase lang.inc

programs/develop/cObj/trunk/build_ru.bat

@@ -1,4 +1,4 @@
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm cObj.asm cObj
 @kpack cObj
 @erase lang.inc

programs/develop/examples/clipboard/build.bat

@@ -1,4 +1,4 @@
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm.exe -m 16384 clip_put.asm clip_put
 @fasm.exe -m 16384 clip_get.asm clip_get
 @erase lang.inc

programs/develop/examples/cpuspeed/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfi
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"cpuspeed.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cpuspeed")

programs/develop/examples/cpuspeed/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm cpuspeed.asm cpuspeed
 @erase lang.inc
 @pause

programs/develop/examples/cpuspeed/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm cpuspeed.asm cpuspeed
 @erase lang.inc
 @pause

programs/develop/examples/example/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm example.asm example
 @erase lang.inc
 @pause

programs/develop/examples/example/trunk/rus/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm example.asm example
 @erase lang.inc
 @pause

programs/develop/examples/example2/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfi
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"example2.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "example2")

programs/develop/examples/example2/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm example2.asm example2
 @erase lang.inc
 @pause

programs/develop/examples/example2/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm example2.asm example2
 @erase lang.inc
 @pause

programs/develop/examples/example3/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfi
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"example3.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "example3")

programs/develop/examples/example3/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm example3.asm example3
 @erase lang.inc
 @pause

programs/develop/examples/example3/trunk/build_ru.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix ru >lang.inc
+@echo lang fix ru_RU >lang.inc
 @fasm example3.asm example3
 @erase lang.inc
 @pause

programs/develop/examples/example3/trunk/example3.asm

@@ -196,7 +196,7 @@ draw_data:
 x_size:       dd 381               ; window x size
 y_size:       dd 200               ; window y size
 
-if lang eq ru
+if lang eq ru_RU
 window_text   db '<27>ਬ<EFBFBD><E0A8AC> <20><><EFBFBD><EFBFBD>',0
 button_no     db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> N:'
 else
@@ -210,7 +210,7 @@ main_menu_Edit dd 0
 main_menu_Test dd 0
 main_menu_Help dd 0
 
-if lang eq ru
+if lang eq ru_RU
 
 sz_File db '<27><><EFBFBD><EFBFBD>',0
 sz_Load db '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',0

programs/develop/examples/hello/trunk/Tupfile.lua

@@ -3,5 +3,5 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfi
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
 tup.rule({"hello.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "hello")

programs/develop/examples/hello/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en >lang.inc
+@echo lang fix en_US >lang.inc
 @fasm hello.asm hello
 @erase lang.inc
 @pause