Krn: The fdd driver code has been cleared and unused files have been deleted

data/Tupfile.lua

@@ -884,17 +884,13 @@ for i,v in ipairs(img_files) do
     if tup.getconfig("INSERT_COMMIT_ID") ~= ""
     then
       if build_type == "ru_RU"
-      then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, $(get-current-cmtid|grep -oE [a-z0-9]{7}$)]"|iconv -f utf8 -t cp866)'
+      then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(get-current-cmtid)]"|iconv -f utf8 -t cp866)'
-      else str='$(date -u +"[auto-build %d %b %Y %R, $(get-current-cmtid|grep -oE [a-z0-9]{7}$)]")'
+      else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-cmtid)]")'
       end
       str = string.gsub(str, "%$", "\\$") -- escape $ as \$
       str = string.gsub(str, "%%", "%%%%") -- escape % as %%
       cmd += " && str=" .. str
       cmd += ' && echo -n $str | dd status=none of=%o bs=1 seek=`expr 274 - length "$str"` conv=notrunc'
-      str2='$(get-current-cmtid|grep -oE "\\+[0-9]+")'
-      str2 = string.gsub(str2, "%$", "\\$") -- escape $ as \$
-      cmd += " && str2=" .. str2
-      cmd += ' && echo -n $str2 | dd status=none of=%o bs=1 seek=216 conv=notrunc'
     end
     local_file = VAR_KERNEL .. "/.kernel.mnt"
     tup.definerule{inputs = {v[2]}, command = cmd, outputs = {local_file}}

data/ca_ES/lang.inc

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

data/ca_ES/settings/kolibri.lbl

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

data/en_US/lang.inc

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

data/en_US/settings/kolibri.lbl

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

data/es_ES/lang.inc

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

data/es_ES/settings/kolibri.lbl

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

data/et_EE/lang.inc

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

data/et_EE/settings/kolibri.lbl

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

data/it_IT/lang.inc

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

data/it_IT/settings/kolibri.lbl

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

data/ru_RU/lang.inc

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

data/ru_RU/settings/kolibri.lbl

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

kernel/trunk/blkdev/flp_drv.inc

@@ -12,13 +12,6 @@
 ; Source code author -  Kulakov Vladimir Gennadievich.
 ; Adaptation and improvement -  Mario79.
 
-give_back_application_data_1:
-        mov     esi, FDD_BUFF;FDD_DataBuffer  ;0x40000
-        mov     ecx, 128
-        cld
-        rep movsd
-        ret
-
 take_data_from_application_1:
         mov     edi, FDD_BUFF;FDD_DataBuffer  ;0x40000
         mov     ecx, 128
@@ -717,18 +710,38 @@ endg
 ; This function is called in boot process.
 ; It creates filesystems /fd and/or /fd2, if the system has one/two floppy drives.
 proc floppy_init
+;      search for FDDs and add them to the list of disks
+;      author - Mario79
+        mov     al, 0x10
+        out     0x70, al
+        mov     cx, 0xff
+.wait_cmos:
+        dec     cx
+        test    cx, cx
+        jnz     .wait_cmos
+        in      al, 0x71
+        test    al, al
+        jz      .no_fdd
+
+        push    eax ; b[esp]=al [esp+1..3]- ??
+
+        stdcall attach_int_handler, 6, FDCInterrupt, 0
+        DEBUGF  1, "K : Set Floppy IRQ6 return code %x\n", eax
+
         mov     ecx, floppy_mutex
         call    mutex_init
-; First floppy is present if [DRIVE_DATA] and 0xF0 is nonzero.
+; First floppy is present if [esp] and 0xF0 is nonzero.
-        test    byte [DRIVE_DATA], 0xF0
+        test    byte [esp], 0xF0
         jz      .no1
         stdcall disk_add, floppy_functions, floppy1_name, 1, DISK_NO_INSERT_NOTIFICATION
 .no1:
