Eolite: provide label for NVMe disks on left panel

Signed-off-by: Serhii Sakhno <serhii.sakhno.jr@gmail.com>
Merge pull request 'Extra comma in ksys.h' (#79 ) from Egor00f/kolibrios:main into main
2024-08-01 22:29:57 +03:00 · 2024-07-23 00:41:58 +02:00 · 2024-07-22 22:18:31 +00:00 · 2024-07-17 20:42:05 +02:00 · 2024-07-17 18:00:55 +05:00 · 2024-07-11 09:00:28 +01:00
608 changed files with 63086 additions and 62269 deletions
--- a/build.txt
+++ b/build.txt
@ -31,10 +31,11 @@ A1. Fine. You will need a corresponding compiler, obviously.
    If the compiler produces an error "file not found" regarding 'lang.inc',
    the program can be compiled using different languages of interface.
    Create a file 'lang.inc' in the same folder as <input.asm> like follows:
-        lang fix en
+        lang fix en_US
    Here the last word selects the language. Valid languages are
-    en, ru, et, it, sp. Not all programs provide all translations,
-    en should always be available, ru is the most frequent after en.
+    en_US, ru_RU, et_EE, it_IT, es_ES, ca_ES. Not all programs provide all
+    translations, en_US should always be available, ru_RU is the most frequent
+    after en_US.

  * For a NASM program, get NASM at http://www.nasm.us/.
    To compile, find the main .asm file of the program and run
@ -42,7 +43,7 @@ A1. Fine. You will need a corresponding compiler, obviously.
    Multi-language is rarely supported in this category, but you could still
    see sometimes an error "file not found" regarding 'lang_nasm.inc'. If so,
    create a file 'lang_nasm.inc' in the same folder as <input.asm> like follows:
-        %define lang 'en'
+        %define lang 'en_US'
    Read the entry about fasm for description of valid languages.

  * For a c-- program, try to avoid compiling it and instead rewrite the code
--- a/contrib/sdk/sources/newlib/libc/include/sys/ksys.h
+++ b/contrib/sdk/sources/newlib/libc/include/sys/ksys.h
@ -1223,7 +1223,7 @@ KOSAPI void _ksys_debug_puts(const char* s)
 KOSAPI void ksys_draw_bitmap_palette(void* bitmap, int x, int y, int w, int h, int bpp, void* palette, int offset)
 {
    asm_inline(
-        "pushl %%ebp,\n\t"            // save EBP register
+        "pushl %%ebp\n\t"               // save EBP register
        "movl 0x24(%%ebp), %%ebp\n\t"   // 0x24 - "offset" param
        "int $0x40\n\t"
        "popl %%ebp"    // restore EBP register
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@ -884,13 +884,17 @@ 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, r$(get-current-cmtid)]"|iconv -f utf8 -t cp866)'
-      else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-cmtid)]")'
+      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)'
+      else str='$(date -u +"[auto-build %d %b %Y %R, $(get-current-cmtid|grep -oE [a-z0-9]{7}$)]")'
      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}}
--- a/data/ca_ES/lang.inc
+++ b/data/ca_ES/lang.inc
@ -1 +1 @@
-lang fix ca
+lang fix ca_ES
--- a/data/ca_ES/settings/kolibri.lbl
+++ b/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! :-)
--- a/data/en_US/lang.inc
+++ b/data/en_US/lang.inc
@ -1 +1 @@
-lang fix en
+lang fix en_US
--- a/data/en_US/settings/kolibri.lbl
+++ b/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! :-)
--- a/data/es_ES/lang.inc
+++ b/data/es_ES/lang.inc
@ -1 +1 @@
-lang fix sp
+lang fix es_ES
--- a/data/es_ES/settings/kolibri.lbl
+++ b/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! :-)
--- a/data/et_EE/lang.inc
+++ b/data/et_EE/lang.inc
@ -1 +1 @@
-lang fix et
+lang fix et_EE
--- a/data/et_EE/settings/kolibri.lbl
+++ b/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! :-)
--- a/data/it_IT/lang.inc
+++ b/data/it_IT/lang.inc
@ -1 +1 @@
-lang fix it
+lang fix it_IT
--- a/data/it_IT/settings/kolibri.lbl
+++ b/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! :-)
--- a/data/ru_RU/lang.inc
+++ b/data/ru_RU/lang.inc
@ -1 +1 @@
-lang fix ru
+lang fix ru_RU
--- a/data/ru_RU/settings/kolibri.lbl
+++ b/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! :-)
--- a/kernel/trunk/Makefile
+++ b/kernel/trunk/Makefile
@ -1,6 +1,6 @@
 FASM=fasm
 FLAGS=-m 65536