-; Second floppy is present if [DRIVE_DATA] and 0x0F is nonzero.
+; Second floppy is present if [esp] and 0x0F is nonzero.
-        test    byte [DRIVE_DATA], 0x0F
+        test    byte [esp], 0x0F
         jz      .no2
         stdcall disk_add, floppy_functions, floppy2_name, 2, DISK_NO_INSERT_NOTIFICATION
 .no2:
+        add     esp, 4
+.no_fdd:
         ret
 endp
 

kernel/trunk/boot/bootcode.inc

@@ -315,7 +315,7 @@ end if
         int     0x10
 
 if lang eq ru_RU
-        ; Load & set Russian VGA font 'bootfont-ru_RU'
+ ; Load & set russian VGA font (RU.INC)
         mov     bp, RU_FNT1             ; RU_FNT1 - First part
         mov     bx, 1000h               ; 768 bytes
         mov     cx, 30h                 ; 48 symbols
@@ -329,8 +329,8 @@ if lang eq ru_RU
         mov     dx, 0E0h                ; 224 - position of first symbol
         mov     ax, 1100h
         int     10h
+ ; End set VGA russian font
 else if lang eq et_EE
-        ; Load & set Estonian VGA font 'bootfont-et_EE'
         mov     bp, ET_FNT              ; ET_FNT1
         mov     bx, 1000h               ;
         mov     cx, 255                 ; 256 symbols

kernel/trunk/bootbios.inc

@@ -24,25 +24,24 @@ org 0
         ; struct kernel_header
         jmp     start_of_code   ; jump
         db      'KolibriOS '    ; signature
-        db      'v0.7.7.0      ',13,10,13,10,0  ; FIXME: get distribution version from git tag
+        db      'v0.7.7.0+     ',13,10,13,10,0  ; version
         dd      B32-KERNEL_BASE ; offset of the kernel's 32-bit entry point
 
 include "boot/bootstr.inc"      ; language-independent boot messages
 include "boot/preboot.inc"
 
-; Language support for locales: de_DE, es_ES, ru_RU (CP866), et_EE, en_US.
 if lang eq de_DE
-        include "boot/bootstr-de_DE.inc"        ; German system boot messages
+include "boot/bootge.inc"       ; german system boot messages
 else if lang eq es_ES
-        include "boot/bootstr-es_ES.inc"        ; Spanish system boot messages
+include "boot/bootsp.inc"       ; spanish system boot messages
 else if lang eq ru_RU
-        include "boot/bootstr-ru_RU.inc"        ; Russian system boot messages
+include "boot/bootru.inc"       ; russian system boot messages
-        include "boot/bootfont-ru_RU.inc"       ; Russian font
+include "boot/ru.inc"           ; Russian font
 else if lang eq et_EE
-        include "boot/bootstr-et_EE.inc"        ; Estonian system boot messages
+include "boot/bootet.inc"       ; estonian system boot messages
-        include "boot/bootfont-et_EE.inc"       ; Estonian font
+include "boot/et.inc"           ; Estonian font
 else
-        include "boot/bootstr-en_US.inc"        ; English system boot messages (default)
+include "boot/booten.inc"       ; english system boot messages
 end if
 
 include "boot/bootcode.inc"     ; 16 bit system boot code

kernel/trunk/build.bat

@@ -12,7 +12,7 @@ goto :eof
 
 :Target_kernel
    rem valid languages: en ru ge et sp
-   set lang=en
+   set lang=en_US
 
    echo *** building kernel with language '%lang%' ...
 

kernel/trunk/data32.inc

@@ -45,7 +45,6 @@ keymap_alt:
      db   'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 
-; Language support for locales: ru_RU (UTF-8), es_ES (data32sp.inc), et_EE (data32et.inc), en_US.
 
 if lang eq ru_RU
   boot_initirq      cp866 'Инициализация IRQ',0