-languages=en|ru|ge|et|sp
+languages=en_US|ru_RU|de_DE|et_EE|es_ES

 .PHONY: all kernel bootloader clean

--- a/kernel/trunk/boot/bootcode.inc
+++ b/kernel/trunk/boot/bootcode.inc
@ -315,7 +315,7 @@ end if
        int     0x10

 if lang eq ru_RU
- ; Load & set russian VGA font (RU.INC)
+        ; Load & set Russian VGA font 'bootfont-ru_RU'
        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
--- a/kernel/trunk/boot/bootfont-et_EE.inc
+++ b/kernel/trunk/boot/bootfont-et_EE.inc
--- a/kernel/trunk/boot/bootfont-ru_RU.inc
+++ b/kernel/trunk/boot/bootfont-ru_RU.inc
--- a/kernel/trunk/boot/bootstr-de_DE.inc
+++ b/kernel/trunk/boot/bootstr-de_DE.inc
--- a/kernel/trunk/boot/bootstr-en_US.inc
+++ b/kernel/trunk/boot/bootstr-en_US.inc
--- a/kernel/trunk/boot/bootstr-es_ES.inc
+++ b/kernel/trunk/boot/bootstr-es_ES.inc
--- a/kernel/trunk/boot/bootstr-et_EE.inc
+++ b/kernel/trunk/boot/bootstr-et_EE.inc
--- a/kernel/trunk/boot/bootstr-ru_RU.inc
+++ b/kernel/trunk/boot/bootstr-ru_RU.inc
--- a/kernel/trunk/bootbios.inc
+++ b/kernel/trunk/bootbios.inc
@ -24,24 +24,25 @@ org 0
        ; struct kernel_header
        jmp     start_of_code   ; jump
        db      'KolibriOS '    ; signature
-        db      'v0.7.7.0+     ',13,10,13,10,0  ; version
+        db      'v0.7.7.0      ',13,10,13,10,0  ; FIXME: get distribution version from git tag
        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/bootge.inc"       ; german system boot messages
+        include "boot/bootstr-de_DE.inc"        ; German system boot messages
 else if lang eq es_ES
-include "boot/bootsp.inc"       ; spanish system boot messages
+        include "boot/bootstr-es_ES.inc"        ; Spanish system boot messages
 else if lang eq ru_RU
-include "boot/bootru.inc"       ; russian system boot messages
-include "boot/ru.inc"           ; Russian font
+        include "boot/bootstr-ru_RU.inc"        ; Russian system boot messages
+        include "boot/bootfont-ru_RU.inc"       ; Russian font
 else if lang eq et_EE
-include "boot/bootet.inc"       ; estonian system boot messages
-include "boot/et.inc"           ; Estonian font
+        include "boot/bootstr-et_EE.inc"        ; Estonian system boot messages
+        include "boot/bootfont-et_EE.inc"       ; Estonian font
 else
-include "boot/booten.inc"       ; english system boot messages
+        include "boot/bootstr-en_US.inc"        ; English system boot messages (default)
 end if

 include "boot/bootcode.inc"     ; 16 bit system boot code
--- a/kernel/trunk/build.bat
+++ b/kernel/trunk/build.bat
@ -11,8 +11,8 @@ pause
 goto :eof

 :Target_kernel
-   rem valid languages: en ru ge et sp
-   set lang=en
+   rem valid languages: en_US ru_RU de_DE et_EE es_ES
+   set lang=en_US

   echo *** building kernel with language '%lang%' ...

--- a/kernel/trunk/build.sh
+++ b/kernel/trunk/build.sh
@ -6,7 +6,7 @@ KERPACK=$HOME/kolibrios/programs/other/kpack/kerpack_linux/kerpack
 KOLIBRI_IMG=$HOME/nightly/kolibri.img

 replace=0; # Replace kernel in the image file?
-echo 'lang fix en' > lang.inc
+echo 'lang fix en_US' > lang.inc
 fasm -m 65536 bootbios.asm bootbios.bin
 fasm -m 65536 kernel.asm kernel.mnt
 $KERPACK kernel.mnt kernel.mnt
--- a/kernel/trunk/data32.inc
+++ b/kernel/trunk/data32.inc
@ -45,6 +45,7 @@ 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
@ -92,7 +93,7 @@ else if lang eq es_ES
  include 'data32sp.inc'
 else if lang eq et_EE
  include 'data32et.inc'
-else
+else ; Default to en_US
  boot_initirq      db   'Initialize IRQ',0
  boot_picinit      db   'Initialize PIC',0
  boot_v86machine   db   'Initialize system V86 machine',0
@ -198,27 +199,27 @@ MIN_DEFAULT_DLL_ADDR = 0x70000000
 dll_cur_addr   dd MIN_DEFAULT_DLL_ADDR


-if lang eq en_US
+if lang eq en_US        ; English (American)
  SYSLANG = 1
-else if lang eq fi_FI
+else if lang eq fi_FI   ; Finnish
  SYSLANG = 2
-else if lang eq de_DE
+else if lang eq de_DE   ; German
  SYSLANG = 3
-else if lang eq ru_RU
+else if lang eq ru_RU   ; Russian
  SYSLANG = 4
-else if lang eq fr_FR
+else if lang eq fr_FR   ; French
  SYSLANG = 5
-else if lang eq et_EE
+else if lang eq et_EE   ; Estonian
  SYSLANG = 6
-else if lang eq uk_UA
+else if lang eq uk_UA   ; Ukrainian
  SYSLANG = 7
-else if lang eq it_IT
+else if lang eq it_IT   ; Italian
  SYSLANG = 8
-else if lang eq nl_BE
+else if lang eq nl_BE   ; Flemish
  SYSLANG = 9
-else if lang eq es_ES
+else if lang eq es_ES   ; Spanish
  SYSLANG = 10
-else if lang eq ca_ES
+else if lang eq ca_ES   ; Catalan
  SYSLANG = 11
 else
  display 'unsupported language specified',13,10
--- a/kernel/trunk/kernel.asm
+++ b/kernel/trunk/kernel.asm
@ -2288,7 +2288,7 @@ endg

 iglobal
 version_inf:
-        db 0,7,7,0  ; version 0.7.7.0
+        db 0,7,7,0  ; FIXME: Get distribution version from git tag
        db 0
 .rev    dd __REV__
 .size = $ - version_inf
--- a/kernel/trunk/kernelsp.inc
+++ b/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
+version  cp850    'KolibriOS  versión 0.7.7.0      ',13,10,13,10,0 ; FIXME: Get distribution version from git tag
 diff16 "fin del código del kernel",0,$
--- a/programs/build_all.bat
+++ b/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