@@ -93,7 +92,7 @@ else if lang eq es_ES
   include 'data32sp.inc'
 else if lang eq et_EE
   include 'data32et.inc'
-else ; Default to en_US
+else
   boot_initirq      db   'Initialize IRQ',0
   boot_picinit      db   'Initialize PIC',0
   boot_v86machine   db   'Initialize system V86 machine',0
@@ -199,27 +198,27 @@ MIN_DEFAULT_DLL_ADDR = 0x70000000
 dll_cur_addr   dd MIN_DEFAULT_DLL_ADDR
 
 
-if lang eq en_US        ; English (American)
+if lang eq en_US
   SYSLANG = 1
-else if lang eq fi_FI   ; Finnish
+else if lang eq fi_FI
   SYSLANG = 2
-else if lang eq de_DE   ; German
+else if lang eq de_DE
   SYSLANG = 3
-else if lang eq ru_RU   ; Russian
+else if lang eq ru_RU
   SYSLANG = 4
-else if lang eq fr_FR   ; French
+else if lang eq fr_FR
   SYSLANG = 5
-else if lang eq et_EE   ; Estonian
+else if lang eq et_EE
   SYSLANG = 6
-else if lang eq uk_UA   ; Ukrainian
+else if lang eq uk_UA
   SYSLANG = 7
-else if lang eq it_IT   ; Italian
+else if lang eq it_IT
   SYSLANG = 8
-else if lang eq nl_BE   ; Flemish
+else if lang eq nl_BE
   SYSLANG = 9
-else if lang eq es_ES   ; Spanish
+else if lang eq es_ES
   SYSLANG = 10
-else if lang eq ca_ES   ; Catalan
+else if lang eq ca_ES
   SYSLANG = 11
 else
   display 'unsupported language specified',13,10

kernel/trunk/detect/dev_fd.inc

@@ -1,36 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-;***************************************************
-;      clear the DRIVE_DATA table,
-;      search for FDDs and add them into the table
-;      author - Mario79
-;***************************************************
-        xor     eax, eax
-        mov     edi, DRIVE_DATA
-        mov     ecx, DRIVE_DATA_SIZE/4
-        cld
-        rep stosd
-
-        mov     al, 0x10
-        out     0x70, al
-        mov     cx, 0xff
-wait_cmos:
-        dec     cx
-        test    cx, cx
-        jnz     wait_cmos
-        in      al, 0x71
-        mov     [DRIVE_DATA], al
-        test    al, al
-        jz      @f
-
-        stdcall attach_int_handler, 6, FDCInterrupt, 0
-        DEBUGF  1, "K : Set IDE IRQ6 return code %x\n", eax
-        call    floppy_init
-@@:
-

kernel/trunk/detect/disks.inc

@@ -1,13 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-
-include 'dev_fd.inc'
-include 'dev_hdcd.inc'
-include 'getcache.inc'
-include 'sear_par.inc'
-

kernel/trunk/detect/init_ata.inc

@@ -6,6 +6,13 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
+;      clear the DRIVE_DATA table
+;      author - Mario79
+        xor     eax, eax
+        mov     edi, DRIVE_DATA
+        mov     ecx, DRIVE_DATA_SIZE/4
+        cld
+        rep stosd
 ;-----------------------------------------------------------------------------
 ; find the IDE controller in the device list
 ;-----------------------------------------------------------------------------
@@ -46,7 +53,6 @@ align 4
         pop     eax
 @@:
         DEBUGF  1, 'K : BAR0 IDE base addr %x\n', dx
-        mov     [StandardATABases], dx
         mov     [ecx+IDE_DATA.BAR0_val], dx
 ;--------------------------------------
         mov     dx, 0x3F4
@@ -73,7 +79,6 @@ align 4
         pop     eax
 @@:
         DEBUGF  1, 'K : BAR2 IDE base addr %x\n', dx
-        mov     [StandardATABases+2], dx
         mov     [ecx+IDE_DATA.BAR2_val], dx
 ;--------------------------------------
         mov     dx, 0x374

kernel/trunk/kernel.asm

@@ -729,7 +729,7 @@ end if
 ;-----------------------------------------------------------------------------
         mov     esi, boot_detectfloppy
         call    boot_log
-include 'detect/dev_fd.inc'
+        call    floppy_init
 ;-----------------------------------------------------------------------------
 ; create pci-devices list
 ;-----------------------------------------------------------------------------
@@ -2288,7 +2288,7 @@ endg
 
 iglobal
 version_inf:
-        db 0,7,7,0  ; FIXME: Get distribution version from git tag
+        db 0,7,7,0  ; version 0.7.7.0
         db 0
 .rev    dd __REV__
 .size = $ - version_inf

kernel/trunk/kernelsp.inc

@@ -8,5 +8,5 @@
 
 ; Éste archivo debe ser editado con codificación CP866
 
-version  cp850    'KolibriOS  versión 0.7.7.0      ',13,10,13,10,0 ; FIXME: Get distribution version from git tag
+version  cp850    'KolibriOS  versión 0.7.7.0+     ',13,10,13,10,0
 diff16 "fin del código del kernel",0,$

programs/build_all.bat

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

programs/cmm/browser/build.sh

@@ -1,11 +1 @@
-../c--/c--.elf -OC -D=LANG_ENG WebView.c 
+../c--/c--.elf -D=LANG_ENG WebView.c
-rm -rf INSTALL.TXT
-rm -rf kolibri.img
-cp ~/Downloads/latest-img.7z ./
-p7zip -d latest-img.7z 
-sudo mount -o loop kolibri.img /media/floppy1/
-sudo rm -rf /media/floppy1/GAMES
-sudo rm -rf /media/floppy1/NETWORK/WEBVIEW
-sudo cp ./WebView.com /media/floppy1/NETWORK/WEBVIEW
-sudo umount /media/floppy1/ 
-echo "finished copying file"

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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_RU
+lang equ ru
 
 ;
 ;   Assembler

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

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

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

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_RU
+lang equ ru
 
 ;
 ;   Assembler

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

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

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

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix ru >lang.inc
 @fasm ScreenRuler.asm ScreenRuler
 @kpack ScreenRuler
 @erase lang.inc

programs/demos/ScreenRuler/ScreenRuler.asm

@@ -15,7 +15,7 @@
         dd      0x1000    ; esp
         dd      0, 0      ; no parameters, no path
 ;---------------------------------------------------------------------
-        include 'lang.inc' ; Language support for locales: ru_RU (UTF-8), en_US.
+        include 'lang.inc'
         include '..\..\macros.inc'
 
         delay   = 20
@@ -240,7 +240,7 @@ draw_magnify:
         ret
 
 ;------------------------- Data area
-if      lang eq ru_RU
+        if      lang eq ru
 labelt:
         db      3, 'Измеритель', 0
 start_pix:
@@ -256,7 +256,7 @@ measure_d:
 inf:
         db      'Нажмите пробел', 0
 
-else ; Default to en_US
+        else
 labelt:
         db      3, 'Ruler', 0
 start_pix:
@@ -273,7 +273,6 @@ inf:
         db      'Press Space', 0
 
          end if
-
 I_END:
         align   4
         magnify_area_start_x  dd ?

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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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 ; ru_RU en_US fr_FR de_DE fi_FI
+lang equ ru ; ru en fr ge fi
 
 ;
 ;   Assembler

programs/demos/life/trunk/build_en.bat

@@ -1,4 +1,4 @@
 @erase lang.inc
-@echo lang fix en_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix ru >lang.inc
 @fasm magnify.asm magnify
 @kpack magnify
 @erase lang.inc

programs/demos/magnify/trunk/magnify.asm