--- a/programs/cmm/eolite/include/const.h
+++ b/programs/cmm/eolite/include/const.h
@ -62,6 +62,7 @@ char *actions[] = {
 #define T_FD   "„¨áª¥â  "
 #define T_HD   "†¥áâª¨© ¤¨áª "
 #define T_SATA "SATA ¤¨áª "
+#define T_NVME "NVMe disk "
 #define T_USB  "USB ¤¨áª "
 #define T_RAM  "RAM ¤¨áª "
 #define T_UNC  "<22>¥¨§¢¥áâ® "
@ -160,6 +161,7 @@ char *actions[] = {
 #define T_FD   "Floppy disk "
 #define T_HD   "Hard disk "
 #define T_SATA "SATA disk "
+#define T_NVME "NVMe disk "
 #define T_USB  "USB disk "
 #define T_RAM  "RAM disk "
 #define T_UNC  "Unknown "
@ -252,6 +254,7 @@ char *devinfo = {
 	"hd", 4, T_HD,
 	"bd", 4, T_HD,
 	"sd", 4, T_SATA,
+	"nv", 4, T_NVME,
 	"tm", 5, T_RAM,
 	"us", 6, T_USB,
 	0
--- a/programs/demos/3dcube2/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/3dcube2/trunk/ascgl.inc
+++ b/programs/demos/3dcube2/trunk/ascgl.inc
@ -1,4 +1,4 @@
-lang equ ru
+lang equ ru_RU

 ;
 ;   Assembler
--- a/programs/demos/3dcube2/trunk/ascl.inc
+++ b/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
--- a/programs/demos/3dcube2/trunk/build_en.bat
+++ b/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
--- a/programs/demos/3dcube2/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/3detx60b/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/3detx60b/trunk/ascgl.inc
+++ b/programs/demos/3detx60b/trunk/ascgl.inc
@ -1,4 +1,4 @@
-lang equ ru
+lang equ ru_RU

 ;
 ;   Assembler
--- a/programs/demos/3detx60b/trunk/ascl.inc
+++ b/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
--- a/programs/demos/3detx60b/trunk/build_en.bat
+++ b/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
--- a/programs/demos/3detx60b/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/3dtcub10/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/3dtcub10/trunk/build_en.bat
+++ b/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
--- a/programs/demos/3dtcub10/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/ScreenRuler/BUILD_EN.BAT
+++ b/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
--- a/programs/demos/ScreenRuler/BUILD_RU.BAT
+++ b/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
--- a/programs/demos/ScreenRuler/ScreenRuler.asm
+++ b/programs/demos/ScreenRuler/ScreenRuler.asm
@ -15,7 +15,7 @@
        dd      0x1000    ; esp
        dd      0, 0      ; no parameters, no path
 ;---------------------------------------------------------------------
-        include 'lang.inc'
+        include 'lang.inc' ; Language support for locales: ru_RU (UTF-8), en_US.
        include '..\..\macros.inc'

        delay   = 20
@ -240,7 +240,7 @@ draw_magnify:
        ret

 ;------------------------- Data area
-        if      lang eq ru
+if      lang eq ru_RU
 labelt:
        db      3, 'Измеритель', 0
 start_pix:
@ -256,7 +256,7 @@ measure_d:
 inf:
        db      'Нажмите пробел', 0

-        else
+else ; Default to en_US
 labelt:
        db      3, 'Ruler', 0
 start_pix:
@ -273,6 +273,7 @@ inf:
        db      'Press Space', 0

 end if
+
 I_END:
        align   4
        magnify_area_start_x  dd ?
--- a/programs/demos/ScreenRuler/Tupfile.lua
+++ b/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")
--- a/programs/demos/bcdclk/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/bcdclk/trunk/build_en.bat
+++ b/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
--- a/programs/demos/bcdclk/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/colorref/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/colorref/trunk/build_en.bat
+++ b/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
--- a/programs/demos/colorref/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/crownscr/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/crownscr/trunk/build_en.bat
+++ b/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
--- a/programs/demos/crownscr/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/cslide/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/cslide/trunk/build_en.bat
+++ b/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
--- a/programs/demos/cslide/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/eyes/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/eyes/trunk/build_en.bat
+++ b/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
--- a/programs/demos/eyes/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/free3d04/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/free3d04/trunk/build_en.bat
+++ b/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
--- a/programs/demos/free3d04/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/life/trunk/ascl.inc
+++ b/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
--- a/programs/demos/life/trunk/build_en.bat
+++ b/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
--- a/programs/demos/life/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/magnify/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/magnify/trunk/build_en.bat
+++ b/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
--- a/programs/demos/magnify/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/magnify/trunk/magnify.asm
+++ b/programs/demos/magnify/trunk/magnify.asm
@ -19,7 +19,7 @@
 	dd      0x1000                  ; esp
 	dd      0, 0                    ; no parameters, no path
 ;---------------------------------------------------------------------
-include 'lang.inc'
+include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
 include '..\..\..\macros.inc'
 delay   equ     20

@ -134,10 +134,10 @@ draw_magnify:
 ;---------------------------------------------------------------------
 ; DATA AREA
 ;---------------------------------------------------------------------
-if lang eq ru
+if lang eq ru_RU
 labelt:
    db   'Magnifier - <20>ªà  ï «ã¯ ', 0
-else
+else ; Default to en_US
 labelt:
    db   'Magnifier', 0
 end if
--- a/programs/demos/movback/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/movback/trunk/build_en.bat
+++ b/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
--- a/programs/demos/movback/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/plasma/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/plasma/trunk/build_en.bat
+++ b/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
--- a/programs/demos/plasma/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/ray/Tupfile.lua
+++ b/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")
--- a/programs/demos/timer/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/timer/trunk/build_en.bat
+++ b/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
--- a/programs/demos/timer/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/timer/trunk/timer.asm
+++ b/programs/demos/timer/trunk/timer.asm
@ -16,7 +16,7 @@ use32
    dd     0x1000           ; esp
    dd     0x0 , 0x0        ; I_Param , I_Icon

-include 'lang.inc'
+include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
 include '..\..\..\macros.inc'

 START:                      ; start of execution
@ -137,9 +137,9 @@ draw_window:

 ; DATA AREA

-if lang eq ru
+if lang eq ru_RU
    title   db   '’€‰Œ…<C592>',0
-else
+else ; Default to en_US
    title   db   'TIMER',0
 end if

--- a/programs/demos/tinyfrac/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/tinyfrac/trunk/build_en.bat
+++ b/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
--- a/programs/demos/tinyfrac/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/transp/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/transp/trunk/build_en.bat
+++ b/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
--- a/programs/demos/transp/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/trantest/trunk/Tupfile.lua
+++ b/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")
--- a/programs/demos/trantest/trunk/ascgl.inc
+++ b/programs/demos/trantest/trunk/ascgl.inc
@ -1,4 +1,4 @@
-lang equ ru
+lang equ ru_RU

 ;
 ;   Assembler
--- a/programs/demos/trantest/trunk/ascl.inc
+++ b/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
--- a/programs/demos/trantest/trunk/build_en.bat
+++ b/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
--- a/programs/demos/trantest/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/tube/trunk/build_en.bat
+++ b/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
--- a/programs/demos/tube/trunk/build_ru.bat
+++ b/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
--- a/programs/demos/use_mb/Tupfile.lua
+++ b/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")
--- a/programs/demos/use_mb/use_mb.asm
+++ b/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 '¯à®áâ®¥',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
+if lang eq ru_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
+if lang eq ru_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
+if lang eq ru_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
+if lang eq ru_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
+if lang eq ru_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
+if lang eq ru_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
+if lang eq ru_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
+if lang eq ru_RU
 txt_help db '<27>®¬®éì...'
 else
 txt_help db 'Help...'
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Serhii Sakhno	975284f5f3	Eolite: provide label for NVMe disks on left panel Signed-off-by: Serhii Sakhno <serhii.sakhno.jr@gmail.com>	2024-08-01 22:29:57 +03:00
Gleb Zaharov	8ece779b4b	Merge pull request 'Extra comma in ksys.h' (#79 ) from Egor00f/kolibrios:main into main Reviewed-on: #79 Reviewed-by: Gleb Zaharov <sweetbread@coders-squad.com>	2024-07-23 00:41:58 +02:00
Egor00f	a218a83bd5	Fix ksys.h Extra comma in ksys_draw_bitmap_palette function	2024-07-22 22:18:31 +00:00
Mikhail Frolov	c762489408	Merge pull request 'Correction of error' (#80 ) from Spaceraven/kolibrios:main into main Reviewed-on: #80 Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com>	2024-07-17 20:42:05 +02:00
Spaceraven	3d02856efe	Correction of error	2024-07-17 18:00:55 +05:00
Ivan Baravy	4a166ede82	Another fix for locale names	2024-07-11 09:00:28 +01:00
Ivan Baravy	46e816c366	Fix locale codes for kernel build scripts	2024-07-10 17:42:26 +01:00
Ivan Baravy	65239bc359	[taskbar] Fix context menu strings	2024-07-10 05:02:08 +01:00
Andrew	f222e98a09	All: Update locale codes (Part 2) (#76 ) - Update language codes and add comments. - Correct `en_US` translations. - Some whitespace clean-up (mainly EOL sanitation). Reviewed-on: #76 Co-authored-by: Andrew <dent.ace@gmail.com> Co-committed-by: Andrew <dent.ace@gmail.com>	2024-06-14 10:35:46 +02:00
IgorA	c0324e5907	Обновить programs/media/animage/trunk/menu_instruments.inc animage use system buffer ClipBoard from Copy \| Paste	2024-06-09 21:19:46 +02:00
Andrew	415eaef8db	[Boot] Update for locales - Fixes for new locale codes. - Some whitespace clean-up. Reviewed-on: #73 Reviewed-by: Gleb Zaharov <sweetbread@coders-squad.com>	2024-06-05 13:45:06 +02:00
Andrew	4f08d0ad8b	[Boot] Update for locales - Fixes for new locale codes. - Some whitespace clean-up.	2024-06-05 10:00:06 +01:00
Ivan Baravy	b6a0bf7729	Fix autobuild text on the blue boot screen	2024-06-03 04:03:51 +01:00
Ivan Baravy	412e42a342	Most of language code fixes	2024-06-03 00:34:02 +01:00