@@ -19,7 +19,7 @@
 	dd      0x1000                  ; esp
 	dd      0, 0                    ; no parameters, no path
 ;---------------------------------------------------------------------
-include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
+include 'lang.inc'
 include '..\..\..\macros.inc'
 delay   equ     20
 
@@ -134,10 +134,10 @@ draw_magnify:
 ;---------------------------------------------------------------------
 ; DATA AREA
 ;---------------------------------------------------------------------
-if lang eq ru_RU
+if lang eq ru
 labelt:
     db   'Magnifier - <20>ªà ­­ ï «ã¯ ', 0
-else ; Default to en_US
+else
 labelt:
     db   'Magnifier', 0
 end if

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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix ru >lang.inc
 @fasm timer.asm timer
 @erase lang.inc
 @pause

programs/demos/timer/trunk/timer.asm

@@ -16,7 +16,7 @@ use32
     dd     0x1000           ; esp
     dd     0x0 , 0x0        ; I_Param , I_Icon
 
-include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
+include 'lang.inc'
 include '..\..\..\macros.inc'
 
 START:                      ; start of execution
@@ -137,9 +137,9 @@ draw_window:
 
 ; DATA AREA
 
-if lang eq ru_RU
+if lang eq ru
     title   db   '’€‰Œ…<C592>',0
-else ; Default to en_US
+else
     title   db   'TIMER',0
 end if
 

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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_RU
+lang equ ru
 
 ;
 ;   Assembler

programs/demos/trantest/trunk/ascl.inc

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

programs/demos/trantest/trunk/build_en.bat

@@ -1,5 +1,5 @@
 @erase lang.inc
-@echo lang fix en_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US >lang.inc
+@echo lang fix en >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_RU >lang.inc
+@echo lang fix 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_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
+tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" 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_RU
+if lang eq ru
   txt1 db '¯à®á⮥',0
   txt2 db '3 ª­®¯ª¨',0
   txt3 db '3 áâப¨',0
@@ -190,7 +190,7 @@ end if
 msgbox_1:
   dw 0
   db 'MBox',0 ;+2 = +MB_TEXT_OFFSET
-if lang eq ru_RU
+if lang eq ru
   db '<27>ਬ¥à',0
   db '‚¨¦ã',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_RU
+if lang eq ru
   db '<27>ਬ¥à á 3-¬ï ª­®¯ª ¬¨',0
   db '„ ',0 ;button1
   db 'Žâ¬¥­ ',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_RU
+if lang eq ru
   db '‘âப  1',13,'‘âப  2',13,'‘âப  3',0
   db '2020 £.',0 ;button1
 else
@@ -229,7 +229,7 @@ end if
   db 0
 msgbox_4:
   dw 0
-if lang eq ru_RU
+if lang eq ru
   db '‚¢¥¤¨â¥ ¤¥­ì',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_RU
+if lang eq ru
   db '<27>­',0,'‚â',0,'‘à',0,'—â',0,'<27>â',0,'‘¡',0,'‚®áªà¥á¥­¨¥',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_RU
+if lang eq ru
   db '‘®®¡é¥­¨¥',0 ;+2 = +MB_TEXT_OFFSET
   db '‚믮«­ïî ¯à®æ¥áá ...',0
   db 'Žáâ ­®¢¨âì',0
@@ -275,7 +275,7 @@ end if
   db 0
 msgbox_5_2:
   dw 0
-if lang eq ru_RU
+if lang eq ru
   db '‘®®¡é¥­¨¥',0 ;+2 = +MB_TEXT_OFFSET
   db '‚ᥠ§ ª®­ç¥­®',0
   db '‡ ªàëâì ®ª­®',0
@@ -326,7 +326,7 @@ fun_show_help:
   call draw_square
   ret
 sh_help db 0
-if lang eq ru_RU
+if lang eq ru
 txt_help db '<27>®¬®éì...'
 else
 txt_help db 'Help...'