From 412e42a34235e9a3e0954985fdd2f838a7b07c96 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Mon, 3 Jun 2024 00:34:02 +0100 Subject: [PATCH] Most of language code fixes --- data/ca_ES/lang.inc | 2 +- data/ca_ES/settings/kolibri.lbl | 2 +- data/en_US/lang.inc | 2 +- data/en_US/settings/kolibri.lbl | 4 +- data/es_ES/lang.inc | 2 +- data/es_ES/settings/kolibri.lbl | 4 +- data/et_EE/lang.inc | 2 +- data/et_EE/settings/kolibri.lbl | 4 +- data/it_IT/lang.inc | 2 +- data/it_IT/settings/kolibri.lbl | 4 +- data/ru_RU/lang.inc | 2 +- data/ru_RU/settings/kolibri.lbl | 4 +- programs/build_all.bat | 2 +- programs/demos/3dcube2/trunk/Tupfile.lua | 2 +- programs/demos/3dcube2/trunk/ascgl.inc | 2 +- programs/demos/3dcube2/trunk/ascl.inc | 2 +- programs/demos/3dcube2/trunk/build_en.bat | 4 +- programs/demos/3dcube2/trunk/build_ru.bat | 4 +- programs/demos/3detx60b/trunk/Tupfile.lua | 2 +- programs/demos/3detx60b/trunk/ascgl.inc | 2 +- programs/demos/3detx60b/trunk/ascl.inc | 2 +- programs/demos/3detx60b/trunk/build_en.bat | 4 +- programs/demos/3detx60b/trunk/build_ru.bat | 4 +- programs/demos/3dtcub10/trunk/Tupfile.lua | 2 +- programs/demos/3dtcub10/trunk/build_en.bat | 4 +- programs/demos/3dtcub10/trunk/build_ru.bat | 4 +- programs/demos/ScreenRuler/BUILD_EN.BAT | 4 +- programs/demos/ScreenRuler/BUILD_RU.BAT | 4 +- programs/demos/ScreenRuler/ScreenRuler.asm | 4 +- programs/demos/ScreenRuler/Tupfile.lua | 2 +- programs/demos/bcdclk/trunk/Tupfile.lua | 2 +- programs/demos/bcdclk/trunk/build_en.bat | 4 +- programs/demos/bcdclk/trunk/build_ru.bat | 4 +- programs/demos/colorref/trunk/Tupfile.lua | 2 +- programs/demos/colorref/trunk/build_en.bat | 4 +- programs/demos/colorref/trunk/build_ru.bat | 4 +- programs/demos/crownscr/trunk/Tupfile.lua | 2 +- programs/demos/crownscr/trunk/build_en.bat | 4 +- programs/demos/crownscr/trunk/build_ru.bat | 4 +- programs/demos/cslide/trunk/Tupfile.lua | 2 +- programs/demos/cslide/trunk/build_en.bat | 4 +- programs/demos/cslide/trunk/build_ru.bat | 4 +- programs/demos/eyes/trunk/Tupfile.lua | 2 +- programs/demos/eyes/trunk/build_en.bat | 4 +- programs/demos/eyes/trunk/build_ru.bat | 4 +- programs/demos/free3d04/trunk/Tupfile.lua | 2 +- programs/demos/free3d04/trunk/build_en.bat | 4 +- programs/demos/free3d04/trunk/build_ru.bat | 4 +- programs/demos/life/trunk/ascl.inc | 2 +- programs/demos/life/trunk/build_en.bat | 4 +- programs/demos/life/trunk/build_ru.bat | 4 +- programs/demos/magnify/trunk/Tupfile.lua | 2 +- programs/demos/magnify/trunk/build_en.bat | 4 +- programs/demos/magnify/trunk/build_ru.bat | 4 +- programs/demos/magnify/trunk/magnify.asm | 4 +- programs/demos/movback/trunk/Tupfile.lua | 2 +- programs/demos/movback/trunk/build_en.bat | 4 +- programs/demos/movback/trunk/build_ru.bat | 4 +- programs/demos/plasma/trunk/Tupfile.lua | 2 +- programs/demos/plasma/trunk/build_en.bat | 4 +- programs/demos/plasma/trunk/build_ru.bat | 4 +- programs/demos/ray/Tupfile.lua | 2 +- programs/demos/timer/trunk/Tupfile.lua | 2 +- programs/demos/timer/trunk/build_en.bat | 4 +- programs/demos/timer/trunk/build_ru.bat | 4 +- programs/demos/timer/trunk/timer.asm | 2 +- programs/demos/tinyfrac/trunk/Tupfile.lua | 2 +- programs/demos/tinyfrac/trunk/build_en.bat | 4 +- programs/demos/tinyfrac/trunk/build_ru.bat | 4 +- programs/demos/transp/trunk/Tupfile.lua | 2 +- programs/demos/transp/trunk/build_en.bat | 4 +- programs/demos/transp/trunk/build_ru.bat | 4 +- programs/demos/trantest/trunk/Tupfile.lua | 2 +- programs/demos/trantest/trunk/ascgl.inc | 2 +- programs/demos/trantest/trunk/ascl.inc | 2 +- programs/demos/trantest/trunk/build_en.bat | 4 +- programs/demos/trantest/trunk/build_ru.bat | 4 +- programs/demos/tube/trunk/build_en.bat | 4 +- programs/demos/tube/trunk/build_ru.bat | 4 +- programs/demos/use_mb/Tupfile.lua | 2 +- programs/demos/use_mb/use_mb.asm | 18 +++--- programs/develop/SPForth/meforth.ASM | 2 +- programs/develop/cObj/trunk/Tupfile.lua | 2 +- programs/develop/cObj/trunk/build_en.bat | 4 +- programs/develop/cObj/trunk/build_ru.bat | 4 +- programs/develop/examples/clipboard/build.bat | 4 +- .../examples/cpuspeed/trunk/Tupfile.lua | 2 +- .../examples/cpuspeed/trunk/build_en.bat | 4 +- .../examples/cpuspeed/trunk/build_ru.bat | 4 +- .../examples/example/trunk/build_en.bat | 4 +- .../examples/example/trunk/rus/build_ru.bat | 4 +- .../examples/example2/trunk/Tupfile.lua | 2 +- .../examples/example2/trunk/build_en.bat | 4 +- .../examples/example2/trunk/build_ru.bat | 4 +- .../examples/example3/trunk/Tupfile.lua | 2 +- .../examples/example3/trunk/build_en.bat | 4 +- .../examples/example3/trunk/build_ru.bat | 4 +- .../examples/example3/trunk/example3.asm | 4 +- .../develop/examples/hello/trunk/Tupfile.lua | 2 +- .../develop/examples/hello/trunk/build_en.bat | 4 +- .../develop/examples/hello/trunk/build_ru.bat | 4 +- .../develop/examples/ipc/trunk/Tupfile.lua | 2 +- .../develop/examples/ipc/trunk/build_en.bat | 4 +- .../develop/examples/ipc/trunk/build_ru.bat | 4 +- .../develop/examples/ir/trunk/Tupfile.lua | 2 +- .../develop/examples/ir/trunk/build_en.bat | 4 +- .../develop/examples/ir/trunk/build_ru.bat | 4 +- .../develop/examples/rtdata/trunk/Tupfile.lua | 2 +- .../examples/rtdata/trunk/build_en.bat | 4 +- .../examples/rtdata/trunk/build_ru.bat | 4 +- .../develop/examples/rtdata/trunk/rtdata.asm | 2 +- .../examples/template/trunk/Tupfile.lua | 2 +- .../examples/template/trunk/build_en.bat | 4 +- .../examples/template/trunk/build_ru.bat | 4 +- .../examples/template/trunk/template.asm | 4 +- .../develop/examples/thread/trunk/Tupfile.lua | 2 +- .../examples/thread/trunk/build_en.bat | 4 +- .../examples/thread/trunk/build_ru.bat | 4 +- .../develop/examples/thread/trunk/thread.asm | 2 +- programs/develop/fasm/1.73/Tupfile.lua | 2 +- programs/develop/fasm/1.73/build_en.bat | 4 +- programs/develop/fasm/1.73/build_ru.bat | 4 +- programs/develop/fasm/1.73/traslations.inc | 2 +- programs/develop/fasm/tags/1.68/build_en.bat | 4 +- programs/develop/fasm/tags/1.68/build_ru.bat | 4 +- programs/develop/fasm/tags/1.71/Tupfile.lua | 2 +- programs/develop/fasm/tags/1.71/build_en.bat | 4 +- programs/develop/fasm/tags/1.71/build_ru.bat | 4 +- programs/develop/fasm/tags/1.71/fasm.asm | 2 +- programs/develop/h2d2b/trunk/Tupfile.lua | 2 +- programs/develop/h2d2b/trunk/build_en.bat | 4 +- programs/develop/h2d2b/trunk/build_ru.bat | 4 +- programs/develop/h2d2b/trunk/h2d2b.asm | 2 +- programs/develop/heed/trunk/Tupfile.lua | 2 +- programs/develop/heed/trunk/build.sh | 4 +- programs/develop/heed/trunk/build_en.bat | 4 +- programs/develop/heed/trunk/build_ru.bat | 4 +- programs/develop/heed/trunk/heed.asm | 18 +++--- programs/develop/info3ds/Tupfile.lua | 2 +- programs/develop/info3ds/build_en.bat | 4 +- programs/develop/info3ds/build_ru.bat | 4 +- programs/develop/info3ds/convert_stl_3ds.inc | 4 +- programs/develop/info3ds/data.inc | 6 +- programs/develop/info3ds/info3ds.asm | 2 +- programs/develop/info3ds/info3ds_u.asm | 2 +- programs/develop/info3ds/info_menu.inc | 2 +- programs/develop/info3ds/info_o3d.inc | 2 +- programs/develop/info3ds/info_wnd_coords.inc | 2 +- programs/develop/keyascii/trunk/Tupfile.lua | 2 +- programs/develop/keyascii/trunk/build_en.bat | 4 +- programs/develop/keyascii/trunk/build_ru.bat | 4 +- programs/develop/kol_f_edit/Tupfile.lua | 2 +- programs/develop/kol_f_edit/ob_o.asm | 2 +- .../InputBox/{make_sp.bat => make_es.bat} | 0 .../libraries/box_lib/asm/trunk/build.sh | 4 +- .../libraries/box_lib/trunk/t_edit.asm | 2 +- .../develop/libraries/ufmod/Fasm/Tupfile.lua | 2 +- programs/develop/scancode/trunk/Tupfile.lua | 2 +- programs/develop/scancode/trunk/build_en.bat | 4 +- programs/develop/scancode/trunk/build_ru.bat | 4 +- programs/develop/scancode/trunk/scancode.asm | 2 +- programs/develop/str_double/trunk/Tupfile.lua | 2 +- .../develop/str_double/trunk/build_en.bat | 4 +- .../develop/str_double/trunk/build_ru.bat | 4 +- .../develop/str_double/trunk/str_double.asm | 2 +- programs/develop/tinypad/trunk/Tupfile.lua | 2 +- programs/develop/tinypad/trunk/build.sh | 4 +- programs/develop/tinypad/trunk/build_en.bat | 4 +- programs/develop/tinypad/trunk/build_it.bat | 4 +- programs/develop/tinypad/trunk/build_ru.bat | 4 +- programs/fs/copyr/trunk/Tupfile.lua | 2 +- programs/fs/copyr/trunk/build_en.bat | 4 +- programs/fs/copyr/trunk/build_ru.bat | 4 +- programs/fs/copyr/trunk/copyr.asm | 2 +- programs/fs/kfar/trunk/Tupfile.lua | 2 +- programs/fs/kfar/trunk/build_en.bat | 4 +- programs/fs/kfar/trunk/build_ru.bat | 4 +- programs/fs/kfar/trunk/filetool.inc | 2 +- programs/fs/kfar/trunk/kfar.asm | 32 +++++------ programs/fs/kfar/trunk/kfar_arc/7z.inc | 2 +- programs/fs/kfar/trunk/kfar_arc/Tupfile.lua | 2 +- programs/fs/kfar/trunk/kfar_arc/kfar_arc.asm | 2 +- programs/fs/kfar/trunk/viewer.inc | 8 +-- programs/fs/kfm/trunk/Tupfile.lua | 2 +- programs/fs/kfm/trunk/build.bat | 2 +- programs/fs/kfm/trunk/build.sh | 4 +- programs/fs/opendial/build.bat | 4 +- programs/fs/opendial/build.sh | 4 +- programs/fs/unz/Tupfile.lua | 2 +- programs/fs/unz/make_en.bat | 4 +- programs/fs/unz/make_ru.bat | 4 +- programs/fs/unz/unz.asm | 6 +- programs/games/15/trunk/15.ASM | 30 +++++----- programs/games/15/trunk/Tupfile.lua | 2 +- programs/games/15/trunk/build_en.bat | 4 +- programs/games/15/trunk/build_ru.bat | 4 +- programs/games/15/trunk/makefile | 8 +-- .../games/Dungeons/Resources/Levels/1.inc | 26 ++++----- programs/games/Dungeons/data.inc | 6 +- programs/games/Dungeons/lang.inc | 2 +- programs/games/MSquare/trunk/MSquare.asm | 2 +- programs/games/MSquare/trunk/Tupfile.lua | 2 +- programs/games/MSquare/trunk/build_en.bat | 4 +- programs/games/MSquare/trunk/build_ru.bat | 4 +- programs/games/almaz/ALMAZ.ASM | 2 +- programs/games/almaz/ASCGL.INC | 2 +- programs/games/almaz/ASCL.INC | 2 +- programs/games/almaz/Tupfile.lua | 2 +- programs/games/almaz/build_ru.bat | 4 +- programs/games/arcanii/trunk/Tupfile.lua | 2 +- programs/games/arcanii/trunk/arcanii.asm | 2 +- programs/games/arcanii/trunk/ascgl.inc | 2 +- programs/games/arcanii/trunk/ascl.inc | 2 +- programs/games/arcanii/trunk/build.bat | 4 +- programs/games/arcanii/trunk/build_en.bat | 4 +- programs/games/arcanii/trunk/build_ru.bat | 4 +- programs/games/arcanii/trunk/makefile | 6 +- programs/games/arcanoid/trunk/Tupfile.lua | 2 +- programs/games/arcanoid/trunk/arcanoid.asm | 12 ++-- programs/games/arcanoid/trunk/ascgl.inc | 2 +- programs/games/arcanoid/trunk/build_en.bat | 4 +- programs/games/arcanoid/trunk/build_ru.bat | 4 +- programs/games/arcanoid/trunk/makefile | 6 +- programs/games/bnc/trunk/makefile | 4 +- programs/games/bomber/Tupfile.lua | 2 +- programs/games/bomber/bomber.asm | 2 +- programs/games/bomber/build_en.bat | 4 +- programs/games/bomber/build_ru.bat | 4 +- programs/games/c4/trunk/Tupfile.lua | 2 +- programs/games/c4/trunk/c4.asm | 18 +++--- programs/games/c4/trunk/makefile | 4 +- programs/games/codemaster/Tupfile.lua | 2 +- programs/games/codemaster/build.bat | 4 +- programs/games/freecell/Tupfile.lua | 2 +- programs/games/freecell/build_en.bat | 4 +- programs/games/freecell/build_ru.bat | 4 +- programs/games/freecell/freecell.asm | 6 +- programs/games/freecell/makefile | 6 +- programs/games/gomoku/trunk/Tupfile.lua | 2 +- programs/games/gomoku/trunk/build_en.bat | 4 +- programs/games/gomoku/trunk/build_ru.bat | 4 +- programs/games/gomoku/trunk/gomoku.asm | 2 +- programs/games/gomoku/trunk/makefile | 4 +- programs/games/klavisha/trunk/Tupfile.lua | 2 +- programs/games/klavisha/trunk/build.bat | 4 +- programs/games/life3/trunk/Tupfile.lua | 2 +- programs/games/life3/trunk/build_ru.bat | 2 +- programs/games/life3/trunk/life3.asm | 2 +- programs/games/lines/Tupfile.lua | 2 +- programs/games/lines/build_en.bat | 4 +- programs/games/lines/build_ru.bat | 4 +- programs/games/lines/lines.asm | 4 +- programs/games/mblocks/trunk/build_en.bat | 4 +- programs/games/mblocks/trunk/build_ru.bat | 4 +- programs/games/megamaze/trunk/blackbox.inc | 2 +- programs/games/megamaze/trunk/build.bat | 2 +- programs/games/megamaze/trunk/colzone.inc | 2 +- programs/games/megamaze/trunk/cstep.inc | 2 +- programs/games/megamaze/trunk/fhouse.inc | 2 +- programs/games/megamaze/trunk/loops.inc | 2 +- programs/games/megamaze/trunk/marble.inc | 2 +- programs/games/megamaze/trunk/megamaze.asm | 2 +- programs/games/megamaze/trunk/nolt.inc | 2 +- programs/games/megamaze/trunk/orient.inc | 2 +- programs/games/megamaze/trunk/smz.inc | 2 +- programs/games/megamaze/trunk/tam.inc | 2 +- programs/games/megamaze/trunk/tilt.inc | 2 +- programs/games/megamaze/trunk/tilt2.inc | 2 +- programs/games/megamaze/trunk/wriggle.inc | 2 +- programs/games/phenix/trunk/Tupfile.lua | 2 +- programs/games/phenix/trunk/ascgl.inc | 2 +- programs/games/phenix/trunk/ascgml.inc | 2 +- programs/games/phenix/trunk/ascguil.inc | 4 +- programs/games/phenix/trunk/ascl.inc | 2 +- programs/games/phenix/trunk/ascml.inc | 4 +- programs/games/phenix/trunk/ascpoal.inc | 4 +- programs/games/phenix/trunk/build_en.bat | 4 +- programs/games/phenix/trunk/build_ru.bat | 4 +- programs/games/pipes/Tupfile.lua | 2 +- programs/games/pipes/build_en.bat | 4 +- programs/games/pipes/build_et.bat | 4 +- programs/games/pipes/pipes.asm | 4 +- programs/games/pong/trunk/Tupfile.lua | 2 +- programs/games/pong/trunk/build_en.bat | 4 +- programs/games/pong/trunk/build_ru.bat | 4 +- programs/games/pong/trunk/pong.asm | 2 +- programs/games/pong3/trunk/ascgl.inc | 2 +- programs/games/pong3/trunk/ascgml.inc | 2 +- programs/games/pong3/trunk/ascl.inc | 2 +- programs/games/pong3/trunk/build_en.bat | 4 +- programs/games/pong3/trunk/build_ru.bat | 4 +- programs/games/rsquare/trunk/build_en.bat | 4 +- programs/games/rsquare/trunk/build_ru.bat | 4 +- programs/games/rsquare/trunk/rsquare.asm | 4 +- programs/games/snake/trunk/build_en.bat | 4 +- programs/games/soko/trunk/SOKO.ASM | 10 ++-- programs/games/sq_game/trunk/SQ_GAME.ASM | 2 +- programs/games/sq_game/trunk/build_en.bat | 4 +- programs/games/sq_game/trunk/build_ru.bat | 4 +- programs/games/sudoku/trunk/Tupfile.lua | 2 +- programs/games/sudoku/trunk/build_en.bat | 4 +- programs/games/sudoku/trunk/sudoku.asm | 4 +- programs/games/sw/trunk/Tupfile.lua | 2 +- programs/games/sw/trunk/sw.asm | 4 +- programs/games/sw/trunk/sw_lan.asm | 4 +- programs/games/tanks/trunk/Tupfile.lua | 2 +- programs/games/tanks/trunk/build_en.bat | 4 +- programs/games/tanks/trunk/build_ru.bat | 4 +- programs/games/tetris/trunk/Tupfile.lua | 2 +- programs/games/tetris/trunk/build_en.bat | 4 +- programs/games/tetris/trunk/build_et.bat | 4 +- programs/games/tetris/trunk/build_ru.bat | 4 +- programs/games/tetris/trunk/tetris.asm | 4 +- programs/load_lib.mac | 4 +- programs/media/animage/trunk/build.sh | 4 +- programs/media/img_transform/Tupfile.lua | 2 +- programs/media/img_transform/build_en.bat | 4 +- programs/media/img_transform/build_ru.bat | 4 +- .../media/img_transform/img_transform.asm | 2 +- programs/media/midamp/trunk/Tupfile.lua | 2 +- programs/media/midamp/trunk/build.bat | 4 +- programs/media/midamp/trunk/build.sh | 4 +- programs/media/midamp/trunk/midilite.inc | 6 +- programs/media/midiplay/trunk/Tupfile.lua | 2 +- programs/media/midiplay/trunk/build_en.bat | 4 +- programs/media/midiplay/trunk/build_ru.bat | 4 +- programs/media/piano/Tupfile.lua | 2 +- programs/media/piano/build.bat | 4 +- programs/media/piano/piano.asm | 2 +- programs/media/pic4/trunk/Tupfile.lua | 2 +- programs/media/pic4/trunk/build_en.bat | 4 +- programs/media/pic4/trunk/build_ru.bat | 4 +- programs/media/pic4/trunk/pic4.asm | 2 +- programs/media/scrshoot/Tupfile.lua | 2 +- programs/media/scrshoot/build.sh | 4 +- programs/media/scrshoot/build_en.bat | 4 +- programs/media/scrshoot/build_ru.bat | 4 +- programs/media/scrshoot/scrshoot.asm | 4 +- programs/media/scrshoot/srectwin.inc | 6 +- .../media/voxel_editor/utilites/Tupfile.lua | 2 +- .../media/voxel_editor/utilites/build_en.bat | 4 +- .../media/voxel_editor/utilites/build_ru.bat | 4 +- .../voxel_editor/utilites/vox_creator.asm | 4 +- .../media/voxel_editor/utilites/vox_mover.asm | 4 +- .../media/voxel_editor/utilites/vox_tgl.asm | 4 +- programs/media/zsea/Tupfile.lua | 2 +- programs/media/zsea/build.bat | 4 +- programs/media/zsea/build.sh | 4 +- programs/media/zsea/buildall.bat | 4 +- programs/media/zsea/buildall.sh | 4 +- programs/other/calc/trunk/build_en.bat | 4 +- programs/other/calc/trunk/build_ru.bat | 4 +- programs/other/cnc_editor/Tupfile.lua | 2 +- programs/other/cnc_editor/build_en.bat | 4 +- programs/other/ha/HACONFIG.ASM | 2 +- programs/other/ha/Tupfile.lua | 2 +- programs/other/ha/build.bat | 4 +- programs/other/kpack/trunk/build.sh | 4 +- .../other/outdated/archer/trunk/arcmacro.inc | 2 +- .../other/outdated/archer/trunk/build_en.bat | 4 +- .../other/outdated/archer/trunk/build_ru.bat | 4 +- .../other/outdated/bgitest/trunk/Tupfile.lua | 2 +- .../other/outdated/bgitest/trunk/bgitest.asm | 2 +- .../other/outdated/bgitest/trunk/build_en.bat | 4 +- .../other/outdated/bgitest/trunk/build_ru.bat | 4 +- programs/other/outdated/cdp/trunk/Tupfile.lua | 2 +- .../other/outdated/cdp/trunk/build_en.bat | 4 +- .../other/outdated/cdp/trunk/build_ru.bat | 4 +- .../other/outdated/clip/trunk/Tupfile.lua | 2 +- .../other/outdated/clip/trunk/build_ru.bat | 4 +- programs/other/outdated/clip/trunk/makefile | 2 +- .../cmd/trunk/{build_ge.bat => build_de.bat} | 4 +- .../other/outdated/cmd/trunk/build_en.bat | 4 +- programs/other/outdated/cmd/trunk/cmd.asm | 4 +- .../other/outdated/copy2/trunk/Tupfile.lua | 2 +- .../trunk/{build_ge.bat => build_de.bat} | 4 +- .../other/outdated/copy2/trunk/build_en.bat | 4 +- .../other/outdated/copy2/trunk/build_ru.bat | 4 +- programs/other/outdated/copy2/trunk/copy2.asm | 4 +- .../other/outdated/gifview/trunk/build_en.bat | 4 +- .../other/outdated/gifview/trunk/build_ru.bat | 4 +- .../other/outdated/iconedit/trunk/Tupfile.lua | 2 +- .../outdated/iconedit/trunk/build_en.bat | 4 +- .../outdated/iconedit/trunk/build_ru.bat | 4 +- .../outdated/jpegview/trunk/build_en.bat | 4 +- .../outdated/jpegview/trunk/build_ru.bat | 4 +- .../other/outdated/kerpack/trunk/build.sh | 4 +- .../other/outdated/mfar/trunk/build_en.bat | 4 +- .../other/outdated/mfar/trunk/build_ru.bat | 4 +- programs/other/outdated/mfar/trunk/macros.inc | 4 +- .../mhc/trunk/{build_ge.bat => build_de.bat} | 4 +- .../other/outdated/mhc/trunk/build_en.bat | 4 +- programs/other/outdated/mhc/trunk/mhc.asm | 2 +- .../other/outdated/mixer/trunk/Tupfile.lua | 2 +- .../other/outdated/mixer/trunk/build_en.bat | 4 +- .../other/outdated/mixer/trunk/build_ru.bat | 4 +- programs/other/outdated/mv/trunk/Tupfile.lua | 2 +- programs/other/outdated/mv/trunk/build_en.bat | 4 +- programs/other/outdated/mv/trunk/build_ru.bat | 4 +- .../other/outdated/param/trunk/Tupfile.lua | 2 +- .../other/outdated/param/trunk/build_en.bat | 4 +- .../other/outdated/param/trunk/build_ru.bat | 4 +- programs/other/outdated/rb/trunk/Tupfile.lua | 2 +- programs/other/outdated/rb/trunk/build_en.bat | 4 +- programs/other/outdated/rb/trunk/build_et.bat | 4 +- programs/other/outdated/rb/trunk/build_ru.bat | 4 +- programs/other/outdated/rb/trunk/rb.asm | 2 +- programs/other/outdated/sb/trunk/Tupfile.lua | 2 +- programs/other/outdated/sb/trunk/build_en.bat | 4 +- programs/other/outdated/sb/trunk/build_ru.bat | 4 +- programs/other/outdated/slovarik/ASCL.INC | 2 +- .../other/outdated/sysxtree/trunk/ascgl.inc | 2 +- .../other/outdated/sysxtree/trunk/ascgml.inc | 2 +- .../other/outdated/sysxtree/trunk/ascl.inc | 2 +- .../other/outdated/sysxtree/trunk/ascml.inc | 4 +- .../outdated/sysxtree/trunk/build_en.bat | 4 +- .../outdated/sysxtree/trunk/build_ru.bat | 4 +- programs/other/rtfread/trunk/build.sh | 4 +- programs/other/rtfread/trunk/build_en.bat | 4 +- programs/other/rtfread/trunk/build_ru.bat | 4 +- programs/other/t_edit/Tupfile.lua | 2 +- programs/other/t_edit/build_en.bat | 4 +- programs/other/t_edit/build_ru.bat | 4 +- programs/other/t_edit/t_data.inc | 2 +- programs/other/t_edit/t_menu.inc | 4 +- programs/other/t_edit/wnd_k_words.inc | 4 +- programs/system/MyKey/trunk/MyKey.asm | 10 ++-- programs/system/MyKey/trunk/Tupfile.lua | 2 +- programs/system/MyKey/trunk/makefile | 4 +- .../RunOD/1/{make_sp.bat => make_es.bat} | 0 programs/system/RunOD/RunOD.asm | 2 +- programs/system/RunOD/Tupfile.lua | 2 +- programs/system/RunOD/build_en.bat | 4 +- programs/system/RunOD/build_ru.bat | 4 +- programs/system/RunOD/makefile | 2 +- programs/system/beep/build.sh | 4 +- programs/system/board/trunk/Tupfile.lua | 2 +- programs/system/board/trunk/board.asm | 6 +- .../trunk/{build_ge.bat => build_de.bat} | 4 +- programs/system/board/trunk/build_en.bat | 4 +- programs/system/board/trunk/build_ru.bat | 4 +- programs/system/board/trunk/makefile | 10 ++-- programs/system/calendar/trunk/Tupfile.lua | 2 +- .../trunk/{build_ge.bat => build_de.bat} | 4 +- programs/system/calendar/trunk/build_en.bat | 4 +- programs/system/calendar/trunk/build_et.bat | 4 +- programs/system/calendar/trunk/build_ru.bat | 4 +- programs/system/calendar/trunk/data.inc | 56 +++++++++---------- programs/system/calendar/trunk/makefile | 12 ++-- programs/system/cd_tray/CD_tray.ASM | 12 ++-- programs/system/cd_tray/makefile | 4 +- programs/system/colrdial/color_dialog.bat | 4 +- programs/system/cpu/trunk/Tupfile.lua | 2 +- .../cpu/trunk/{build_ge.bat => build_de.bat} | 4 +- programs/system/cpu/trunk/build_en.bat | 4 +- programs/system/cpu/trunk/build_et.bat | 4 +- programs/system/cpu/trunk/build_ru.bat | 4 +- programs/system/cpu/trunk/cpu.asm | 8 +-- programs/system/cpu/trunk/makefile | 12 ++-- programs/system/docpack/trunk/build_en.bat | 4 +- programs/system/docpack/trunk/build_ru.bat | 4 +- programs/system/docpack/trunk/makefile | 2 +- programs/system/end/light/Tupfile.lua | 2 +- .../end/light/{build_ge.bat => build_de.bat} | 4 +- programs/system/end/light/build_en.bat | 4 +- programs/system/end/light/build_it.bat | 4 +- programs/system/end/light/build_ru.bat | 4 +- programs/system/end/light/data.inc | 6 +- programs/system/end/light/makefile | 10 ++-- programs/system/format/format.asm | 4 +- programs/system/gmon/makefile | 4 +- programs/system/gmon/tab_about.inc | 2 +- programs/system/gmon/tab_info.inc | 2 +- programs/system/gmon/tab_test.inc | 2 +- programs/system/hdd_info/trunk/Tupfile.lua | 2 +- programs/system/hdd_info/trunk/build.sh | 4 +- programs/system/hdd_info/trunk/hdd_info.asm | 6 +- programs/system/hdd_info/trunk/makefile | 4 +- programs/system/icon/trunk/Tupfile.lua | 2 +- programs/system/icon/trunk/build.sh | 4 +- .../icon/trunk/{build_ge.bat => build_de.bat} | 4 +- programs/system/icon/trunk/build_en.bat | 4 +- programs/system/icon/trunk/build_ru.bat | 4 +- programs/system/icon/trunk/data.inc | 10 ++-- programs/system/icon/trunk/makefile | 8 +-- programs/system/icon_new/DlgAdd.inc | 2 +- programs/system/icon_new/Tupfile.lua | 2 +- programs/system/icon_new/build_en.bat | 2 +- programs/system/icon_new/build_en.sh | 4 +- programs/system/icon_new/build_ru.bat | 2 +- programs/system/icon_new/icon.asm | 8 +-- programs/system/keybi/Tupfile.lua | 2 +- programs/system/keybi/build.bat | 4 +- programs/system/keybi/keybi.asm | 2 +- programs/system/launch/trunk/launch.asm | 2 +- programs/system/launcher/trunk/build_en.bat | 4 +- programs/system/launcher/trunk/build_ru.bat | 4 +- programs/system/menu/trunk/Tupfile.lua | 2 +- programs/system/menu/trunk/build.bat | 4 +- programs/system/menu/trunk/build.sh | 6 +- programs/system/menu/trunk/makefile | 6 +- programs/system/mousemul/trunk/Tupfile.lua | 2 +- programs/system/mousemul/trunk/build.bat | 4 +- programs/system/mousemul/trunk/build.sh | 4 +- programs/system/mousemul/trunk/makefile | 6 +- programs/system/mousemul/trunk/mousemul.asm | 4 +- programs/system/open/Tupfile.lua | 2 +- programs/system/open/build.bat | 4 +- programs/system/open/open.asm | 6 +- programs/system/rdsave/trunk/Tupfile.lua | 2 +- programs/system/rdsave/trunk/build.sh | 4 +- programs/system/rdsave/trunk/build_en.bat | 4 +- programs/system/rdsave/trunk/build_et.bat | 4 +- programs/system/rdsave/trunk/build_it.bat | 4 +- programs/system/rdsave/trunk/build_ru.bat | 4 +- programs/system/rdsave/trunk/makefile | 8 +-- programs/system/rdsave/trunk/rdsave.asm | 8 +-- programs/system/refrscrn/Tupfile.lua | 2 +- programs/system/refrscrn/makefile | 2 +- programs/system/run/trunk/Tupfile.lua | 2 +- programs/system/run/trunk/build_en.bat | 4 +- programs/system/run/trunk/build_ru.bat | 4 +- programs/system/run/trunk/makefile | 6 +- programs/system/run/trunk/run.asm | 4 +- programs/system/setup/trunk/setup.asm | 2 +- programs/system/skincfg/trunk/Tupfile.lua | 2 +- programs/system/skincfg/trunk/build_en.bat | 4 +- programs/system/skincfg/trunk/build_en.sh | 4 +- .../trunk/{build_sp.bat => build_es.bat} | 4 +- programs/system/skincfg/trunk/build_et.bat | 4 +- programs/system/skincfg/trunk/build_et.sh | 4 +- programs/system/skincfg/trunk/build_it.bat | 4 +- programs/system/skincfg/trunk/build_ru.bat | 4 +- programs/system/skincfg/trunk/build_ru.sh | 4 +- programs/system/skincfg/trunk/build_sp.sh | 4 +- programs/system/skincfg/trunk/idata.inc | 38 ++++++------- programs/system/skincfg/trunk/makefile | 12 ++-- programs/system/skincfg/trunk/skincfg.asm | 4 +- programs/system/taskbar/trunk/TASKBAR.ASM | 2 +- programs/system/taskbar/trunk/build_en.bat | 4 +- programs/system/taskbar/trunk/build_et.bat | 4 +- programs/system/taskbar/trunk/build_ru.bat | 4 +- programs/system/taskbar/trunk/drawwind.inc | 2 +- programs/system/taskbar/trunk/makefile | 8 +-- programs/testing/cpuid/trunk/Build.bat | 4 +- programs/testing/cpuid/trunk/CPUID.ASM | 22 ++++---- programs/testing/cpuid/trunk/Tupfile.lua | 2 +- programs/testing/cpuid/trunk/makefile | 4 +- programs/testing/disptest/trunk/Tupfile.lua | 2 +- programs/testing/disptest/trunk/build_en.bat | 4 +- programs/testing/disptest/trunk/build_ru.bat | 4 +- programs/testing/fspeed/Tupfile.lua | 2 +- programs/testing/fspeed/build_en.bat | 4 +- programs/testing/fspeed/build_ru.bat | 4 +- programs/testing/fspeed/idata.inc | 10 ++-- programs/testing/kbd/trunk/Tupfile.lua | 2 +- programs/testing/kbd/trunk/kbd.ASM | 4 +- programs/testing/kbd/trunk/makefile | 4 +- programs/testing/mgb/trunk/Tupfile.lua | 2 +- programs/testing/mgb/trunk/build.bat | 4 +- programs/testing/mgb/trunk/build.sh | 4 +- programs/testing/mgb/trunk/makefile | 4 +- programs/testing/mgb/trunk/mgb.asm | 6 +- .../pcidev/branches/new_api/PCIDEV.ASM | 2 +- .../testing/pcidev/branches/new_api/makefile | 4 +- programs/testing/pcidev/trunk/PCIDEV.ASM | 2 +- programs/testing/pcidev/trunk/Tupfile.lua | 2 +- programs/testing/pcidev/trunk/build_en.bat | 4 +- programs/testing/pcidev/trunk/makefile | 4 +- programs/testing/protection/trunk/Tupfile.lua | 2 +- .../testing/protection/trunk/build_en.bat | 4 +- .../testing/protection/trunk/build_ru.bat | 4 +- programs/testing/protection/trunk/makefile | 4 +- programs/testing/protection/trunk/test.asm | 10 ++-- 574 files changed, 1116 insertions(+), 1118 deletions(-) rename programs/develop/libraries/InputBox/{make_sp.bat => make_es.bat} (100%) rename programs/other/outdated/cmd/trunk/{build_ge.bat => build_de.bat} (53%) rename programs/other/outdated/copy2/trunk/{build_ge.bat => build_de.bat} (55%) rename programs/other/outdated/mhc/trunk/{build_ge.bat => build_de.bat} (53%) rename programs/system/RunOD/1/{make_sp.bat => make_es.bat} (100%) rename programs/system/board/trunk/{build_ge.bat => build_de.bat} (60%) rename programs/system/calendar/trunk/{build_ge.bat => build_de.bat} (58%) rename programs/system/cpu/trunk/{build_ge.bat => build_de.bat} (61%) rename programs/system/end/light/{build_ge.bat => build_de.bat} (58%) rename programs/system/icon/trunk/{build_ge.bat => build_de.bat} (62%) rename programs/system/skincfg/trunk/{build_sp.bat => build_es.bat} (62%) diff --git a/data/ca_ES/lang.inc b/data/ca_ES/lang.inc index aebcb8df1..5f1d19b58 100644 --- a/data/ca_ES/lang.inc +++ b/data/ca_ES/lang.inc @@ -1 +1 @@ -lang fix ca +lang fix ca_ES diff --git a/data/ca_ES/settings/kolibri.lbl b/data/ca_ES/settings/kolibri.lbl index 08896cd66..1194a44e4 100644 --- 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! :-) diff --git a/data/en_US/lang.inc b/data/en_US/lang.inc index dc151ef65..b407c540f 100644 --- a/data/en_US/lang.inc +++ b/data/en_US/lang.inc @@ -1 +1 @@ -lang fix en \ No newline at end of file +lang fix en_US diff --git a/data/en_US/settings/kolibri.lbl b/data/en_US/settings/kolibri.lbl index e0599ba4f..2050fdc05 100644 --- 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! :-) \ No newline at end of file +; Hi, curious person! :-) diff --git a/data/es_ES/lang.inc b/data/es_ES/lang.inc index 48c8fe6af..1284db711 100644 --- a/data/es_ES/lang.inc +++ b/data/es_ES/lang.inc @@ -1 +1 @@ -lang fix sp +lang fix es_ES diff --git a/data/es_ES/settings/kolibri.lbl b/data/es_ES/settings/kolibri.lbl index db279e699..476969a90 100644 --- 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! :-) \ No newline at end of file +; Hi, curious person! :-) diff --git a/data/et_EE/lang.inc b/data/et_EE/lang.inc index a1920a1e4..1ed791727 100644 --- a/data/et_EE/lang.inc +++ b/data/et_EE/lang.inc @@ -1 +1 @@ -lang fix et \ No newline at end of file +lang fix et_EE diff --git a/data/et_EE/settings/kolibri.lbl b/data/et_EE/settings/kolibri.lbl index 481c77df0..391ecd794 100644 --- 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! :-) \ No newline at end of file +; Hi, curious person! :-) diff --git a/data/it_IT/lang.inc b/data/it_IT/lang.inc index c5c0cd85d..ec5e9bf25 100644 --- a/data/it_IT/lang.inc +++ b/data/it_IT/lang.inc @@ -1 +1 @@ -lang fix it \ No newline at end of file +lang fix it_IT diff --git a/data/it_IT/settings/kolibri.lbl b/data/it_IT/settings/kolibri.lbl index e54bad7dd..034dec751 100644 --- 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! :-) \ No newline at end of file +; Hi, curious person! :-) diff --git a/data/ru_RU/lang.inc b/data/ru_RU/lang.inc index 30c0149bd..1cdd556d2 100644 --- a/data/ru_RU/lang.inc +++ b/data/ru_RU/lang.inc @@ -1 +1 @@ -lang fix ru \ No newline at end of file +lang fix ru_RU diff --git a/data/ru_RU/settings/kolibri.lbl b/data/ru_RU/settings/kolibri.lbl index 050c16ea6..c64b30ded 100644 --- 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! :-) \ No newline at end of file +; Hi, curious person! :-) diff --git a/programs/build_all.bat b/programs/build_all.bat index 760f1c115..4e64253b7 100644 --- 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 diff --git a/programs/demos/3dcube2/trunk/Tupfile.lua b/programs/demos/3dcube2/trunk/Tupfile.lua index 8b1b05e11..84925064d 100644 --- 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") diff --git a/programs/demos/3dcube2/trunk/ascgl.inc b/programs/demos/3dcube2/trunk/ascgl.inc index c48154605..936c1b888 100644 --- 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 diff --git a/programs/demos/3dcube2/trunk/ascl.inc b/programs/demos/3dcube2/trunk/ascl.inc index 698477ab3..69c10d122 100644 --- 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 diff --git a/programs/demos/3dcube2/trunk/build_en.bat b/programs/demos/3dcube2/trunk/build_en.bat index 62d5cf9cd..203ae78cb 100644 --- a/programs/demos/3dcube2/trunk/build_en.bat +++ b/programs/demos/3dcube2/trunk/build_en.bat @@ -1,6 +1,6 @@ @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 -@pause \ No newline at end of file +@pause diff --git a/programs/demos/3dcube2/trunk/build_ru.bat b/programs/demos/3dcube2/trunk/build_ru.bat index d4b976275..851310508 100644 --- a/programs/demos/3dcube2/trunk/build_ru.bat +++ b/programs/demos/3dcube2/trunk/build_ru.bat @@ -1,6 +1,6 @@ @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 -@pause \ No newline at end of file +@pause diff --git a/programs/demos/3detx60b/trunk/Tupfile.lua b/programs/demos/3detx60b/trunk/Tupfile.lua index ae7352326..ebb3a7362 100644 --- 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") diff --git a/programs/demos/3detx60b/trunk/ascgl.inc b/programs/demos/3detx60b/trunk/ascgl.inc index f8188e757..6f118e067 100644 --- 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 diff --git a/programs/demos/3detx60b/trunk/ascl.inc b/programs/demos/3detx60b/trunk/ascl.inc index 13c2ad3a9..ad5e82603 100644 --- 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 diff --git a/programs/demos/3detx60b/trunk/build_en.bat b/programs/demos/3detx60b/trunk/build_en.bat index 1d84d9387..00f5f1a69 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/3detx60b/trunk/build_ru.bat b/programs/demos/3detx60b/trunk/build_ru.bat index 4d1c898e5..ab86a1f65 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/3dtcub10/trunk/Tupfile.lua b/programs/demos/3dtcub10/trunk/Tupfile.lua index e470a6999..d51936b61 100644 --- 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") diff --git a/programs/demos/3dtcub10/trunk/build_en.bat b/programs/demos/3dtcub10/trunk/build_en.bat index ede0dd8b9..3d150409a 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/3dtcub10/trunk/build_ru.bat b/programs/demos/3dtcub10/trunk/build_ru.bat index f34ecb393..8aedd2be9 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/ScreenRuler/BUILD_EN.BAT b/programs/demos/ScreenRuler/BUILD_EN.BAT index b5a9355be..cb97a280d 100644 --- a/programs/demos/ScreenRuler/BUILD_EN.BAT +++ b/programs/demos/ScreenRuler/BUILD_EN.BAT @@ -1,6 +1,6 @@ @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 -@pause \ No newline at end of file +@pause diff --git a/programs/demos/ScreenRuler/BUILD_RU.BAT b/programs/demos/ScreenRuler/BUILD_RU.BAT index 262b8b85f..b0f186e39 100644 --- a/programs/demos/ScreenRuler/BUILD_RU.BAT +++ b/programs/demos/ScreenRuler/BUILD_RU.BAT @@ -1,6 +1,6 @@ @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 -@pause \ No newline at end of file +@pause diff --git a/programs/demos/ScreenRuler/ScreenRuler.asm b/programs/demos/ScreenRuler/ScreenRuler.asm index 01d1a866f..b6390d904 100644 --- a/programs/demos/ScreenRuler/ScreenRuler.asm +++ b/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: @@ -291,4 +291,4 @@ I_END: ;--------------------------------------------------------------------- procinfo: rb 1024 -;--------------------------------------------------------------------- \ No newline at end of file +;--------------------------------------------------------------------- diff --git a/programs/demos/ScreenRuler/Tupfile.lua b/programs/demos/ScreenRuler/Tupfile.lua index 6ab42fcfb..caab301e8 100644 --- 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") diff --git a/programs/demos/bcdclk/trunk/Tupfile.lua b/programs/demos/bcdclk/trunk/Tupfile.lua index 57055d855..308fb20c8 100644 --- 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") diff --git a/programs/demos/bcdclk/trunk/build_en.bat b/programs/demos/bcdclk/trunk/build_en.bat index bae8a8f59..11fdc546b 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/bcdclk/trunk/build_ru.bat b/programs/demos/bcdclk/trunk/build_ru.bat index 6aef5b741..5e0df95cd 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/colorref/trunk/Tupfile.lua b/programs/demos/colorref/trunk/Tupfile.lua index 46e2b06a1..d48992dd5 100644 --- 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") diff --git a/programs/demos/colorref/trunk/build_en.bat b/programs/demos/colorref/trunk/build_en.bat index 33d562d8e..6a0a8f6c8 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/colorref/trunk/build_ru.bat b/programs/demos/colorref/trunk/build_ru.bat index 94f4c7d31..d8c825ed1 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/crownscr/trunk/Tupfile.lua b/programs/demos/crownscr/trunk/Tupfile.lua index dcde00648..dd3c4e554 100644 --- 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") diff --git a/programs/demos/crownscr/trunk/build_en.bat b/programs/demos/crownscr/trunk/build_en.bat index af4b372b3..169d0d160 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/crownscr/trunk/build_ru.bat b/programs/demos/crownscr/trunk/build_ru.bat index 12f0f2d46..9ebec276e 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/cslide/trunk/Tupfile.lua b/programs/demos/cslide/trunk/Tupfile.lua index 048ff7bc3..edca97950 100644 --- 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") diff --git a/programs/demos/cslide/trunk/build_en.bat b/programs/demos/cslide/trunk/build_en.bat index ed0f5ef4d..572e89a2f 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/cslide/trunk/build_ru.bat b/programs/demos/cslide/trunk/build_ru.bat index 83a99456a..9497228a4 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/eyes/trunk/Tupfile.lua b/programs/demos/eyes/trunk/Tupfile.lua index dec502f8e..344378152 100644 --- 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") diff --git a/programs/demos/eyes/trunk/build_en.bat b/programs/demos/eyes/trunk/build_en.bat index 7f7379520..bfe7d1e5c 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/eyes/trunk/build_ru.bat b/programs/demos/eyes/trunk/build_ru.bat index e1db539cc..8f29c746f 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/free3d04/trunk/Tupfile.lua b/programs/demos/free3d04/trunk/Tupfile.lua index bc32201f2..231311ca9 100644 --- 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") diff --git a/programs/demos/free3d04/trunk/build_en.bat b/programs/demos/free3d04/trunk/build_en.bat index 0b77c7b39..2daf719c9 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/free3d04/trunk/build_ru.bat b/programs/demos/free3d04/trunk/build_ru.bat index e789620a8..7afe785fd 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/life/trunk/ascl.inc b/programs/demos/life/trunk/ascl.inc index 2ecfb96d6..016ebdfd6 100644 --- 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 diff --git a/programs/demos/life/trunk/build_en.bat b/programs/demos/life/trunk/build_en.bat index d9a494ff0..e9e7a99a7 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/life/trunk/build_ru.bat b/programs/demos/life/trunk/build_ru.bat index 8348f3ee6..44f0e481d 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/magnify/trunk/Tupfile.lua b/programs/demos/magnify/trunk/Tupfile.lua index 6366f3993..f5b075ae5 100644 --- 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") diff --git a/programs/demos/magnify/trunk/build_en.bat b/programs/demos/magnify/trunk/build_en.bat index 9745d7382..d7ade72ce 100644 --- a/programs/demos/magnify/trunk/build_en.bat +++ b/programs/demos/magnify/trunk/build_en.bat @@ -1,6 +1,6 @@ @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 -@pause \ No newline at end of file +@pause diff --git a/programs/demos/magnify/trunk/build_ru.bat b/programs/demos/magnify/trunk/build_ru.bat index 9734895e8..99648bbd6 100644 --- a/programs/demos/magnify/trunk/build_ru.bat +++ b/programs/demos/magnify/trunk/build_ru.bat @@ -1,6 +1,6 @@ @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 -@pause \ No newline at end of file +@pause diff --git a/programs/demos/magnify/trunk/magnify.asm b/programs/demos/magnify/trunk/magnify.asm index 50aaf95ad..c54e94470 100644 --- a/programs/demos/magnify/trunk/magnify.asm +++ b/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 - ࠭ 㯠', 0 else @@ -153,4 +153,4 @@ size_y dd ? ;--------------------------------------------------------------------- procinfo: rb 1024 -;--------------------------------------------------------------------- \ No newline at end of file +;--------------------------------------------------------------------- diff --git a/programs/demos/movback/trunk/Tupfile.lua b/programs/demos/movback/trunk/Tupfile.lua index 87c81eded..d1bfd409c 100644 --- 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") diff --git a/programs/demos/movback/trunk/build_en.bat b/programs/demos/movback/trunk/build_en.bat index df71faaa0..d0e61b85c 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/movback/trunk/build_ru.bat b/programs/demos/movback/trunk/build_ru.bat index 3d8baad4f..05b5a016e 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/plasma/trunk/Tupfile.lua b/programs/demos/plasma/trunk/Tupfile.lua index 38a00ae24..0f14570ce 100644 --- 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") diff --git a/programs/demos/plasma/trunk/build_en.bat b/programs/demos/plasma/trunk/build_en.bat index 026ef3cfa..d0407c43a 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/plasma/trunk/build_ru.bat b/programs/demos/plasma/trunk/build_ru.bat index 04aeafe97..ee8302c88 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/ray/Tupfile.lua b/programs/demos/ray/Tupfile.lua index 3c7bd4c14..2a6d276d5 100644 --- 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") diff --git a/programs/demos/timer/trunk/Tupfile.lua b/programs/demos/timer/trunk/Tupfile.lua index 789b97a25..98a03f28b 100644 --- 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") diff --git a/programs/demos/timer/trunk/build_en.bat b/programs/demos/timer/trunk/build_en.bat index a5a0f4adb..0236f67f2 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/timer/trunk/build_ru.bat b/programs/demos/timer/trunk/build_ru.bat index 88cc8921e..696586707 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/timer/trunk/timer.asm b/programs/demos/timer/trunk/timer.asm index df797aa96..1d7f8723f 100644 --- a/programs/demos/timer/trunk/timer.asm +++ b/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 '',0 else title db 'TIMER',0 diff --git a/programs/demos/tinyfrac/trunk/Tupfile.lua b/programs/demos/tinyfrac/trunk/Tupfile.lua index e05df2103..9837b93ca 100644 --- 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") diff --git a/programs/demos/tinyfrac/trunk/build_en.bat b/programs/demos/tinyfrac/trunk/build_en.bat index 64ac99c5a..66b182f8c 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/tinyfrac/trunk/build_ru.bat b/programs/demos/tinyfrac/trunk/build_ru.bat index af88d4a53..4aa1f5c3f 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/transp/trunk/Tupfile.lua b/programs/demos/transp/trunk/Tupfile.lua index d37456f14..9f039bc33 100644 --- 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") diff --git a/programs/demos/transp/trunk/build_en.bat b/programs/demos/transp/trunk/build_en.bat index 361a5f68f..3ef165d51 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/transp/trunk/build_ru.bat b/programs/demos/transp/trunk/build_ru.bat index 20c335837..664f3d004 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/trantest/trunk/Tupfile.lua b/programs/demos/trantest/trunk/Tupfile.lua index fe993b068..27217e426 100644 --- 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") diff --git a/programs/demos/trantest/trunk/ascgl.inc b/programs/demos/trantest/trunk/ascgl.inc index f8188e757..6f118e067 100644 --- 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 diff --git a/programs/demos/trantest/trunk/ascl.inc b/programs/demos/trantest/trunk/ascl.inc index 13c2ad3a9..ad5e82603 100644 --- 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 diff --git a/programs/demos/trantest/trunk/build_en.bat b/programs/demos/trantest/trunk/build_en.bat index 4dd70e4a5..f687a20a3 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/trantest/trunk/build_ru.bat b/programs/demos/trantest/trunk/build_ru.bat index d59c03fb1..bc06eddcf 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/tube/trunk/build_en.bat b/programs/demos/tube/trunk/build_en.bat index 8f1b4af96..6880bd5a3 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/tube/trunk/build_ru.bat b/programs/demos/tube/trunk/build_ru.bat index 4396d4b20..79a32e179 100644 --- 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 \ No newline at end of file +@pause diff --git a/programs/demos/use_mb/Tupfile.lua b/programs/demos/use_mb/Tupfile.lua index 4d9eb49ce..b45f07aed 100644 --- 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") diff --git a/programs/demos/use_mb/use_mb.asm b/programs/demos/use_mb/use_mb.asm index 966156ec4..4cea05501 100644 --- 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 'ਬ',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 'ਬ 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 '',0,'',0,'',0,'',0,'',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 '...' else txt_help db 'Help...' diff --git a/programs/develop/SPForth/meforth.ASM b/programs/develop/SPForth/meforth.ASM index 5079609c6..19649e100 100644 --- a/programs/develop/SPForth/meforth.ASM +++ b/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' diff --git a/programs/develop/cObj/trunk/Tupfile.lua b/programs/develop/cObj/trunk/Tupfile.lua index 6b3170d6a..3512bf37d 100644 --- a/programs/develop/cObj/trunk/Tupfile.lua +++ b/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") diff --git a/programs/develop/cObj/trunk/build_en.bat b/programs/develop/cObj/trunk/build_en.bat index f7997d89d..c48dafe51 100644 --- a/programs/develop/cObj/trunk/build_en.bat +++ b/programs/develop/cObj/trunk/build_en.bat @@ -1,5 +1,5 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm cObj.asm cObj @kpack cObj @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/cObj/trunk/build_ru.bat b/programs/develop/cObj/trunk/build_ru.bat index 38a9a0837..a91f38087 100644 --- a/programs/develop/cObj/trunk/build_ru.bat +++ b/programs/develop/cObj/trunk/build_ru.bat @@ -1,5 +1,5 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm cObj.asm cObj @kpack cObj @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/clipboard/build.bat b/programs/develop/examples/clipboard/build.bat index c08a5eba0..4b5153439 100644 --- a/programs/develop/examples/clipboard/build.bat +++ b/programs/develop/examples/clipboard/build.bat @@ -1,7 +1,7 @@ -@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 @kpack clip_put @kpack clip_get -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/cpuspeed/trunk/Tupfile.lua b/programs/develop/examples/cpuspeed/trunk/Tupfile.lua index f73d1268f..a2ce38990 100644 --- a/programs/develop/examples/cpuspeed/trunk/Tupfile.lua +++ b/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") diff --git a/programs/develop/examples/cpuspeed/trunk/build_en.bat b/programs/develop/examples/cpuspeed/trunk/build_en.bat index 8680e5da3..b4724f5d1 100644 --- a/programs/develop/examples/cpuspeed/trunk/build_en.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/cpuspeed/trunk/build_ru.bat b/programs/develop/examples/cpuspeed/trunk/build_ru.bat index 7730b4602..85b33582f 100644 --- a/programs/develop/examples/cpuspeed/trunk/build_ru.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/example/trunk/build_en.bat b/programs/develop/examples/example/trunk/build_en.bat index 415bfcc62..6cd974fd4 100644 --- a/programs/develop/examples/example/trunk/build_en.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/example/trunk/rus/build_ru.bat b/programs/develop/examples/example/trunk/rus/build_ru.bat index 0ceaa6a5e..af0208ab6 100644 --- a/programs/develop/examples/example/trunk/rus/build_ru.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/example2/trunk/Tupfile.lua b/programs/develop/examples/example2/trunk/Tupfile.lua index b9f102316..15dc7cacd 100644 --- a/programs/develop/examples/example2/trunk/Tupfile.lua +++ b/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") diff --git a/programs/develop/examples/example2/trunk/build_en.bat b/programs/develop/examples/example2/trunk/build_en.bat index 057443677..395ae3c07 100644 --- a/programs/develop/examples/example2/trunk/build_en.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/example2/trunk/build_ru.bat b/programs/develop/examples/example2/trunk/build_ru.bat index 8bad73b54..4338ffb5a 100644 --- a/programs/develop/examples/example2/trunk/build_ru.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/example3/trunk/Tupfile.lua b/programs/develop/examples/example3/trunk/Tupfile.lua index 860b17de6..ef39bd573 100644 --- a/programs/develop/examples/example3/trunk/Tupfile.lua +++ b/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") diff --git a/programs/develop/examples/example3/trunk/build_en.bat b/programs/develop/examples/example3/trunk/build_en.bat index effd9f155..ac4d43da6 100644 --- a/programs/develop/examples/example3/trunk/build_en.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/example3/trunk/build_ru.bat b/programs/develop/examples/example3/trunk/build_ru.bat index 3cf78218c..ccd0dfce3 100644 --- a/programs/develop/examples/example3/trunk/build_ru.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/example3/trunk/example3.asm b/programs/develop/examples/example3/trunk/example3.asm index d4491f934..6c0f2f7fa 100644 --- a/programs/develop/examples/example3/trunk/example3.asm +++ b/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 'ਬ ',0 button_no db ' 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 '',0 sz_Load db '',0 diff --git a/programs/develop/examples/hello/trunk/Tupfile.lua b/programs/develop/examples/hello/trunk/Tupfile.lua index c3f45d89f..293756980 100644 --- a/programs/develop/examples/hello/trunk/Tupfile.lua +++ b/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") diff --git a/programs/develop/examples/hello/trunk/build_en.bat b/programs/develop/examples/hello/trunk/build_en.bat index e746c594d..9bce1ed81 100644 --- a/programs/develop/examples/hello/trunk/build_en.bat +++ b/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 \ No newline at end of file +@pause diff --git a/programs/develop/examples/hello/trunk/build_ru.bat b/programs/develop/examples/hello/trunk/build_ru.bat index 3f34d26e7..4b23f5319 100644 --- a/programs/develop/examples/hello/trunk/build_ru.bat +++ b/programs/develop/examples/hello/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 hello.asm hello @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/ipc/trunk/Tupfile.lua b/programs/develop/examples/ipc/trunk/Tupfile.lua index f8323d557..ef6636c38 100644 --- a/programs/develop/examples/ipc/trunk/Tupfile.lua +++ b/programs/develop/examples/ipc/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({"ipc.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ipc") diff --git a/programs/develop/examples/ipc/trunk/build_en.bat b/programs/develop/examples/ipc/trunk/build_en.bat index 6ab873fc0..9340ae217 100644 --- a/programs/develop/examples/ipc/trunk/build_en.bat +++ b/programs/develop/examples/ipc/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 ipc.asm ipc @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/ipc/trunk/build_ru.bat b/programs/develop/examples/ipc/trunk/build_ru.bat index 88a1b0b95..c8e3d05b5 100644 --- a/programs/develop/examples/ipc/trunk/build_ru.bat +++ b/programs/develop/examples/ipc/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 ipc.asm ipc @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/ir/trunk/Tupfile.lua b/programs/develop/examples/ir/trunk/Tupfile.lua index 089a26aa7..1f1bbc8ed 100644 --- a/programs/develop/examples/ir/trunk/Tupfile.lua +++ b/programs/develop/examples/ir/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({"ir.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "ir") diff --git a/programs/develop/examples/ir/trunk/build_en.bat b/programs/develop/examples/ir/trunk/build_en.bat index 8840ded14..138dadb76 100644 --- a/programs/develop/examples/ir/trunk/build_en.bat +++ b/programs/develop/examples/ir/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 ir.asm ir @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/ir/trunk/build_ru.bat b/programs/develop/examples/ir/trunk/build_ru.bat index 5bd16c9f6..858eb9e97 100644 --- a/programs/develop/examples/ir/trunk/build_ru.bat +++ b/programs/develop/examples/ir/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 ir.asm ir @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/rtdata/trunk/Tupfile.lua b/programs/develop/examples/rtdata/trunk/Tupfile.lua index 8407fdcbb..1c9b85d3c 100644 --- a/programs/develop/examples/rtdata/trunk/Tupfile.lua +++ b/programs/develop/examples/rtdata/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({"rtdata.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rtdata") diff --git a/programs/develop/examples/rtdata/trunk/build_en.bat b/programs/develop/examples/rtdata/trunk/build_en.bat index b7fdaf566..4b86d9e18 100644 --- a/programs/develop/examples/rtdata/trunk/build_en.bat +++ b/programs/develop/examples/rtdata/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 rtdata.asm rtdata @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/rtdata/trunk/build_ru.bat b/programs/develop/examples/rtdata/trunk/build_ru.bat index fcba6dc85..ac69d7135 100644 --- a/programs/develop/examples/rtdata/trunk/build_ru.bat +++ b/programs/develop/examples/rtdata/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 rtdata.asm rtdata @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/rtdata/trunk/rtdata.asm b/programs/develop/examples/rtdata/trunk/rtdata.asm index 8441378a4..87b6ae841 100644 --- a/programs/develop/examples/rtdata/trunk/rtdata.asm +++ b/programs/develop/examples/rtdata/trunk/rtdata.asm @@ -202,7 +202,7 @@ ret ; DATA AREA -if lang eq ru +if lang eq ru_RU text mstr " .",\ " ",\ " IRQ4 ." diff --git a/programs/develop/examples/template/trunk/Tupfile.lua b/programs/develop/examples/template/trunk/Tupfile.lua index f1ec0f96c..c83996acb 100644 --- a/programs/develop/examples/template/trunk/Tupfile.lua +++ b/programs/develop/examples/template/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({"template.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "template") diff --git a/programs/develop/examples/template/trunk/build_en.bat b/programs/develop/examples/template/trunk/build_en.bat index 74c122fa4..005f3879b 100644 --- a/programs/develop/examples/template/trunk/build_en.bat +++ b/programs/develop/examples/template/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 template.asm template @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/template/trunk/build_ru.bat b/programs/develop/examples/template/trunk/build_ru.bat index 4f03c8ac4..24d6e8357 100644 --- a/programs/develop/examples/template/trunk/build_ru.bat +++ b/programs/develop/examples/template/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 template.asm template @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/template/trunk/template.asm b/programs/develop/examples/template/trunk/template.asm index d2b77e2ee..28d58ddac 100644 --- a/programs/develop/examples/template/trunk/template.asm +++ b/programs/develop/examples/template/trunk/template.asm @@ -76,9 +76,9 @@ CODE ; <--- initialised data ---> DATA -if lang eq ru +if lang eq ru_RU title db ' ணࠬ',0 -else if lang eq fr +else if lang eq fr_FR title db 'La programme poncive',0 else title db 'Template program',0 diff --git a/programs/develop/examples/thread/trunk/Tupfile.lua b/programs/develop/examples/thread/trunk/Tupfile.lua index d24b77420..3643035d4 100644 --- a/programs/develop/examples/thread/trunk/Tupfile.lua +++ b/programs/develop/examples/thread/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({"thread.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "thread") diff --git a/programs/develop/examples/thread/trunk/build_en.bat b/programs/develop/examples/thread/trunk/build_en.bat index a98d64d1c..0a768b1f8 100644 --- a/programs/develop/examples/thread/trunk/build_en.bat +++ b/programs/develop/examples/thread/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 thread.asm thread -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/thread/trunk/build_ru.bat b/programs/develop/examples/thread/trunk/build_ru.bat index 0617e389f..4e3c369f2 100644 --- a/programs/develop/examples/thread/trunk/build_ru.bat +++ b/programs/develop/examples/thread/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 thread.asm thread -@pause \ No newline at end of file +@pause diff --git a/programs/develop/examples/thread/trunk/thread.asm b/programs/develop/examples/thread/trunk/thread.asm index 64ee76337..07eb0b117 100644 --- a/programs/develop/examples/thread/trunk/thread.asm +++ b/programs/develop/examples/thread/trunk/thread.asm @@ -127,7 +127,7 @@ draw_window: ; DATA AREA -if lang eq ru +if lang eq ru_RU text: db ' ணࠬ ᮧ ⮪, ᪠ ' db ' ࠧ. 㦭 ' diff --git a/programs/develop/fasm/1.73/Tupfile.lua b/programs/develop/fasm/1.73/Tupfile.lua index 5b37ef2cd..6d097a651 100644 --- a/programs/develop/fasm/1.73/Tupfile.lua +++ b/programs/develop/fasm/1.73/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({"fasm.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "fasm") diff --git a/programs/develop/fasm/1.73/build_en.bat b/programs/develop/fasm/1.73/build_en.bat index 3a9bb91ba..01d909107 100644 --- a/programs/develop/fasm/1.73/build_en.bat +++ b/programs/develop/fasm/1.73/build_en.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 fasm.asm fasm @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/fasm/1.73/build_ru.bat b/programs/develop/fasm/1.73/build_ru.bat index 5c37020b3..699aac51a 100644 --- a/programs/develop/fasm/1.73/build_ru.bat +++ b/programs/develop/fasm/1.73/build_ru.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 fasm.asm fasm @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/fasm/1.73/traslations.inc b/programs/develop/fasm/1.73/traslations.inc index 9839623d3..3f250a683 100644 --- a/programs/develop/fasm/1.73/traslations.inc +++ b/programs/develop/fasm/1.73/traslations.inc @@ -1,7 +1,7 @@ include 'lang.inc' -if lang eq ru +if lang eq ru_RU text db ' 唠:','唠:',' :' .line_size = ($-text)/3 diff --git a/programs/develop/fasm/tags/1.68/build_en.bat b/programs/develop/fasm/tags/1.68/build_en.bat index 2cdc42742..046e20b6d 100644 --- a/programs/develop/fasm/tags/1.68/build_en.bat +++ b/programs/develop/fasm/tags/1.68/build_en.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm fasm.asm fasm @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/fasm/tags/1.68/build_ru.bat b/programs/develop/fasm/tags/1.68/build_ru.bat index 69a543749..e2ea8f91b 100644 --- a/programs/develop/fasm/tags/1.68/build_ru.bat +++ b/programs/develop/fasm/tags/1.68/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm fasm.asm fasm @erase lang.inc @kpack fasm -@pause \ No newline at end of file +@pause diff --git a/programs/develop/fasm/tags/1.71/Tupfile.lua b/programs/develop/fasm/tags/1.71/Tupfile.lua index 837b68e2a..9622614d0 100644 --- a/programs/develop/fasm/tags/1.71/Tupfile.lua +++ b/programs/develop/fasm/tags/1.71/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({"fasm.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "fasm") diff --git a/programs/develop/fasm/tags/1.71/build_en.bat b/programs/develop/fasm/tags/1.71/build_en.bat index df6821729..c4101ccb5 100644 --- a/programs/develop/fasm/tags/1.71/build_en.bat +++ b/programs/develop/fasm/tags/1.71/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 fasm.asm fasm @erase lang.inc @kpack fasm -@pause \ No newline at end of file +@pause diff --git a/programs/develop/fasm/tags/1.71/build_ru.bat b/programs/develop/fasm/tags/1.71/build_ru.bat index 0c8fe4bdf..68d3dbb15 100644 --- a/programs/develop/fasm/tags/1.71/build_ru.bat +++ b/programs/develop/fasm/tags/1.71/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 fasm.asm fasm @erase lang.inc @kpack fasm -@pause \ No newline at end of file +@pause diff --git a/programs/develop/fasm/tags/1.71/fasm.asm b/programs/develop/fasm/tags/1.71/fasm.asm index d3e76b36c..ba9f1f89c 100644 --- a/programs/develop/fasm/tags/1.71/fasm.asm +++ b/programs/develop/fasm/tags/1.71/fasm.asm @@ -463,7 +463,7 @@ _sx = 6 ;--------------------------------------------------------------------- ; DATA ;--------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU text: db ' 唠:' .line_size = $-text diff --git a/programs/develop/h2d2b/trunk/Tupfile.lua b/programs/develop/h2d2b/trunk/Tupfile.lua index 51065fb38..5456b466f 100644 --- a/programs/develop/h2d2b/trunk/Tupfile.lua +++ b/programs/develop/h2d2b/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({"h2d2b.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "h2d2b") diff --git a/programs/develop/h2d2b/trunk/build_en.bat b/programs/develop/h2d2b/trunk/build_en.bat index a76b3455f..de9f192a8 100644 --- a/programs/develop/h2d2b/trunk/build_en.bat +++ b/programs/develop/h2d2b/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm h2d2b.asm h2d2b @kpack h2d2b @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/h2d2b/trunk/build_ru.bat b/programs/develop/h2d2b/trunk/build_ru.bat index eb5654f30..908c3f1f0 100644 --- a/programs/develop/h2d2b/trunk/build_ru.bat +++ b/programs/develop/h2d2b/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm h2d2b.asm h2d2b @kpack h2d2b @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/h2d2b/trunk/h2d2b.asm b/programs/develop/h2d2b/trunk/h2d2b.asm index 846f9ae69..157ddf5fe 100644 --- a/programs/develop/h2d2b/trunk/h2d2b.asm +++ b/programs/develop/h2d2b/trunk/h2d2b.asm @@ -272,7 +272,7 @@ string1_end: sdecstr db 'signed dec:',0 shl_sal_sar_shr_button_caption db 'shl sal sar shr',0 -if lang eq ru +if lang eq ru_RU numstr db '᫮:',0 Okstr db '',0 else diff --git a/programs/develop/heed/trunk/Tupfile.lua b/programs/develop/heed/trunk/Tupfile.lua index 834cca633..4887a5de8 100644 --- a/programs/develop/heed/trunk/Tupfile.lua +++ b/programs/develop/heed/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({"heed.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "heed") diff --git a/programs/develop/heed/trunk/build.sh b/programs/develop/heed/trunk/build.sh index 74f032ab0..9e46d941d 100755 --- a/programs/develop/heed/trunk/build.sh +++ b/programs/develop/heed/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc mkdir bin fasm -m 16384 heed.asm ./bin/heed kpack ./bin/heed diff --git a/programs/develop/heed/trunk/build_en.bat b/programs/develop/heed/trunk/build_en.bat index 91ce6000e..5ce74752b 100644 --- a/programs/develop/heed/trunk/build_en.bat +++ b/programs/develop/heed/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm heed.asm heed @kpack heed @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/heed/trunk/build_ru.bat b/programs/develop/heed/trunk/build_ru.bat index 2480b0b92..47fd89f84 100644 --- a/programs/develop/heed/trunk/build_ru.bat +++ b/programs/develop/heed/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm heed.asm heed @kpack heed @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/heed/trunk/heed.asm b/programs/develop/heed/trunk/heed.asm index 17444da65..6621e35fe 100644 --- a/programs/develop/heed/trunk/heed.asm +++ b/programs/develop/heed/trunk/heed.asm @@ -2963,7 +2963,7 @@ menu_data_1: .mouse_pos dd 0 ;+24 .mouse_keys dd 0 ;+28 .x1: -if lang eq ru +if lang eq ru_RU .size_x1 dw 4*2+9*6 ;+32 else .size_x1 dw 40 ;+32 @@ -2994,7 +2994,7 @@ end if .get_mouse_flag dd 0 ;+116 menu_text_area: -if lang eq ru +if lang eq ru_RU db '',0 .1: db '',0 @@ -3053,7 +3053,7 @@ menu_data_2: .get_mouse_flag dd 0 ;+116 menu_text_area_2: -if lang eq ru +if lang eq ru_RU db '',0 .1: else @@ -3072,7 +3072,7 @@ align 4 menu_data_3: .type: dd 0 ;+0 .x: -if lang eq ru +if lang eq ru_RU .size_x dw 4*2+7*6 ;+32 else .size_x dw 40 ;+4 @@ -3087,7 +3087,7 @@ end if .mouse_pos dd 0 ;+24 .mouse_keys dd 0 ;+28 .x1: -if lang eq ru +if lang eq ru_RU .size_x1 dw 4*2+7*6 ;+32 else .size_x1 dw 40 ;+32 @@ -3118,7 +3118,7 @@ end if .get_mouse_flag dd 0 ;+116 menu_text_area_3: -if lang eq ru +if lang eq ru_RU db 'ࠢ',0 .1: db 'ࠢ',0 @@ -3148,7 +3148,7 @@ Option_boxs dd op1,op2,op3,0 Option_boxs2 dd op11,op12,0 op_text: ; ஢騩 ⥪ 祪 ᮢ -if lang eq ru +if lang eq ru_RU .1 db '᮫⭮' .e1: .2 db '।' @@ -3178,7 +3178,7 @@ sel_text db "From to",0 help_but_text = menu_text_area_3 ;db 'Help',0 head_f_i: -if lang eq ru +if lang eq ru_RU error_open_file_string db " !",0 error_save_file_string db " ࠭!",0 else @@ -3218,7 +3218,7 @@ flags dw 001000010b ;10: "" ᪮஢ ;-------------------------------------------------------------------- help_text: -if lang eq ru +if lang eq ru_RU db 'Ctrl+O - 䠩 ' db 'Ctrl+S - ࠭ ' db 'PageUp, PageDown - ࠭ / ' diff --git a/programs/develop/info3ds/Tupfile.lua b/programs/develop/info3ds/Tupfile.lua index 48505b60d..882e7d3d7 100644 --- a/programs/develop/info3ds/Tupfile.lua +++ b/programs/develop/info3ds/Tupfile.lua @@ -3,6 +3,6 @@ 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({"info3ds.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "info3ds") tup.rule({"info3ds_u.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "info3ds_u") diff --git a/programs/develop/info3ds/build_en.bat b/programs/develop/info3ds/build_en.bat index 1ac1ad1e3..d2f53d285 100644 --- a/programs/develop/info3ds/build_en.bat +++ b/programs/develop/info3ds/build_en.bat @@ -1,6 +1,6 @@ if not exist bin mkdir bin @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @copy objects.png bin\objects.png if not exist bin\info3ds.ini @copy info3ds.ini bin\info3ds.ini if not exist bin\toolbar.png @copy toolbar.png bin\toolbar.png @@ -9,4 +9,4 @@ if not exist bin\font8x9.bmp @copy ..\..\fs\kfar\trunk\font8x9.bmp bin\font8x9.b @kpack bin\info3ds.kex @fasm.exe -m 16384 info3ds_u.asm bin\info3ds_u.kex @kpack bin\info3ds_u.kex -pause \ No newline at end of file +pause diff --git a/programs/develop/info3ds/build_ru.bat b/programs/develop/info3ds/build_ru.bat index 3aef31cc0..278cbf03a 100644 --- a/programs/develop/info3ds/build_ru.bat +++ b/programs/develop/info3ds/build_ru.bat @@ -1,6 +1,6 @@ if not exist bin mkdir bin @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @copy objects.png bin\objects.png if not exist bin\info3ds.ini @copy info3ds.ini bin\info3ds.ini if not exist bin\toolbar.png @copy toolbar.png bin\toolbar.png @@ -9,4 +9,4 @@ if not exist bin\font8x9.bmp @copy ..\..\fs\kfar\trunk\font8x9.bmp bin\font8x9.b @kpack bin\info3ds.kex @fasm.exe -m 16384 info3ds_u.asm bin\info3ds_u.kex @kpack bin\info3ds_u.kex -pause \ No newline at end of file +pause diff --git a/programs/develop/info3ds/convert_stl_3ds.inc b/programs/develop/info3ds/convert_stl_3ds.inc index f7f4fcb73..10fdbc935 100644 --- a/programs/develop/info3ds/convert_stl_3ds.inc +++ b/programs/develop/info3ds/convert_stl_3ds.inc @@ -23,7 +23,7 @@ ; uint16 - ਡ -if lang eq ru +if lang eq ru_RU txt_err_stl_open: db '"STL',13,10 db ' *.stl 祭 让." -tW',0 @@ -456,4 +456,4 @@ proc txt_next_line uses eax ecx edi, mlen:dword @@: mov esi,edi ret -endp \ No newline at end of file +endp diff --git a/programs/develop/info3ds/data.inc b/programs/develop/info3ds/data.inc index 2beb70714..9468b52b5 100644 --- a/programs/develop/info3ds/data.inc +++ b/programs/develop/info3ds/data.inc @@ -124,7 +124,7 @@ block_3ds 0xa08c, 3,1,txt_a08c block_3ds 0xa08e, 3,1,txt_a08e .end: -if lang eq ru +if lang eq ru_RU txt_0002 db '3ds ',0 txt_0011 db ' rgb (⮢ ଠ)',0 ;txt_0012 db 'LIN_COLOR_24',0 @@ -289,7 +289,7 @@ txt_a08e db 'Wire in units',0 txt_not_delete db 'I can not delete the selected chunk. It is protected.',0 end if -if lang eq ru +if lang eq ru_RU txt_open_3ds db ' 䠩:',0 txt_no_3ds: db ' 䠩 ଠ *.3ds ',39 .zag: rb 8 @@ -317,4 +317,4 @@ txt_3ds_offs: .siz: rb 8 db 0 txt_mat_null db 'No materials found',0 -end if \ No newline at end of file +end if diff --git a/programs/develop/info3ds/info3ds.asm b/programs/develop/info3ds/info3ds.asm index a58aaef54..221225dd7 100644 --- a/programs/develop/info3ds/info3ds.asm +++ b/programs/develop/info3ds/info3ds.asm @@ -1361,7 +1361,7 @@ mat_shininess dd 3.0 ; white_light dd 0.8, 0.8, 0.8, 1.0 ; ⥭ᨢ ᢥ饭, 㥬 筨 lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; ࠬ 䮭 ᢥ饭 -if lang eq ru +if lang eq ru_RU capt db 'info 3ds 29.09.20',0 ; else capt db 'info 3ds version 29.09.20',0 ;window caption diff --git a/programs/develop/info3ds/info3ds_u.asm b/programs/develop/info3ds/info3ds_u.asm index 7da065bc3..241950245 100644 --- a/programs/develop/info3ds/info3ds_u.asm +++ b/programs/develop/info3ds/info3ds_u.asm @@ -1426,7 +1426,7 @@ mat_shininess dd 3.0 ; white_light dd 0.8, 0.8, 0.8, 1.0 ; ⥭ᨢ ᢥ饭, 㥬 筨 lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; ࠬ 䮭 ᢥ饭 -if lang eq ru +if lang eq ru_RU capt db 'info 3ds [user] 29.09.20',0 ; else capt db 'info 3ds [user] version 29.09.20',0 ;window caption diff --git a/programs/develop/info3ds/info_menu.inc b/programs/develop/info3ds/info_menu.inc index 6a2e7ca25..64e76e302 100644 --- a/programs/develop/info3ds/info_menu.inc +++ b/programs/develop/info3ds/info_menu.inc @@ -1 +1 @@ - if lang eq ru sz_main_menu_View db '', 0 sz_main_menu_Veiw_Vertexes db '設 .', 0 sz_main_menu_Veiw_Faces db 'ઠ ࠭ .', 0 sz_main_menu_Veiw_Faces_Fill db ' ࠭ .', 0 sz_main_menu_Veiw_Light db ' ./몫.', 0 sz_main_menu_Veiw_Smooth db ' ./몫.', 0 sz_main_menu_Veiw_Reset db ' ஥', 0 if version_edit eq 0 sz_main_menu_Veiw_Faces_Mat db '梥 ࠭ .', 0 else sz_main_menu_Vertexes db '設', 0 sz_main_menu_Vertexes_Select db '뤥 設', 0 sz_main_menu_Vertexes_Deselect db '⬥ 뤥', 0 sz_main_menu_Average_x db '। x',0 sz_main_menu_Average_y db '। y',0 sz_main_menu_Average_z db '। z',0 end if else sz_main_menu_View db 'View', 0 sz_main_menu_Veiw_Vertexes db 'Vertexes on', 0 sz_main_menu_Veiw_Faces db 'Edges on', 0 sz_main_menu_Veiw_Faces_Fill db 'Faces on', 0 sz_main_menu_Veiw_Light db 'Light on/off', 0 sz_main_menu_Veiw_Smooth db 'Smooth on/off', 0 sz_main_menu_Veiw_Reset db 'Reset settings', 0 if version_edit eq 0 sz_main_menu_Veiw_Faces_Mat db 'Diferent color faces on', 0 else sz_main_menu_Vertexes db 'Vertexes', 0 sz_main_menu_Vertexes_Select db 'Select vertex', 0 sz_main_menu_Vertexes_Deselect db 'Deselect all', 0 sz_main_menu_Average_x db 'Average x',0 sz_main_menu_Average_y db 'Average y',0 sz_main_menu_Average_z db 'Average z',0 end if end if main_menu dd 0 main_menu_file dd 0 main_menu_view dd 0 main_menu_vertexes dd 0 KMENUITEM_NORMAL equ 0 KMENUITEM_SUBMENU equ 1 KMENUITEM_SEPARATOR equ 2 \ No newline at end of file + if lang eq ru_RU sz_main_menu_View db '', 0 sz_main_menu_Veiw_Vertexes db '設 .', 0 sz_main_menu_Veiw_Faces db 'ઠ ࠭ .', 0 sz_main_menu_Veiw_Faces_Fill db ' ࠭ .', 0 sz_main_menu_Veiw_Light db ' ./몫.', 0 sz_main_menu_Veiw_Smooth db ' ./몫.', 0 sz_main_menu_Veiw_Reset db ' ஥', 0 if version_edit eq 0 sz_main_menu_Veiw_Faces_Mat db '梥 ࠭ .', 0 else sz_main_menu_Vertexes db '設', 0 sz_main_menu_Vertexes_Select db '뤥 設', 0 sz_main_menu_Vertexes_Deselect db '⬥ 뤥', 0 sz_main_menu_Average_x db '। x',0 sz_main_menu_Average_y db '। y',0 sz_main_menu_Average_z db '। z',0 end if else sz_main_menu_View db 'View', 0 sz_main_menu_Veiw_Vertexes db 'Vertexes on', 0 sz_main_menu_Veiw_Faces db 'Edges on', 0 sz_main_menu_Veiw_Faces_Fill db 'Faces on', 0 sz_main_menu_Veiw_Light db 'Light on/off', 0 sz_main_menu_Veiw_Smooth db 'Smooth on/off', 0 sz_main_menu_Veiw_Reset db 'Reset settings', 0 if version_edit eq 0 sz_main_menu_Veiw_Faces_Mat db 'Diferent color faces on', 0 else sz_main_menu_Vertexes db 'Vertexes', 0 sz_main_menu_Vertexes_Select db 'Select vertex', 0 sz_main_menu_Vertexes_Deselect db 'Deselect all', 0 sz_main_menu_Average_x db 'Average x',0 sz_main_menu_Average_y db 'Average y',0 sz_main_menu_Average_z db 'Average z',0 end if end if main_menu dd 0 main_menu_file dd 0 main_menu_view dd 0 main_menu_vertexes dd 0 KMENUITEM_NORMAL equ 0 KMENUITEM_SUBMENU equ 1 KMENUITEM_SEPARATOR equ 2 diff --git a/programs/develop/info3ds/info_o3d.inc b/programs/develop/info3ds/info_o3d.inc index 4fb34f048..a576398e6 100644 --- a/programs/develop/info3ds/info_o3d.inc +++ b/programs/develop/info3ds/info_o3d.inc @@ -59,7 +59,7 @@ key_face db 'col_faces',0 key_select db 'col_select',0 txt_err_save_img_file: -if lang eq ru +if lang eq ru_RU db '" ࠭ 䠩." -W',0 else db '"Can',39,'t save file." -W',0 diff --git a/programs/develop/info3ds/info_wnd_coords.inc b/programs/develop/info3ds/info_wnd_coords.inc index f3d4fe71e..1aec2c894 100644 --- a/programs/develop/info3ds/info_wnd_coords.inc +++ b/programs/develop/info3ds/info_wnd_coords.inc @@ -25,7 +25,7 @@ obj_point: ; .text: rb MAX_OBJECT_SIZE -if lang eq ru +if lang eq ru_RU txt_select_vert: db '࠭: ' else txt_select_vert: db 'Select: ' diff --git a/programs/develop/keyascii/trunk/Tupfile.lua b/programs/develop/keyascii/trunk/Tupfile.lua index ef40b3d40..8cb77fefd 100644 --- a/programs/develop/keyascii/trunk/Tupfile.lua +++ b/programs/develop/keyascii/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({"keyascii.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "keyascii") diff --git a/programs/develop/keyascii/trunk/build_en.bat b/programs/develop/keyascii/trunk/build_en.bat index a652e7808..63b1fa537 100644 --- a/programs/develop/keyascii/trunk/build_en.bat +++ b/programs/develop/keyascii/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 keyascii.asm keyascii @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/keyascii/trunk/build_ru.bat b/programs/develop/keyascii/trunk/build_ru.bat index 22a28ed45..1a3c1adbd 100644 --- a/programs/develop/keyascii/trunk/build_ru.bat +++ b/programs/develop/keyascii/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 keyascii.asm keyascii @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/kol_f_edit/Tupfile.lua b/programs/develop/kol_f_edit/Tupfile.lua index 759fe5bad..3618afc64 100644 --- a/programs/develop/kol_f_edit/Tupfile.lua +++ b/programs/develop/kol_f_edit/Tupfile.lua @@ -3,6 +3,6 @@ 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({"kol_f_edit.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bin/kol_f_edit") tup.rule({"ob_o.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o", "bin/ob_o.opt") diff --git a/programs/develop/kol_f_edit/ob_o.asm b/programs/develop/kol_f_edit/ob_o.asm index a1706e295..d77d9f395 100644 --- a/programs/develop/kol_f_edit/ob_o.asm +++ b/programs/develop/kol_f_edit/ob_o.asm @@ -1,4 +1,4 @@ -;lang equ ru +;lang equ ru_RU include 'obj_codes.inc' diff --git a/programs/develop/libraries/InputBox/make_sp.bat b/programs/develop/libraries/InputBox/make_es.bat similarity index 100% rename from programs/develop/libraries/InputBox/make_sp.bat rename to programs/develop/libraries/InputBox/make_es.bat diff --git a/programs/develop/libraries/box_lib/asm/trunk/build.sh b/programs/develop/libraries/box_lib/asm/trunk/build.sh index 14012118e..6fa79da17 100755 --- a/programs/develop/libraries/box_lib/asm/trunk/build.sh +++ b/programs/develop/libraries/box_lib/asm/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for Linux the same as build.bat for DOS, # it compiles the current KolibriOS applications - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc mkdir bin fasm -m 16384 ctrldemo.asm ./bin/ctrldemo.kex fasm -m 16384 editbox_ex.asm ./bin/editbox_ex.kex diff --git a/programs/develop/libraries/box_lib/trunk/t_edit.asm b/programs/develop/libraries/box_lib/trunk/t_edit.asm index 5942465f7..e85b33bd4 100644 --- a/programs/develop/libraries/box_lib/trunk/t_edit.asm +++ b/programs/develop/libraries/box_lib/trunk/t_edit.asm @@ -52,7 +52,7 @@ ends ted_symbol_space db 32 ;ascii ஡, 뢠 㦥 ted_symbol_tab db 26 ;ascii ५ ࠢ, ᯮ ᮢ ⠡樨 ० ᨬ -if lang eq ru +if lang eq ru_RU txtRow db 'ப',0 txtCol db '',0 diff --git a/programs/develop/libraries/ufmod/Fasm/Tupfile.lua b/programs/develop/libraries/ufmod/Fasm/Tupfile.lua index 9c5735e33..663e552ee 100644 --- a/programs/develop/libraries/ufmod/Fasm/Tupfile.lua +++ b/programs/develop/libraries/ufmod/Fasm/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({"mini.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mini") diff --git a/programs/develop/scancode/trunk/Tupfile.lua b/programs/develop/scancode/trunk/Tupfile.lua index 63aa5ad69..c64f69238 100644 --- a/programs/develop/scancode/trunk/Tupfile.lua +++ b/programs/develop/scancode/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({"scancode.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "scancode") diff --git a/programs/develop/scancode/trunk/build_en.bat b/programs/develop/scancode/trunk/build_en.bat index ce4a4001b..25a338742 100644 --- a/programs/develop/scancode/trunk/build_en.bat +++ b/programs/develop/scancode/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 scancode.asm scancode @kpack scancode @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/scancode/trunk/build_ru.bat b/programs/develop/scancode/trunk/build_ru.bat index 050c9de2a..10eb24c7a 100644 --- a/programs/develop/scancode/trunk/build_ru.bat +++ b/programs/develop/scancode/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 scancode.asm scancode @kpack scancode @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/scancode/trunk/scancode.asm b/programs/develop/scancode/trunk/scancode.asm index 2f9d9a2fb..24c3a9f58 100644 --- a/programs/develop/scancode/trunk/scancode.asm +++ b/programs/develop/scancode/trunk/scancode.asm @@ -285,7 +285,7 @@ ext0: ext0end: -if lang eq ru +if lang eq ru_RU text: db ' ' .len = $ - text diff --git a/programs/develop/str_double/trunk/Tupfile.lua b/programs/develop/str_double/trunk/Tupfile.lua index 37e337453..ea70ee126 100644 --- a/programs/develop/str_double/trunk/Tupfile.lua +++ b/programs/develop/str_double/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({"str_double.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "str_double") diff --git a/programs/develop/str_double/trunk/build_en.bat b/programs/develop/str_double/trunk/build_en.bat index 0cef4124d..77b9a0ff6 100644 --- a/programs/develop/str_double/trunk/build_en.bat +++ b/programs/develop/str_double/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 str_double.asm str_double @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/str_double/trunk/build_ru.bat b/programs/develop/str_double/trunk/build_ru.bat index 32be3bf8e..5e294b247 100644 --- a/programs/develop/str_double/trunk/build_ru.bat +++ b/programs/develop/str_double/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 str_double.asm str_double @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/str_double/trunk/str_double.asm b/programs/develop/str_double/trunk/str_double.asm index 79403cc6f..7ad683ab2 100644 --- a/programs/develop/str_double/trunk/str_double.asm +++ b/programs/develop/str_double/trunk/str_double.asm @@ -256,7 +256,7 @@ hexstr db 'hex:',0 decstr db 'dec:',0 binstr db 'bin:',0 -if lang eq ru +if lang eq ru_RU numstr db '᫮:',0 Okstr db '',0 else diff --git a/programs/develop/tinypad/trunk/Tupfile.lua b/programs/develop/tinypad/trunk/Tupfile.lua index ff6922ce0..316919ed8 100644 --- a/programs/develop/tinypad/trunk/Tupfile.lua +++ b/programs/develop/tinypad/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({"tinypad.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tinypad") diff --git a/programs/develop/tinypad/trunk/build.sh b/programs/develop/tinypad/trunk/build.sh index bb0915df9..917e2a5de 100644 --- a/programs/develop/tinypad/trunk/build.sh +++ b/programs/develop/tinypad/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the program, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 tinypad.asm tinypad kpack tinypad rm -f lang.inc diff --git a/programs/develop/tinypad/trunk/build_en.bat b/programs/develop/tinypad/trunk/build_en.bat index 48003cecf..182488e5d 100644 --- a/programs/develop/tinypad/trunk/build_en.bat +++ b/programs/develop/tinypad/trunk/build_en.bat @@ -1,5 +1,5 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm tinypad.asm tinypad @kpack tinypad @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/tinypad/trunk/build_it.bat b/programs/develop/tinypad/trunk/build_it.bat index e79168746..a698e97a4 100644 --- a/programs/develop/tinypad/trunk/build_it.bat +++ b/programs/develop/tinypad/trunk/build_it.bat @@ -1,5 +1,5 @@ -@echo lang fix it >lang.inc +@echo lang fix it_IT >lang.inc @fasm tinypad.asm tinypad @kpack tinypad @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/develop/tinypad/trunk/build_ru.bat b/programs/develop/tinypad/trunk/build_ru.bat index 397c709d7..e6bc8a868 100644 --- a/programs/develop/tinypad/trunk/build_ru.bat +++ b/programs/develop/tinypad/trunk/build_ru.bat @@ -1,5 +1,5 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm tinypad.asm tinypad @kpack tinypad @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/fs/copyr/trunk/Tupfile.lua b/programs/fs/copyr/trunk/Tupfile.lua index 5348dad85..c57f5b769 100644 --- a/programs/fs/copyr/trunk/Tupfile.lua +++ b/programs/fs/copyr/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({"copyr.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "copyr") diff --git a/programs/fs/copyr/trunk/build_en.bat b/programs/fs/copyr/trunk/build_en.bat index 37c68227d..dca051ad8 100644 --- a/programs/fs/copyr/trunk/build_en.bat +++ b/programs/fs/copyr/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 copyr.asm copyr @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/fs/copyr/trunk/build_ru.bat b/programs/fs/copyr/trunk/build_ru.bat index 9b7d6177e..fcce9874d 100644 --- a/programs/fs/copyr/trunk/build_ru.bat +++ b/programs/fs/copyr/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 copyr.asm copyr @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/fs/copyr/trunk/copyr.asm b/programs/fs/copyr/trunk/copyr.asm index 97d570dbc..eefad8d2f 100644 --- a/programs/fs/copyr/trunk/copyr.asm +++ b/programs/fs/copyr/trunk/copyr.asm @@ -236,7 +236,7 @@ draw_window: ya dd 0x0 temp dd 0 -if lang eq ru +if lang eq ru_RU text: db ' : |, ⨭, ᪢ , 1 ' db ' : | 設 , waptap@mail.ru ' diff --git a/programs/fs/kfar/trunk/Tupfile.lua b/programs/fs/kfar/trunk/Tupfile.lua index c9021f72b..7c3d9c33c 100644 --- a/programs/fs/kfar/trunk/Tupfile.lua +++ b/programs/fs/kfar/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({"kfar.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kfar") diff --git a/programs/fs/kfar/trunk/build_en.bat b/programs/fs/kfar/trunk/build_en.bat index ebd13039c..7c24d76f7 100644 --- a/programs/fs/kfar/trunk/build_en.bat +++ b/programs/fs/kfar/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 kfar.asm kfar @erase lang.inc @kpack kfar -@pause \ No newline at end of file +@pause diff --git a/programs/fs/kfar/trunk/build_ru.bat b/programs/fs/kfar/trunk/build_ru.bat index 03da891ce..a05495e2b 100644 --- a/programs/fs/kfar/trunk/build_ru.bat +++ b/programs/fs/kfar/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 kfar.asm kfar @erase lang.inc @kpack kfar -@pause \ No newline at end of file +@pause diff --git a/programs/fs/kfar/trunk/filetool.inc b/programs/fs/kfar/trunk/filetool.inc index 9d4a19eef..168cfce79 100644 --- a/programs/fs/kfar/trunk/filetool.inc +++ b/programs/fs/kfar/trunk/filetool.inc @@ -1502,7 +1502,7 @@ filesearch_done: ret filesearch_getname: -if lang eq ru +if lang eq ru_RU mov eax, '' stosd mov eax, ' ' diff --git a/programs/fs/kfar/trunk/kfar.asm b/programs/fs/kfar/trunk/kfar.asm index 1808e4402..67f42e530 100644 --- a/programs/fs/kfar/trunk/kfar.asm +++ b/programs/fs/kfar/trunk/kfar.asm @@ -2564,7 +2564,7 @@ panels_OnKey: stosb jmp @b @@: -if lang eq ru +if lang eq ru_RU mov dword [edi], ' ' mov dword [edi+4], '' add edi, 8 @@ -2935,7 +2935,7 @@ end if mov edi, saved_file_name+511 mov byte [edi], 0 mov eax, [ebp + PanelData.selected_num] -if lang eq ru +if lang eq ru_RU cmp eax, 1 jz @f dec edi @@ -3788,7 +3788,7 @@ quick_find_prev: jmp @b panels_getname: -if lang eq ru +if lang eq ru_RU mov eax, '' stosd mov eax, ' ' @@ -4949,7 +4949,7 @@ draw_panel: fill_total_info: mov edi, saved_file_name+511 mov byte [edi], ' ' -if lang eq ru +if lang eq ru_RU mov byte [edi-1], '' dec edi cmp eax, 1 @@ -4981,7 +4981,7 @@ end if xor edx, edx test eax, eax jnz @b -if lang eq ru +if lang eq ru_RU mov dword [edi-4], ' ' mov dword [edi-8], ' ' sub edi, 8 @@ -5243,7 +5243,7 @@ draw_size_column: jnz .nodotdot cmp byte [esi+42], 0 jnz .nodotdot -if lang eq ru +if lang eq ru_RU mov al, '' stosw mov al, '' @@ -5269,7 +5269,7 @@ end if .nodotdot: test byte [esi], 10h jz .nofolder -if lang eq ru +if lang eq ru_RU mov al, '' stosw mov al, '' @@ -6850,7 +6850,7 @@ bSilentFolderMode db 1 bQuickSearchMode db 0 bDisplayQuickSearch db 0 -if lang eq ru +if lang eq ru_RU aFolder db '' .size = $-aFolder aUp db '' @@ -6876,7 +6876,7 @@ _100 db 100 fpu_cw dw 000011100111111b keybar_panels: -if lang eq ru +if lang eq ru_RU ; -䨪஢ db '' db '짌' @@ -7045,7 +7045,7 @@ times 12 db ' ' end if keybar_viewer: -if lang eq ru +if lang eq ru_RU ; -䨪஢ db '' db '' @@ -7216,7 +7216,7 @@ times 12 db ' ' end if keybar_editor: -if lang eq ru +if lang eq ru_RU ; -䨪஢ db '' db '࠭' @@ -7546,7 +7546,7 @@ encodings: .menu.1: dd .menu.2 dd 0 -if lang eq ru +if lang eq ru_RU db '&DOS ⥪ (cp866)',0 else db '&DOS text (cp866)',0 @@ -7555,7 +7555,7 @@ end if .menu.2: dd .menu.3 dd .menu.1 -if lang eq ru +if lang eq ru_RU db '&Windows ⥪ (cp1251)',0 else db '&Windows text (cp1251)',0 @@ -7564,7 +7564,7 @@ end if .menu.3: dd .menu.4 dd .menu.2 -if lang eq ru +if lang eq ru_RU db '&Linux ⥪ (koi8-r)',0 else db '&Linux text (koi8-r)',0 @@ -7930,7 +7930,7 @@ mkdirinfo: db 0 dd CopyDestEditBuf+12 -if lang eq ru +if lang eq ru_RU compare_names db 'ᑤ' else compare_names db 'nNxXmMsSuUcCaA' @@ -8315,7 +8315,7 @@ ConfirmCancelMsg dd aConfirmCancel EditConfigErr_ptr: dd aEditConfigErr1 dd aEditConfigErr2 -if lang eq ru +if lang eq ru_RU aDeleteCaption db '',0 aConfirmDeleteText db ' 㤠',0 aDeleteFolder db ' ',0 diff --git a/programs/fs/kfar/trunk/kfar_arc/7z.inc b/programs/fs/kfar/trunk/kfar_arc/7z.inc index 01e46dbba..758af0243 100644 --- a/programs/fs/kfar/trunk/kfar_arc/7z.inc +++ b/programs/fs/kfar/trunk/kfar_arc/7z.inc @@ -1950,7 +1950,7 @@ _7z.decode: call [SayErr] jmp return.clear iglobal -if lang eq ru +if lang eq ru_RU aUnknownMethod db ' ⮤:' else aUnknownMethod db 'Unknown method:' diff --git a/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua b/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua index a25632f0d..104d3e93d 100644 --- a/programs/fs/kfar/trunk/kfar_arc/Tupfile.lua +++ b/programs/fs/kfar/trunk/kfar_arc/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({"kfar_arc.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kfar_arc.obj") diff --git a/programs/fs/kfar/trunk/kfar_arc/kfar_arc.asm b/programs/fs/kfar/trunk/kfar_arc/kfar_arc.asm index 344239891..8afc43e0c 100644 --- a/programs/fs/kfar/trunk/kfar_arc/kfar_arc.asm +++ b/programs/fs/kfar/trunk/kfar_arc/kfar_arc.asm @@ -1406,7 +1406,7 @@ azError db 'zError',0 acalc_crc32 db 'calc_crc32',0 ; common strings -if lang eq ru +if lang eq ru_RU aContinue db 'த',0 aCancel db '⬥',0 aHeaderError db '訡 娢',0 diff --git a/programs/fs/kfar/trunk/viewer.inc b/programs/fs/kfar/trunk/viewer.inc index 19ee93e3d..6c9c1a9cc 100644 --- a/programs/fs/kfar/trunk/viewer.inc +++ b/programs/fs/kfar/trunk/viewer.inc @@ -512,7 +512,7 @@ viewer_draw_text: mov al, ' ' mov cl, 5 rep stosw -if lang eq ru +if lang eq ru_RU mov al, '' stosw mov al, '' @@ -1385,7 +1385,7 @@ viewer_prev_newline: viewer_set_keybar: mov eax, keybar_viewer -if lang eq ru +if lang eq ru_RU test [ebp+viewer_data.flags], 1 jnz .hex mov dword [eax+(4-1)*6], ' ' @@ -1805,7 +1805,7 @@ search_failed: ret viewer_getname: -if lang eq ru +if lang eq ru_RU mov eax, '' stosd mov eax, '' @@ -1823,7 +1823,7 @@ else end if jmp viewedit_getname editor_getname: -if lang eq ru +if lang eq ru_RU mov eax, '' stosd mov eax, '' diff --git a/programs/fs/kfm/trunk/Tupfile.lua b/programs/fs/kfm/trunk/Tupfile.lua index be5b04686..ac093a8c0 100644 --- a/programs/fs/kfm/trunk/Tupfile.lua +++ b/programs/fs/kfm/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({"kfm.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kfm") diff --git a/programs/fs/kfm/trunk/build.bat b/programs/fs/kfm/trunk/build.bat index 4953fffa6..231fac858 100644 --- a/programs/fs/kfm/trunk/build.bat +++ b/programs/fs/kfm/trunk/build.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 kfm.asm kfm @kpack kfm @erase lang.inc diff --git a/programs/fs/kfm/trunk/build.sh b/programs/fs/kfm/trunk/build.sh index b73493eed..2a2717079 100755 --- a/programs/fs/kfm/trunk/build.sh +++ b/programs/fs/kfm/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 kfm.asm kfm kpack kfm rm -f lang.inc diff --git a/programs/fs/opendial/build.bat b/programs/fs/opendial/build.bat index 66fd50694..5cbf8769f 100644 --- a/programs/fs/opendial/build.bat +++ b/programs/fs/opendial/build.bat @@ -1,5 +1,5 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm.exe -m 16384 opendial.asm opendial @erase lang.inc @kpack opendial -@pause \ No newline at end of file +@pause diff --git a/programs/fs/opendial/build.sh b/programs/fs/opendial/build.sh index 6a16b8aa1..319fece1a 100644 --- a/programs/fs/opendial/build.sh +++ b/programs/fs/opendial/build.sh @@ -2,8 +2,8 @@ # This script does for Linux the same as build.bat for DOS, # it compiles the current KolibriOS applications - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 opendial.asm opendial kpack opendial rm -f lang.inc diff --git a/programs/fs/unz/Tupfile.lua b/programs/fs/unz/Tupfile.lua index 83809d006..4928ebd83 100644 --- a/programs/fs/unz/Tupfile.lua +++ b/programs/fs/unz/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({"unz.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "unz") diff --git a/programs/fs/unz/make_en.bat b/programs/fs/unz/make_en.bat index bfe5eaf7f..7993efd61 100644 --- a/programs/fs/unz/make_en.bat +++ b/programs/fs/unz/make_en.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm unz.asm unz @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/fs/unz/make_ru.bat b/programs/fs/unz/make_ru.bat index 82bc79eca..9b313a317 100644 --- a/programs/fs/unz/make_ru.bat +++ b/programs/fs/unz/make_ru.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm unz.asm unz @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/fs/unz/unz.asm b/programs/fs/unz/unz.asm index 7977ce591..b524cf947 100644 --- a/programs/fs/unz/unz.asm +++ b/programs/fs/unz/unz.asm @@ -279,7 +279,7 @@ proc winRedraw mcall 4, <15,37>, , strPath mov ecx,[sc.work_button_text] or ecx,90000000h -if lang eq ru +if lang eq ru_RU mcall 4, <107,70>, , strGo else mcall 4, <127,70>, , strGo @@ -610,7 +610,7 @@ sc system_colors bWinChild db 0 ;1 - ୥ , ॠ஢ redInput db 0 ;1 - ᢥ -if lang eq ru +if lang eq ru_RU title db 'uNZ v0.2 - ᯠ騪 Zip 7z',0 strGo db 'ᯠ',0 strInp db ' 娢',0 @@ -624,7 +624,7 @@ if lang eq ru strUnpackFault db "'訡 ᯠ' -E",0 strNotSupport db "'ন ଠ 娢' -E",0 strNotFound db "' ' -E",0 -else if lang eq es +else if lang eq es_ES title db 'uNZ v0.2 - Desarchivador para Zip y 7z',0 strGo db 'Desarchivar',0 strInp db 'Archivar',0 diff --git a/programs/games/15/trunk/15.ASM b/programs/games/15/trunk/15.ASM index e069f9216..40de75e22 100644 --- a/programs/games/15/trunk/15.ASM +++ b/programs/games/15/trunk/15.ASM @@ -419,11 +419,11 @@ conf db 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,0,15 db 1,2,3,4,12,13,14,5,11,0,15,6,10,9,8,7,9 txtMoves: -if lang eq ru +if lang eq ru_RU db ':' -else if lang eq it +else if lang eq it_IT db 'Movimenti:' -else if lang eq de +else if lang eq de_DE db 'Bewegungen:' else db 'Moves:' @@ -431,11 +431,11 @@ end if lenMoves: txtSh: -if lang eq ru +if lang eq ru_RU db 'ᮢ' -else if lang eq it +else if lang eq it_IT db 'Mischia' -else if lang eq de +else if lang eq de_DE db 'Mischen' else db 'Shuffle' @@ -443,11 +443,11 @@ end if lenSh: txtCnf: -if lang eq ru +if lang eq ru_RU db '롥 ->' -else if lang eq it +else if lang eq it_IT db 'Seleziona un compito, poi premi->' -else if lang eq de +else if lang eq de_DE db 'Waehle eine Aufgabe, dann clicke au->' else db 'Select task, then press ->' @@ -455,22 +455,22 @@ end if lenCnf: txtTitle: ; ப -if lang eq ru +if lang eq ru_RU db ' 15 - X', 0 -else if lang eq it +else if lang eq it_IT db 'Gioco del quindici - partita X', 0 -else if lang eq de +else if lang eq de_DE db '15-Puzzle - Spiel X', 0 else db 'Game 15 - puzzle X', 0 end if txtVictory: -if lang eq ru +if lang eq ru_RU db ' 訫 ! ->' -else if lang eq it +else if lang eq it_IT db 'Gioco completato! Premi ->' -else if lang eq de +else if lang eq de_DE db 'Spiel beendet! Druecken sie auf ->' else db 'Puzzle completed! Press->' diff --git a/programs/games/15/trunk/Tupfile.lua b/programs/games/15/trunk/Tupfile.lua index ecce0ed2e..49da15d21 100644 --- a/programs/games/15/trunk/Tupfile.lua +++ b/programs/games/15/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({"15.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "15") diff --git a/programs/games/15/trunk/build_en.bat b/programs/games/15/trunk/build_en.bat index 7634a511e..8d3fc98d5 100644 --- a/programs/games/15/trunk/build_en.bat +++ b/programs/games/15/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 15.asm 15 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/15/trunk/build_ru.bat b/programs/games/15/trunk/build_ru.bat index 534252171..0b5c80d7f 100644 --- a/programs/games/15/trunk/build_ru.bat +++ b/programs/games/15/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 15.asm 15 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/15/trunk/makefile b/programs/games/15/trunk/makefile index d5c81bc93..6186e331a 100644 --- a/programs/games/15/trunk/makefile +++ b/programs/games/15/trunk/makefile @@ -9,19 +9,19 @@ SOURCE=${FILE}.ASM OUT=${FILE}.bin en: - echo "lang fix en" > lang.inc + echo "lang fix en_US" > lang.inc ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" > lang.inc ${FASM} ${SOURCE} ${OUT} de: - echo "lang fix de" > ${LANG} + echo "lang fix de_DE" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/games/Dungeons/Resources/Levels/1.inc b/programs/games/Dungeons/Resources/Levels/1.inc index cfef7ea5b..cb8d1cae7 100644 --- a/programs/games/Dungeons/Resources/Levels/1.inc +++ b/programs/games/Dungeons/Resources/Levels/1.inc @@ -194,7 +194,7 @@ proc level1.init .sun2_file_path db 'Resources/Textures/Objects/Sun2.png', 0 .sun3_file_path db 'Resources/Textures/Objects/Sun3.png', 0 -.message langstr0 ru, < \ +.message langstr0 ru_RU, < \ ' - ᪠⥫ ᮪஢.  ਢ ', 10, \ ' , , ᪠ ᥫ, ⮫⨩ ', 10, \ ', ࠢ⥫, ⠫ ᢮ . ', 10, \ @@ -224,7 +224,7 @@ proc level1.action uses ebx ecx edx, action, cell_x, cell_y mov eax, .message_door1_closed jmp .exit -.message_door1_closed langstr0 ru, < \ +.message_door1_closed langstr0 ru_RU, < \ '. 窨, 筮 ᪢. ', 10, \ '⭮, - 堭... ' > @@ -235,7 +235,7 @@ proc level1.action uses ebx ecx edx, action, cell_x, cell_y mov eax, .message_door3_closed jmp .exit -.message_door3_closed langstr0 ru, < \ +.message_door3_closed langstr0 ru_RU, < \ ' 㦥 , ࠧ ⠪ ', 10, \ ' 뫠. ' > @@ -249,7 +249,7 @@ proc level1.action uses ebx ecx edx, action, cell_x, cell_y mov eax, .message_door1_opens jmp .exit -.message_door1_opens langstr0 ru, < \ +.message_door1_opens langstr0 ru_RU, < \ ' 񤪨 ० 񭮪. ' > @@: cmp edx, level1.Grid + (11 * level1.Width + 8) * 4 @@ -302,7 +302,7 @@ proc level1.action uses ebx ecx edx, action, cell_x, cell_y mov [level1.Chest.Visible], 0 mov eax, .message_chest jmp .exit -.message_chest langstr0 ru, < \ +.message_chest langstr0 ru_RU, < \ ' 諨 㭤 嫮: 1 ⮩ ⪮ ', 10, \ '3- ⠬ ࠦ ᮫ ࠧ 䠧. ' > @@ -313,7 +313,7 @@ proc level1.action uses ebx ecx edx, action, cell_x, cell_y mov eax, .message_ogre jmp .exit -.message_ogre langstr0 ru, < \ +.message_ogre langstr0 ru_RU, < \ '- ⮩! 㤠 ? 室 . ' > @@: @@ -343,12 +343,12 @@ proc level1.action uses ebx ecx edx, action, cell_x, cell_y mov eax, .message_3levers jmp .exit -.message_3levers langstr0 ru, < \ +.message_3levers langstr0 ru_RU, < \ ' ⠢ 砣 㣮 . ' > -.message_door2_closed langstr0 ru, < \ +.message_door2_closed langstr0 ru_RU, < \ ' ᨫ, ᤢ ', 10, \ ' 稫. ' > -.message_door2_opens langstr0 ru, < \ +.message_door2_opens langstr0 ru_RU, < \ ' ⠫᪨ ०. ' > endp @@ -359,7 +359,7 @@ proc level1.columns uses ebx ecx, action, cell_x, cell_y jne @f mov eax, .message_description jmp .exit -.message_description langstr0 ru, < \ +.message_description langstr0 ru_RU, < \ '। ⮨ ᮪ ⭮ ', 10, \ '. ⮨  প ', 10, \ '⮫... ' > @@ -419,7 +419,7 @@ proc level1.columns uses ebx ecx, action, cell_x, cell_y @@: ret -.message_activated langstr0 ru, < \ +.message_activated langstr0 ru_RU, < \ ' 砫 ᢥ ', 10, \ '࠭ ᢥ⮬. ' > endp @@ -451,7 +451,7 @@ proc level1.ogre action, cell_x, cell_y .exit: ret -.message_ogre langstr0 ru, < \ +.message_ogre langstr0 ru_RU, < \ '- ! ⪠! ୨!!! ' > endp @@ -463,4 +463,4 @@ proc level1.portal action, cell_x, cell_y @@: xor eax, eax ret -endp \ No newline at end of file +endp diff --git a/programs/games/Dungeons/data.inc b/programs/games/Dungeons/data.inc index c517bb036..687daa997 100644 --- a/programs/games/Dungeons/data.inc +++ b/programs/games/Dungeons/data.inc @@ -62,8 +62,8 @@ end if MAIN_EVENT_MASK = EVM_REDRAW or EVM_KEY or EVM_BUTTON or EVM_MOUSE or EVM_MOUSE_FILTER MAIN_WINDOW_TITLE langstr0 \ - en, 'Dungeons of Augastes 0.1', \ - ru, ' 㣠 0.1' + en_US, 'Dungeons of Augastes 0.1', \ + ru_RU, ' 㣠 0.1' LevelLoadingImageFile db 'Resources/Textures/HUD/LevelLoading.png', 0 HudPanelImageFile db 'Resources/Textures/HUD/Panel.png', 0 @@ -90,4 +90,4 @@ GAME_STATUS.END = 3 ACTION.DO_SOMETHING = AKODE_ACTION.CUSTOM + 1 ACTION.LOOK_AROUND = AKODE_ACTION.CUSTOM + 2 ACTION.USE_OBJECT = AKODE_ACTION.CUSTOM + 3 -ACTION.LOOK_AT_OBJECT = AKODE_ACTION.CUSTOM + 4 \ No newline at end of file +ACTION.LOOK_AT_OBJECT = AKODE_ACTION.CUSTOM + 4 diff --git a/programs/games/Dungeons/lang.inc b/programs/games/Dungeons/lang.inc index 30c0149bd..1cdd556d2 100644 --- a/programs/games/Dungeons/lang.inc +++ b/programs/games/Dungeons/lang.inc @@ -1 +1 @@ -lang fix ru \ No newline at end of file +lang fix ru_RU diff --git a/programs/games/MSquare/trunk/MSquare.asm b/programs/games/MSquare/trunk/MSquare.asm index 66a5cd189..7462d08e1 100644 --- a/programs/games/MSquare/trunk/MSquare.asm +++ b/programs/games/MSquare/trunk/MSquare.asm @@ -690,7 +690,7 @@ endf -if lang eq ru +if lang eq ru_RU title db '᪨ ',0 txt: .dif db " (+/-):",0 diff --git a/programs/games/MSquare/trunk/Tupfile.lua b/programs/games/MSquare/trunk/Tupfile.lua index ab60e202e..9bf59d516 100644 --- a/programs/games/MSquare/trunk/Tupfile.lua +++ b/programs/games/MSquare/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({"MSquare.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "MSquare") diff --git a/programs/games/MSquare/trunk/build_en.bat b/programs/games/MSquare/trunk/build_en.bat index 55ef5319b..5d17dc351 100644 --- a/programs/games/MSquare/trunk/build_en.bat +++ b/programs/games/MSquare/trunk/build_en.bat @@ -1,4 +1,4 @@ @erase /s lang.inc > nul -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc fasm MSquare.asm MSquare -pause \ No newline at end of file +pause diff --git a/programs/games/MSquare/trunk/build_ru.bat b/programs/games/MSquare/trunk/build_ru.bat index 766bbf5dc..77f301a1b 100644 --- a/programs/games/MSquare/trunk/build_ru.bat +++ b/programs/games/MSquare/trunk/build_ru.bat @@ -1,4 +1,4 @@ @erase /s lang.inc > nul -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc fasm MSquare.asm MSquare -pause \ No newline at end of file +pause diff --git a/programs/games/almaz/ALMAZ.ASM b/programs/games/almaz/ALMAZ.ASM index 31ce3f1eb..837277209 100644 --- a/programs/games/almaz/ALMAZ.ASM +++ b/programs/games/almaz/ALMAZ.ASM @@ -2065,7 +2065,7 @@ Enemy: dw 1,448,128,0,0,500 ; ;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -if lang eq ru +if lang eq ru_RU title db ' ਎ z/x ५',0 else title db 'Dungeon for KolibriOS z/x - shoot',0 diff --git a/programs/games/almaz/ASCGL.INC b/programs/games/almaz/ASCGL.INC index d637dc2f5..18fbde169 100644 --- a/programs/games/almaz/ASCGL.INC +++ b/programs/games/almaz/ASCGL.INC @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/games/almaz/ASCL.INC b/programs/games/almaz/ASCL.INC index 2ecfb96d6..016ebdfd6 100644 --- a/programs/games/almaz/ASCL.INC +++ b/programs/games/almaz/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 diff --git a/programs/games/almaz/Tupfile.lua b/programs/games/almaz/Tupfile.lua index 6c7b0de26..378053e50 100644 --- a/programs/games/almaz/Tupfile.lua +++ b/programs/games/almaz/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({"ALMAZ.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "almaz") diff --git a/programs/games/almaz/build_ru.bat b/programs/games/almaz/build_ru.bat index 3c4efd2e5..92c712496 100644 --- a/programs/games/almaz/build_ru.bat +++ b/programs/games/almaz/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm ALMAZ.asm ALMAZ @erase lang.inc @kpack ALMAZ -@pause \ No newline at end of file +@pause diff --git a/programs/games/arcanii/trunk/Tupfile.lua b/programs/games/arcanii/trunk/Tupfile.lua index beeb9b631..3d1f3f59f 100644 --- a/programs/games/arcanii/trunk/Tupfile.lua +++ b/programs/games/arcanii/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({"arcanii.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "arcanii") diff --git a/programs/games/arcanii/trunk/arcanii.asm b/programs/games/arcanii/trunk/arcanii.asm index d875f71c5..f142b2d03 100644 --- a/programs/games/arcanii/trunk/arcanii.asm +++ b/programs/games/arcanii/trunk/arcanii.asm @@ -832,7 +832,7 @@ VERSION db 'ARCANOID II',0 AUTHOR db 'by jj (jacek jerzy malinowski)',0 CHANGE_SPEED db 'F2 dec speed F3 inc speed',0 -if lang eq it +if lang eq it_IT THANKS_FOR_PLAYING db 'Grazie per aver giocato', 0 PRESS_SPACE db 'Premi spazio per iniziare',0 LEVEL db 'LIVELLO',0 diff --git a/programs/games/arcanii/trunk/ascgl.inc b/programs/games/arcanii/trunk/ascgl.inc index 8727b63a4..dbc082a58 100644 --- a/programs/games/arcanii/trunk/ascgl.inc +++ b/programs/games/arcanii/trunk/ascgl.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/games/arcanii/trunk/ascl.inc b/programs/games/arcanii/trunk/ascl.inc index b4a2458ff..fb850e87a 100644 --- a/programs/games/arcanii/trunk/ascl.inc +++ b/programs/games/arcanii/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 diff --git a/programs/games/arcanii/trunk/build.bat b/programs/games/arcanii/trunk/build.bat index 84dcbee43..4717c1307 100644 --- a/programs/games/arcanii/trunk/build.bat +++ b/programs/games/arcanii/trunk/build.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm arcanii.asm arcanii @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/arcanii/trunk/build_en.bat b/programs/games/arcanii/trunk/build_en.bat index 84dcbee43..4717c1307 100644 --- a/programs/games/arcanii/trunk/build_en.bat +++ b/programs/games/arcanii/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 arcanii.asm arcanii @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/arcanii/trunk/build_ru.bat b/programs/games/arcanii/trunk/build_ru.bat index a587a05c7..282e87d99 100644 --- a/programs/games/arcanii/trunk/build_ru.bat +++ b/programs/games/arcanii/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 arcanii.asm arcanii @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/arcanii/trunk/makefile b/programs/games/arcanii/trunk/makefile index 1da93caff..c2e954c1d 100644 --- a/programs/games/arcanii/trunk/makefile +++ b/programs/games/arcanii/trunk/makefile @@ -9,15 +9,15 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin ru: - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" > lang.inc ${FASM} ${SOURCE} ${OUT} en: - echo "lang fix en" > lang.inc + echo "lang fix en_US" > lang.inc ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > lang.inc + echo "lang fix it_IT" > lang.inc ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/games/arcanoid/trunk/Tupfile.lua b/programs/games/arcanoid/trunk/Tupfile.lua index 005b6a1b0..febbe91d3 100644 --- a/programs/games/arcanoid/trunk/Tupfile.lua +++ b/programs/games/arcanoid/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({"arcanoid.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "arcanoid") diff --git a/programs/games/arcanoid/trunk/arcanoid.asm b/programs/games/arcanoid/trunk/arcanoid.asm index ec9f987c5..7339c626b 100644 --- a/programs/games/arcanoid/trunk/arcanoid.asm +++ b/programs/games/arcanoid/trunk/arcanoid.asm @@ -418,7 +418,7 @@ noplayagain: draw_window: startwd window 0,0,400+8,480+24,window_Skinned - if lang eq it + if lang eq it_IT label 12,8,'ARCANOID: Usa le freccie Vite Punti',cl_White+font_Big else label 12,8,'ARCANOID: USE ARROW KEYS LIVES SCORE',cl_White+font_Big @@ -430,7 +430,7 @@ draw_window: cmp [nextlev],1 je nlev - if lang eq it + if lang eq it_IT label 160,200,'Hai perso!',cl_Red+font_Big label 130,220,'Punteggio:',cl_Red+font_Big else @@ -447,14 +447,14 @@ draw_window: mov ecx,260*65536+12 mov edx,1 mcall - if lang eq it + if lang eq it_IT label 152,244,'Rigioca',cl_Red+font_Big else label 152,244,'Play again?',cl_Red+font_Big end if jmp elev nlev: - if lang eq it + if lang eq it_IT label 160,200,'Hai vinto!',cl_Green+font_Big label 130,220,'Punteggio:',cl_Green+font_Big else @@ -471,13 +471,13 @@ nlev: mov ecx,260*65536+12 mov edx,1 mcall - if lang eq it + if lang eq it_IT label 152,244,'Prossimo Livello',cl_Red+font_Big else label 152,244,'Next level?',cl_Red+font_Big end if elev: - if lang eq it + if lang eq it_IT label 178,264,'Esci',cl_Red+font_Big else label 178,264,'Exit?',cl_Red+font_Big diff --git a/programs/games/arcanoid/trunk/ascgl.inc b/programs/games/arcanoid/trunk/ascgl.inc index 78aadcad3..190afb92d 100644 --- a/programs/games/arcanoid/trunk/ascgl.inc +++ b/programs/games/arcanoid/trunk/ascgl.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/games/arcanoid/trunk/build_en.bat b/programs/games/arcanoid/trunk/build_en.bat index 3e384dd3a..6e92b55c3 100644 --- a/programs/games/arcanoid/trunk/build_en.bat +++ b/programs/games/arcanoid/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 arcanoid.asm arcanoid @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/arcanoid/trunk/build_ru.bat b/programs/games/arcanoid/trunk/build_ru.bat index 8f28f0234..317043f56 100644 --- a/programs/games/arcanoid/trunk/build_ru.bat +++ b/programs/games/arcanoid/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 arcanoid.asm arcanoid @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/arcanoid/trunk/makefile b/programs/games/arcanoid/trunk/makefile index 28f0de7d8..c20327add 100644 --- a/programs/games/arcanoid/trunk/makefile +++ b/programs/games/arcanoid/trunk/makefile @@ -9,15 +9,15 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > lang.inc + echo "lang fix en_US" > lang.inc ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" > lang.inc ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > lang.inc + echo "lang fix it_IT" > lang.inc ${FASM} ${SOURCE} ${OUT} diff --git a/programs/games/bnc/trunk/makefile b/programs/games/bnc/trunk/makefile index 851c87e00..51f6361f4 100644 --- a/programs/games/bnc/trunk/makefile +++ b/programs/games/bnc/trunk/makefile @@ -7,10 +7,10 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/games/bomber/Tupfile.lua b/programs/games/bomber/Tupfile.lua index 0f11a820e..8cc701232 100644 --- a/programs/games/bomber/Tupfile.lua +++ b/programs/games/bomber/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({"bomber.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bomber") diff --git a/programs/games/bomber/bomber.asm b/programs/games/bomber/bomber.asm index 292b6e851..c205cd424 100644 --- a/programs/games/bomber/bomber.asm +++ b/programs/games/bomber/bomber.asm @@ -2343,7 +2343,7 @@ file_info: ; db 0 _fi_pfilename dd ? -if lang eq ru +if lang eq ru_RU include 'ruslang.inc' else include 'englang.inc' diff --git a/programs/games/bomber/build_en.bat b/programs/games/bomber/build_en.bat index 519f17b42..40f6de6f6 100644 --- a/programs/games/bomber/build_en.bat +++ b/programs/games/bomber/build_en.bat @@ -1,6 +1,6 @@ if not exist bin mkdir bomber_eng_bin @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 bomber.asm bomber_eng_bin\bomber @erase lang.inc @kpack bomber_eng_bin\bomber @@ -9,4 +9,4 @@ if not exist bin mkdir bomber_eng_bin @copy bomb.bmp bomber_eng_bin\bomb.bmp @copy plane.bmp bomber_eng_bin\plane.bmp @copy tile.bmp bomber_eng_bin\tile.bmp -@pause \ No newline at end of file +@pause diff --git a/programs/games/bomber/build_ru.bat b/programs/games/bomber/build_ru.bat index cf188674a..9db5da9c7 100644 --- a/programs/games/bomber/build_ru.bat +++ b/programs/games/bomber/build_ru.bat @@ -1,6 +1,6 @@ if not exist bin mkdir bomber_rus_bin @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 bomber.asm bomber_rus_bin\bomber @erase lang.inc @kpack bomber_rus_bin\bomber @@ -9,4 +9,4 @@ if not exist bin mkdir bomber_rus_bin @copy bomb.bmp bomber_rus_bin\bomb.bmp @copy plane.bmp bomber_rus_bin\plane.bmp @copy tile.bmp bomber_rus_bin\tile.bmp -@pause \ No newline at end of file +@pause diff --git a/programs/games/c4/trunk/Tupfile.lua b/programs/games/c4/trunk/Tupfile.lua index b7141ca9b..7d087b234 100644 --- a/programs/games/c4/trunk/Tupfile.lua +++ b/programs/games/c4/trunk/Tupfile.lua @@ -1,7 +1,7 @@ if tup.getconfig("NO_NASM") ~= "" then return end -- tup.rule is too unmannerly to %define tup.definerule{ - command = "echo %%define lang '" .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. "'> %o", + command = "echo %%define lang '" .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. "'> %o", outputs = {"lang_nasm.inc"} } tup.rule({"c4.asm", extra_inputs = {"lang_nasm.inc"}}, "nasm -I" .. tup.getvariantdir() .. "/ -f bin -o %o %f " .. tup.getconfig("KPACK_CMD"), "c4") diff --git a/programs/games/c4/trunk/c4.asm b/programs/games/c4/trunk/c4.asm index a175e4b50..e130210b5 100644 --- a/programs/games/c4/trunk/c4.asm +++ b/programs/games/c4/trunk/c4.asm @@ -46,7 +46,7 @@ BUTTON_HEIGHT equ 12 BUTTON_NEW_X equ 14 BUTTON_NEW_Y equ 30 -%ifidn lang, 'it' +%ifidn lang, 'it_IT' BUTTON_NEW_WIDTH equ 56 + 28 %else BUTTON_NEW_WIDTH equ 56 @@ -64,7 +64,7 @@ BUTTON_PL2UP_X equ (BUTTON_PL2DN_X + BUTTON_SPIN_WIDTH + 1) BUTTON_PL2UP_Y equ BUTTON_PL2DN_Y ; label dimensions -%ifidn lang, 'it' +%ifidn lang, 'it_IT' LABEL_PL1_X equ 90 + 10 %else LABEL_PL1_X equ 90 @@ -72,7 +72,7 @@ BUTTON_PL2UP_Y equ BUTTON_PL2DN_Y LABEL_PL1_Y equ (1 + BUTTON_PL1DN_Y + (BUTTON_HEIGHT-8)/2) LABEL_PL2_X equ LABEL_PL1_X LABEL_PL2_Y equ (1 + BUTTON_PL2DN_Y + (BUTTON_HEIGHT-8)/2) -%ifidn lang, 'it' +%ifidn lang, 'it_IT' LABEL_PL1TYPE_X equ (LABEL_PL1_X + 10*6 - 4) %else LABEL_PL1TYPE_X equ (LABEL_PL1_X + 10*6) @@ -777,14 +777,14 @@ NBUTTONS equ (($-buttons)/BUTTON_size) ; ; label table ; -%ifidn lang, 'it' +%ifidn lang, 'it_IT' newgame db "Nuova partita",0 %else newgame db "New game",0 %endif down db "<",0 up db ">",0 -%ifidn lang, 'it' +%ifidn lang, 'it_IT' pl1 db "Giocatore 1:",0 pl2 db "Giocatore 2:",0 %else @@ -792,7 +792,7 @@ up db ">",0 pl2 db "Player 2:",0 %endif -%ifidn lang, 'it' +%ifidn lang, 'it_IT' playertypes: db "Umano",0 PLAYERTYPELEN equ ($ - playertypes) @@ -882,7 +882,7 @@ iend label_pl1type: istruc LABEL at LABEL.position - %ifidn lang, 'it' + %ifidn lang, 'it_IT' dd MOS_DWORD(LABEL_PL1TYPE_X + 18,LABEL_PL1TYPE_Y) %else dd MOS_DWORD(LABEL_PL1TYPE_X,LABEL_PL1TYPE_Y) @@ -894,7 +894,7 @@ iend label_pl2type: istruc LABEL at LABEL.position - %ifidn lang, 'it' + %ifidn lang, 'it_IT' dd MOS_DWORD(LABEL_PL2TYPE_X + 18,LABEL_PL2TYPE_Y) %else dd MOS_DWORD(LABEL_PL2TYPE_X,LABEL_PL2TYPE_Y) @@ -912,7 +912,7 @@ player2_type dd PL2TYPE_INIT ; status messages -%ifidn lang, 'it' +%ifidn lang, 'it_IT' player1hmnprmpt db "Turno del giocatore 1",0 player2hmnprmpt db "Turno del giocatore 2",0 player1cpuprmpt db "Attendi, giocatore 1 sta pensando...",0 diff --git a/programs/games/c4/trunk/makefile b/programs/games/c4/trunk/makefile index 2c2856a85..7f8924268 100644 --- a/programs/games/c4/trunk/makefile +++ b/programs/games/c4/trunk/makefile @@ -12,11 +12,11 @@ OUT=${FILE}.bin all:en en: - echo "%define lang 'en'" > lang_nasm.inc + echo "%define lang 'en_US'" > lang_nasm.inc ${NASM} -f bin -o ${OUT} ${SOURCE} it: - echo "%define lang 'it'" > lang_nasm.inc + echo "%define lang 'it_IT'" > lang_nasm.inc ${NASM} -f bin -o ${OUT} ${SOURCE} clean: diff --git a/programs/games/codemaster/Tupfile.lua b/programs/games/codemaster/Tupfile.lua index 6ecc29f63..5ee0bf226 100644 --- a/programs/games/codemaster/Tupfile.lua +++ b/programs/games/codemaster/Tupfile.lua @@ -3,7 +3,7 @@ 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({"binary_master.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "binary_master") tup.rule({"hang_programmer.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "hang_programmer") tup.rule({"kolibri_puzzle.asm", extra_inputs = {"lang.inc"}}, FASM .. " -m 65536 %f %o " .. tup.getconfig("KPACK_CMD"), "kolibri_puzzle") diff --git a/programs/games/codemaster/build.bat b/programs/games/codemaster/build.bat index c5a2d0f8f..b252a805d 100644 --- a/programs/games/codemaster/build.bat +++ b/programs/games/codemaster/build.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 65536 binary_master.asm binary_master @fasm -m 65536 hang_programmer.asm hang_programmer @fasm -m 65536 kolibri_puzzle.asm kolibri_puzzle @@ -6,4 +6,4 @@ @kpack binary_master @kpack hang_programmer @kpack kolibri_puzzle -@pause \ No newline at end of file +@pause diff --git a/programs/games/freecell/Tupfile.lua b/programs/games/freecell/Tupfile.lua index 9bf003511..2d88d523b 100644 --- a/programs/games/freecell/Tupfile.lua +++ b/programs/games/freecell/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({"freecell.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "freecell") diff --git a/programs/games/freecell/build_en.bat b/programs/games/freecell/build_en.bat index bb3267cd3..148bdacd8 100644 --- a/programs/games/freecell/build_en.bat +++ b/programs/games/freecell/build_en.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm freecell.asm freecell @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/freecell/build_ru.bat b/programs/games/freecell/build_ru.bat index 7a11d376a..ace39536d 100644 --- a/programs/games/freecell/build_ru.bat +++ b/programs/games/freecell/build_ru.bat @@ -1,4 +1,4 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm freecell.asm freecell @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/freecell/freecell.asm b/programs/games/freecell/freecell.asm index a8f20b244..9668558be 100644 --- a/programs/games/freecell/freecell.asm +++ b/programs/games/freecell/freecell.asm @@ -648,7 +648,7 @@ code mcall mov eax, 4 - if lang eq it + if lang eq it_IT mov ebx, 7 shl 16 + 22 + topbuttonsbarheight/2 - 4 else mov ebx, 20 shl 16 + 22 + topbuttonsbarheight/2 - 4 @@ -1985,7 +1985,7 @@ code ;****************************************************************************** ; <--- initialised data ---> -if lang eq ru +if lang eq ru_RU title db '',0 new_game: db " " @@ -1996,7 +1996,7 @@ if lang eq ru s: db "10" -else if lang eq it +else if lang eq it_IT title db 'Freecell',0 new_game: db "Nuova partita" diff --git a/programs/games/freecell/makefile b/programs/games/freecell/makefile index de7636f39..5e4f92fad 100644 --- a/programs/games/freecell/makefile +++ b/programs/games/freecell/makefile @@ -9,15 +9,15 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > lang.inc + echo "lang fix en_US" > lang.inc ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" > lang.inc ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > lang.inc + echo "lang fix it_IT" > lang.inc ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/games/gomoku/trunk/Tupfile.lua b/programs/games/gomoku/trunk/Tupfile.lua index f2e99d9c0..ae3c67746 100644 --- a/programs/games/gomoku/trunk/Tupfile.lua +++ b/programs/games/gomoku/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({"gomoku.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "gomoku") diff --git a/programs/games/gomoku/trunk/build_en.bat b/programs/games/gomoku/trunk/build_en.bat index 252a30182..182af2879 100644 --- a/programs/games/gomoku/trunk/build_en.bat +++ b/programs/games/gomoku/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 gomoku.asm gomoku @kpack gomoku @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/gomoku/trunk/build_ru.bat b/programs/games/gomoku/trunk/build_ru.bat index 4f2b12967..7fec83878 100644 --- a/programs/games/gomoku/trunk/build_ru.bat +++ b/programs/games/gomoku/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 gomoku.asm gomoku @kpack gomoku @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/gomoku/trunk/gomoku.asm b/programs/games/gomoku/trunk/gomoku.asm index a2b543921..f443cbd50 100644 --- a/programs/games/gomoku/trunk/gomoku.asm +++ b/programs/games/gomoku/trunk/gomoku.asm @@ -717,7 +717,7 @@ pic_o db 01111100b, \ 01111100b pic_plt dd 0xffffff, 0x000000 -if lang eq ru +if lang eq ru_RU title db '',0 txt_buttons db ' ',0 txt_go db ' 祭',0 diff --git a/programs/games/gomoku/trunk/makefile b/programs/games/gomoku/trunk/makefile index 05e9ecc00..3b5e2107f 100644 --- a/programs/games/gomoku/trunk/makefile +++ b/programs/games/gomoku/trunk/makefile @@ -9,11 +9,11 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > lang.inc + echo "lang fix en_US" > lang.inc ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" > lang.inc ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/games/klavisha/trunk/Tupfile.lua b/programs/games/klavisha/trunk/Tupfile.lua index 77ef30e1b..62a359924 100644 --- a/programs/games/klavisha/trunk/Tupfile.lua +++ b/programs/games/klavisha/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({"klavisha.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "klavisha") diff --git a/programs/games/klavisha/trunk/build.bat b/programs/games/klavisha/trunk/build.bat index f78fe86fc..857560d57 100644 --- a/programs/games/klavisha/trunk/build.bat +++ b/programs/games/klavisha/trunk/build.bat @@ -1,5 +1,5 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 klavisha.asm klavisha @erase lang.inc @kpack klavisha -@pause \ No newline at end of file +@pause diff --git a/programs/games/life3/trunk/Tupfile.lua b/programs/games/life3/trunk/Tupfile.lua index 2f09dd924..9c9f20def 100644 --- a/programs/games/life3/trunk/Tupfile.lua +++ b/programs/games/life3/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("life3.asm", FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "life3") diff --git a/programs/games/life3/trunk/build_ru.bat b/programs/games/life3/trunk/build_ru.bat index c4a9cee1a..2a1dc4a1c 100644 --- a/programs/games/life3/trunk/build_ru.bat +++ b/programs/games/life3/trunk/build_ru.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix ru_RU >lang.inc @fasm.exe -m 16384 life3.asm life3.kex @kpack life3.kex pause diff --git a/programs/games/life3/trunk/life3.asm b/programs/games/life3/trunk/life3.asm index 856043a65..530ecc3fe 100644 --- a/programs/games/life3/trunk/life3.asm +++ b/programs/games/life3/trunk/life3.asm @@ -57,7 +57,7 @@ b_sort dd 0 ; osob dd 0 ;᫮ ᮡ zoom db 3 ;⠡ -if lang eq ru +if lang eq ru_RU txt_zoom db ' ⠡:',0 txt_gen db ' :',0 txt_osob db ' ᮡ:',0 diff --git a/programs/games/lines/Tupfile.lua b/programs/games/lines/Tupfile.lua index d9ce43ad3..ca8d6a2f9 100644 --- a/programs/games/lines/Tupfile.lua +++ b/programs/games/lines/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({"lines.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "lines") diff --git a/programs/games/lines/build_en.bat b/programs/games/lines/build_en.bat index 4a1d709e4..fb4df496c 100644 --- a/programs/games/lines/build_en.bat +++ b/programs/games/lines/build_en.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm lines.asm lines.kex @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/lines/build_ru.bat b/programs/games/lines/build_ru.bat index d2f14fdab..c90db647e 100644 --- a/programs/games/lines/build_ru.bat +++ b/programs/games/lines/build_ru.bat @@ -1,5 +1,5 @@ @erase /s lang.inc > nul -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm lines.asm lines.kex @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/lines/lines.asm b/programs/games/lines/lines.asm index f34a306bd..63515b3d4 100644 --- a/programs/games/lines/lines.asm +++ b/programs/games/lines/lines.asm @@ -220,7 +220,7 @@ test_new_ball: @@: ret -if lang eq ru +if lang eq ru_RU szTitle db ' v 0.3',0 szNewGame db 'F2 - ',0 szRecord db '',0 @@ -272,4 +272,4 @@ countAllBall db ? TC_U_SYSTEM_RANDSEED dd ? bitID dd ? -I_END: \ No newline at end of file +I_END: diff --git a/programs/games/mblocks/trunk/build_en.bat b/programs/games/mblocks/trunk/build_en.bat index e00640544..cce4ea76d 100644 --- a/programs/games/mblocks/trunk/build_en.bat +++ b/programs/games/mblocks/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 mblocks.asm mblocks @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/mblocks/trunk/build_ru.bat b/programs/games/mblocks/trunk/build_ru.bat index 0b1ac6151..415522cb3 100644 --- a/programs/games/mblocks/trunk/build_ru.bat +++ b/programs/games/mblocks/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm mblocks.asm mblocks @kpack mblocks @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/megamaze/trunk/blackbox.inc b/programs/games/megamaze/trunk/blackbox.inc index b98a2d2ed..08e36dc4e 100644 --- a/programs/games/megamaze/trunk/blackbox.inc +++ b/programs/games/megamaze/trunk/blackbox.inc @@ -261,7 +261,7 @@ BB_mouse: BB_level: db 0 -if lang eq ru +if lang eq ru_RU BB_help mstr \ ' 楫 ⮨ ⮬, ⮡ 㦨',\ ' ⮬ ୮ 騪, 뫠',\ diff --git a/programs/games/megamaze/trunk/build.bat b/programs/games/megamaze/trunk/build.bat index f0fb6f8e5..7bdf070a1 100644 --- a/programs/games/megamaze/trunk/build.bat +++ b/programs/games/megamaze/trunk/build.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 megamaze.asm megamaze @erase lang.inc @kpack megamaze diff --git a/programs/games/megamaze/trunk/colzone.inc b/programs/games/megamaze/trunk/colzone.inc index 5aa31e067..dd7667059 100644 --- a/programs/games/megamaze/trunk/colzone.inc +++ b/programs/games/megamaze/trunk/colzone.inc @@ -112,7 +112,7 @@ CZ_drawm: CZ_level: file 'colzone.bin' -if lang eq ru +if lang eq ru_RU CZ_help mstr \ ' 2 㡨 ⮨ 襭',\ '⮩ ᪥. - ४ ',\ diff --git a/programs/games/megamaze/trunk/cstep.inc b/programs/games/megamaze/trunk/cstep.inc index 9242de654..a058a3b77 100644 --- a/programs/games/megamaze/trunk/cstep.inc +++ b/programs/games/megamaze/trunk/cstep.inc @@ -47,7 +47,7 @@ CSTEP_drawm: CSTEP_level: file 'cstep.bin' -if lang eq ru +if lang eq ru_RU CSTEP_help mstr \ ' ᨭ ⥬ ࠢ',\ ' . ᫥ ',\ diff --git a/programs/games/megamaze/trunk/fhouse.inc b/programs/games/megamaze/trunk/fhouse.inc index 4c580e1de..62dd1c2f9 100644 --- a/programs/games/megamaze/trunk/fhouse.inc +++ b/programs/games/megamaze/trunk/fhouse.inc @@ -175,7 +175,7 @@ FH_mouse: FH_level: file 'fhouse.bin' -if lang eq ru +if lang eq ru_RU FH_help mstr \ ' 砫 ஢',\ ', 室 १ ⪨ ',\ diff --git a/programs/games/megamaze/trunk/loops.inc b/programs/games/megamaze/trunk/loops.inc index 8faa40b2d..7a723635e 100644 --- a/programs/games/megamaze/trunk/loops.inc +++ b/programs/games/megamaze/trunk/loops.inc @@ -226,7 +226,7 @@ LP_draw_alert: LP_level: file 'loops.bin' -if lang eq ru +if lang eq ru_RU LP_help mstr \ '१ ⪨ אַ㣮쭨 室',\ '஢ . 室 १ ',\ diff --git a/programs/games/megamaze/trunk/marble.inc b/programs/games/megamaze/trunk/marble.inc index 7865cd466..d8d61e614 100644 --- a/programs/games/megamaze/trunk/marble.inc +++ b/programs/games/megamaze/trunk/marble.inc @@ -113,7 +113,7 @@ MAR_drawm: MAR_level: file 'marble.bin' -if lang eq ru +if lang eq ru_RU MAR_help mstr \ '᪮쪮 襪 ᪥,',\ 'ઠ 祭 ன ⪮. 誠',\ diff --git a/programs/games/megamaze/trunk/megamaze.asm b/programs/games/megamaze/trunk/megamaze.asm index 8aa6a64ef..7b3a1aa61 100644 --- a/programs/games/megamaze/trunk/megamaze.asm +++ b/programs/games/megamaze/trunk/megamaze.asm @@ -24,7 +24,7 @@ macro icall lbl dd end_mem ; memory for app dd stack_end ; esp dd 0x0 , 0x0 ; I_Param , I_Icon -lang fix ru +lang fix ru_RU include "macros.inc" purge mov ;include "../../../debug.inc" diff --git a/programs/games/megamaze/trunk/nolt.inc b/programs/games/megamaze/trunk/nolt.inc index 1af437bb4..fe04cd131 100644 --- a/programs/games/megamaze/trunk/nolt.inc +++ b/programs/games/megamaze/trunk/nolt.inc @@ -73,7 +73,7 @@ NLT_drawm: NLT_level: file 'nolt.bin' -if lang eq ru +if lang eq ru_RU NLT_help mstr \ ' - ஢ ᭮',\ ' . 㤭',\ diff --git a/programs/games/megamaze/trunk/orient.inc b/programs/games/megamaze/trunk/orient.inc index 6386d4755..dae1fe631 100644 --- a/programs/games/megamaze/trunk/orient.inc +++ b/programs/games/megamaze/trunk/orient.inc @@ -205,7 +205,7 @@ file 'omaze.bin' OR_level: file 'or2.bin' -if lang eq ru +if lang eq ru_RU OR_help mstr \ '箪 뤥 ⪥ । ',\ '頥 ५. ',\ diff --git a/programs/games/megamaze/trunk/smz.inc b/programs/games/megamaze/trunk/smz.inc index 5a7770b89..0dc0951ba 100644 --- a/programs/games/megamaze/trunk/smz.inc +++ b/programs/games/megamaze/trunk/smz.inc @@ -78,7 +78,7 @@ SMZ_drawm: SMZ_level: file 'smz.bin' -if lang eq ru +if lang eq ru_RU SMZ_help mstr \ ' ᫥⥫쭮 室, ',\ ' ᢥ祭 ⢮ ⮪',\ diff --git a/programs/games/megamaze/trunk/tam.inc b/programs/games/megamaze/trunk/tam.inc index 023c73423..3d985b9b1 100644 --- a/programs/games/megamaze/trunk/tam.inc +++ b/programs/games/megamaze/trunk/tam.inc @@ -134,7 +134,7 @@ TM_drawm: TM_level: file 'tam.bin' -if lang eq ru +if lang eq ru_RU TM_help mstr \ ' ᥩ ( ) 㡥 ',\ 'ਭ. 堭᪨ ⠢',\ diff --git a/programs/games/megamaze/trunk/tilt.inc b/programs/games/megamaze/trunk/tilt.inc index e9082c575..f4c9a90b1 100644 --- a/programs/games/megamaze/trunk/tilt.inc +++ b/programs/games/megamaze/trunk/tilt.inc @@ -67,7 +67,7 @@ TILT_drawm: TILT_level: file 'tilt.bin' -if lang eq ru +if lang eq ru_RU TILT_help mstr \ '誠 ( ) ᪥, ',\ ' ਧ⠫ ⨪',\ diff --git a/programs/games/megamaze/trunk/tilt2.inc b/programs/games/megamaze/trunk/tilt2.inc index 29d3c2328..e7da4dbef 100644 --- a/programs/games/megamaze/trunk/tilt2.inc +++ b/programs/games/megamaze/trunk/tilt2.inc @@ -86,7 +86,7 @@ TILT2_drawm: TILT2_level: file 'tilt2.bin' -if lang eq ru +if lang eq ru_RU TILT2_help mstr \ ' ᨭ ⮪',\ 'ᮮ⢥饣 梥. ! ᤥ',\ diff --git a/programs/games/megamaze/trunk/wriggle.inc b/programs/games/megamaze/trunk/wriggle.inc index a48de5aa8..12a6b73da 100644 --- a/programs/games/megamaze/trunk/wriggle.inc +++ b/programs/games/megamaze/trunk/wriggle.inc @@ -233,7 +233,7 @@ WG_mouse: WG_level: file 'wriggle.bin' -if lang eq ru +if lang eq ru_RU WG_help mstr \ ' - 类 ',\ '墮, ஥ ⪨',\ diff --git a/programs/games/phenix/trunk/Tupfile.lua b/programs/games/phenix/trunk/Tupfile.lua index 1e11389b5..9df914940 100644 --- a/programs/games/phenix/trunk/Tupfile.lua +++ b/programs/games/phenix/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({"phenix.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "phenix") diff --git a/programs/games/phenix/trunk/ascgl.inc b/programs/games/phenix/trunk/ascgl.inc index 79f36526b..a1eac3bfc 100644 --- a/programs/games/phenix/trunk/ascgl.inc +++ b/programs/games/phenix/trunk/ascgl.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/games/phenix/trunk/ascgml.inc b/programs/games/phenix/trunk/ascgml.inc index a1b4f92aa..d8d007395 100644 --- a/programs/games/phenix/trunk/ascgml.inc +++ b/programs/games/phenix/trunk/ascgml.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/games/phenix/trunk/ascguil.inc b/programs/games/phenix/trunk/ascguil.inc index 48431a379..446e51366 100644 --- a/programs/games/phenix/trunk/ascguil.inc +++ b/programs/games/phenix/trunk/ascguil.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler @@ -117,4 +117,4 @@ end_draw_gui_proc: end if -} \ No newline at end of file +} diff --git a/programs/games/phenix/trunk/ascl.inc b/programs/games/phenix/trunk/ascl.inc index ddc7262e6..992bcb18d 100644 --- a/programs/games/phenix/trunk/ascl.inc +++ b/programs/games/phenix/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 diff --git a/programs/games/phenix/trunk/ascml.inc b/programs/games/phenix/trunk/ascml.inc index 2a437cf09..aec14d117 100644 --- a/programs/games/phenix/trunk/ascml.inc +++ b/programs/games/phenix/trunk/ascml.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler @@ -91,4 +91,4 @@ looend: popad clc lend: -} \ No newline at end of file +} diff --git a/programs/games/phenix/trunk/ascpoal.inc b/programs/games/phenix/trunk/ascpoal.inc index 2944287fe..7ea26ba35 100644 --- a/programs/games/phenix/trunk/ascpoal.inc +++ b/programs/games/phenix/trunk/ascpoal.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler @@ -158,4 +158,4 @@ read_next: ; not finded stc ; if not finded CF = 1 finded: ; if finded CF = 0 -} \ No newline at end of file +} diff --git a/programs/games/phenix/trunk/build_en.bat b/programs/games/phenix/trunk/build_en.bat index b3602b96d..6f9a03ac4 100644 --- a/programs/games/phenix/trunk/build_en.bat +++ b/programs/games/phenix/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 phenix.asm phenix @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/phenix/trunk/build_ru.bat b/programs/games/phenix/trunk/build_ru.bat index d2af2271c..2dfdcc8e5 100644 --- a/programs/games/phenix/trunk/build_ru.bat +++ b/programs/games/phenix/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 phenix.asm phenix @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/pipes/Tupfile.lua b/programs/games/pipes/Tupfile.lua index 9effdabc3..4c53748fd 100644 --- a/programs/games/pipes/Tupfile.lua +++ b/programs/games/pipes/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({"pipes.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "pipes") diff --git a/programs/games/pipes/build_en.bat b/programs/games/pipes/build_en.bat index 1f3bbd1c6..37c5f34b3 100644 --- a/programs/games/pipes/build_en.bat +++ b/programs/games/pipes/build_en.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm pipes.asm pipes @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/pipes/build_et.bat b/programs/games/pipes/build_et.bat index cb2aa3369..e10eeafaf 100644 --- a/programs/games/pipes/build_et.bat +++ b/programs/games/pipes/build_et.bat @@ -1,4 +1,4 @@ -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm -m 16384 pipes.asm pipes @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/pipes/pipes.asm b/programs/games/pipes/pipes.asm index 46933af50..275731e88 100644 --- a/programs/games/pipes/pipes.asm +++ b/programs/games/pipes/pipes.asm @@ -322,7 +322,7 @@ or esi,0x50000000 mcall 47, 0x20000, [time], <60,395> mov ebx,0x50000 mov ecx,[score] -if lang eq et +if lang eq et_EE add edx,88 shl 16 else add edx,80 shl 16 @@ -556,7 +556,7 @@ pusha ;================================================= ; DATA - LABELS ;================================================= -if lang eq et +if lang eq et_EE lbl_title db 'Torud',0 lbl_gameover db 'M ä n g L ä b i !',0 lbl_new_game db 'Alusta enne uut mängu',0 diff --git a/programs/games/pong/trunk/Tupfile.lua b/programs/games/pong/trunk/Tupfile.lua index 8794b4eb3..c885a0592 100644 --- a/programs/games/pong/trunk/Tupfile.lua +++ b/programs/games/pong/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({"pong.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "pong") diff --git a/programs/games/pong/trunk/build_en.bat b/programs/games/pong/trunk/build_en.bat index 66a37fcb0..182d569b1 100644 --- a/programs/games/pong/trunk/build_en.bat +++ b/programs/games/pong/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 pong.asm pong @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/pong/trunk/build_ru.bat b/programs/games/pong/trunk/build_ru.bat index 8d853d3ee..049e0395f 100644 --- a/programs/games/pong/trunk/build_ru.bat +++ b/programs/games/pong/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 pong.asm pong @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/pong/trunk/pong.asm b/programs/games/pong/trunk/pong.asm index 437bc2115..e931af9ec 100644 --- a/programs/games/pong/trunk/pong.asm +++ b/programs/games/pong/trunk/pong.asm @@ -457,7 +457,7 @@ is_up2 dd 0x0 ; | is_dn2 dd 0x0 ; / include "lang.inc" -if lang eq ru +if lang eq ru_RU include "russian.inc" else include "english.inc" diff --git a/programs/games/pong3/trunk/ascgl.inc b/programs/games/pong3/trunk/ascgl.inc index aea0d5df5..7fa49c8c7 100644 --- a/programs/games/pong3/trunk/ascgl.inc +++ b/programs/games/pong3/trunk/ascgl.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/games/pong3/trunk/ascgml.inc b/programs/games/pong3/trunk/ascgml.inc index e1d3107b6..19f83fd16 100644 --- a/programs/games/pong3/trunk/ascgml.inc +++ b/programs/games/pong3/trunk/ascgml.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/games/pong3/trunk/ascl.inc b/programs/games/pong3/trunk/ascl.inc index 1d954b922..347f01248 100644 --- a/programs/games/pong3/trunk/ascl.inc +++ b/programs/games/pong3/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 diff --git a/programs/games/pong3/trunk/build_en.bat b/programs/games/pong3/trunk/build_en.bat index 30c8fe255..612090e92 100644 --- a/programs/games/pong3/trunk/build_en.bat +++ b/programs/games/pong3/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 pong3.asm pong3 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/pong3/trunk/build_ru.bat b/programs/games/pong3/trunk/build_ru.bat index 700bc658b..e9a15ea9b 100644 --- a/programs/games/pong3/trunk/build_ru.bat +++ b/programs/games/pong3/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 pong3.asm pong3 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/rsquare/trunk/build_en.bat b/programs/games/rsquare/trunk/build_en.bat index 53e123467..4ce972b52 100644 --- a/programs/games/rsquare/trunk/build_en.bat +++ b/programs/games/rsquare/trunk/build_en.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm rsquare.asm rsquare @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/rsquare/trunk/build_ru.bat b/programs/games/rsquare/trunk/build_ru.bat index 32c91aaf7..27b901ae9 100644 --- a/programs/games/rsquare/trunk/build_ru.bat +++ b/programs/games/rsquare/trunk/build_ru.bat @@ -1,5 +1,5 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm rsquare.asm rsquare @erase lang.inc kpack rsquare -@pause \ No newline at end of file +@pause diff --git a/programs/games/rsquare/trunk/rsquare.asm b/programs/games/rsquare/trunk/rsquare.asm index 13b5a5f77..ac67d0c8a 100644 --- a/programs/games/rsquare/trunk/rsquare.asm +++ b/programs/games/rsquare/trunk/rsquare.asm @@ -186,7 +186,7 @@ draw_window: mcall 12,1 mcall 0,<100,FLDSIZE2+16>,<100,FLDSIZE2+38>,0x14008000, , header - if lang eq ru + if lang eq ru_RU mcall 47,0x20000,[levnum],<128,8>, 0 else mcall 47,0x20000,[levnum],<117,8>, 0 @@ -638,7 +638,7 @@ level: file 'rlevels.bin' msg_ok db 'OK' -if lang eq ru +if lang eq ru_RU header db 'Red Square - ஢ h - , p - 㧠', 0 messages mstr '⫨筮! 室 ᫥騩 ஢.',\ diff --git a/programs/games/snake/trunk/build_en.bat b/programs/games/snake/trunk/build_en.bat index d65e0cf13..d5d7f8edc 100644 --- a/programs/games/snake/trunk/build_en.bat +++ b/programs/games/snake/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 snake.asm snake @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/soko/trunk/SOKO.ASM b/programs/games/soko/trunk/SOKO.ASM index 10718b90f..df14a18f7 100644 --- a/programs/games/soko/trunk/SOKO.ASM +++ b/programs/games/soko/trunk/SOKO.ASM @@ -1040,7 +1040,7 @@ ud: ; 䥩 ணࠬ - macros.inc load_char: -if lang eq ru +if lang eq ru_RU db '㧨' else db 'Open file' @@ -1048,7 +1048,7 @@ end if loadlen: ll_msg: -if lang eq ru +if lang eq ru_RU db '롥 ஢' else db 'Choose a level' @@ -1059,7 +1059,7 @@ ll_msg_end: fn_input: ; db 'cnf' ; db 'soko-4.lev' -if lang eq ru +if lang eq ru_RU db ' 䠩' else db 'or enter a filename' @@ -1068,7 +1068,7 @@ inp_end: rb 256-(inp_end-fn_input) win_msg: -if lang eq ru +if lang eq ru_RU db '!!! 諨 ஢!' else db "You've completed the level!" @@ -1076,7 +1076,7 @@ end if win_msg_end: lose_msg: -if lang eq ru +if lang eq ru_RU db ' ࠫ! ந...' else db "You're paralized! Game over..." diff --git a/programs/games/sq_game/trunk/SQ_GAME.ASM b/programs/games/sq_game/trunk/SQ_GAME.ASM index 148246ee2..17106482a 100644 --- a/programs/games/sq_game/trunk/SQ_GAME.ASM +++ b/programs/games/sq_game/trunk/SQ_GAME.ASM @@ -228,7 +228,7 @@ generator dd 0 header db 'Lights',0 -if lang eq ru +if lang eq ru_RU strMovs db '',0 strNew db ' ',0 else diff --git a/programs/games/sq_game/trunk/build_en.bat b/programs/games/sq_game/trunk/build_en.bat index 146614a2d..9759e10b6 100644 --- a/programs/games/sq_game/trunk/build_en.bat +++ b/programs/games/sq_game/trunk/build_en.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm sq_game.asm sq_game @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/sq_game/trunk/build_ru.bat b/programs/games/sq_game/trunk/build_ru.bat index e634b5f80..8fd6d196c 100644 --- a/programs/games/sq_game/trunk/build_ru.bat +++ b/programs/games/sq_game/trunk/build_ru.bat @@ -1,4 +1,4 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm sq_game.asm sq_game @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/sudoku/trunk/Tupfile.lua b/programs/games/sudoku/trunk/Tupfile.lua index c3b00ab81..72a550bc5 100644 --- a/programs/games/sudoku/trunk/Tupfile.lua +++ b/programs/games/sudoku/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({"sudoku.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "sudoku") diff --git a/programs/games/sudoku/trunk/build_en.bat b/programs/games/sudoku/trunk/build_en.bat index edaf63e60..f0ea57833 100644 --- a/programs/games/sudoku/trunk/build_en.bat +++ b/programs/games/sudoku/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 sudoku.asm sudoku @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/sudoku/trunk/sudoku.asm b/programs/games/sudoku/trunk/sudoku.asm index 7086c5394..9bed8afd4 100644 --- a/programs/games/sudoku/trunk/sudoku.asm +++ b/programs/games/sudoku/trunk/sudoku.asm @@ -1077,7 +1077,7 @@ func_70: .rezerv db 0 .name dd ? -if lang eq ru +if lang eq ru_RU title db '㤮',0 txt: .dif db " (+/-):",0 @@ -1159,4 +1159,4 @@ D_END: ;8: 0 - ࠭ 1 - 㧨 ;9: 1 - 㢥 ;10: 1 - ࠭ 襭 -;15 1 - ஢ઠ ⨨ ( CheckSudoku) \ No newline at end of file +;15 1 - ஢ઠ ⨨ ( CheckSudoku) diff --git a/programs/games/sw/trunk/Tupfile.lua b/programs/games/sw/trunk/Tupfile.lua index 4f1c00ec4..b4a4e8680 100644 --- a/programs/games/sw/trunk/Tupfile.lua +++ b/programs/games/sw/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({"sw.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "sw") diff --git a/programs/games/sw/trunk/sw.asm b/programs/games/sw/trunk/sw.asm index 43747e12b..4985a1958 100644 --- a/programs/games/sw/trunk/sw.asm +++ b/programs/games/sw/trunk/sw.asm @@ -1327,7 +1327,7 @@ endf text_cpu db 'CPU',0 text_user db 'USER',0 -if lang eq ru +if lang eq ru_RU title db '᪮ 0.4',0 but_auto db '⠢',0 but_new db '',0 @@ -1369,4 +1369,4 @@ flags2 rw 1 ;7: check_freedom ;8: १ࢨ஢ ;9: १ࢨ஢ -;10: १ࢨ஢ \ No newline at end of file +;10: १ࢨ஢ diff --git a/programs/games/sw/trunk/sw_lan.asm b/programs/games/sw/trunk/sw_lan.asm index b1f1dc561..5230a653a 100644 --- a/programs/games/sw/trunk/sw_lan.asm +++ b/programs/games/sw/trunk/sw_lan.asm @@ -1185,7 +1185,7 @@ endf text_cpu db 'CPU',0 text_user db 'USER',0 but_lis_con db 'Listen Connect Disconnect',0 -if lang eq ru +if lang eq ru_RU title db '᪮ 0.4',0 but_auto db '⠢',0 but_new db '',0 @@ -1229,4 +1229,4 @@ flags rw 1 ;5: 祭 ;11: ogidat' server ;12: server gdet otveta -;13; 1 - 室, 0 - \ No newline at end of file +;13; 1 - 室, 0 - diff --git a/programs/games/tanks/trunk/Tupfile.lua b/programs/games/tanks/trunk/Tupfile.lua index 3eed88ca6..7d6e69977 100644 --- a/programs/games/tanks/trunk/Tupfile.lua +++ b/programs/games/tanks/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({"tanks.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tanks") diff --git a/programs/games/tanks/trunk/build_en.bat b/programs/games/tanks/trunk/build_en.bat index ef0b8016f..386f3a8ec 100644 --- a/programs/games/tanks/trunk/build_en.bat +++ b/programs/games/tanks/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm tanks.asm tanks @kpack tanks @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/tanks/trunk/build_ru.bat b/programs/games/tanks/trunk/build_ru.bat index 72f91a76d..766fb90bf 100644 --- a/programs/games/tanks/trunk/build_ru.bat +++ b/programs/games/tanks/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm tanks.asm tanks @kpack tanks @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/tetris/trunk/Tupfile.lua b/programs/games/tetris/trunk/Tupfile.lua index 9c0a55914..7e6138ac1 100644 --- a/programs/games/tetris/trunk/Tupfile.lua +++ b/programs/games/tetris/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({"tetris.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "tetris") diff --git a/programs/games/tetris/trunk/build_en.bat b/programs/games/tetris/trunk/build_en.bat index 7da49a5c8..e51a40384 100644 --- a/programs/games/tetris/trunk/build_en.bat +++ b/programs/games/tetris/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 tetris.asm tetris @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/tetris/trunk/build_et.bat b/programs/games/tetris/trunk/build_et.bat index 359e84d62..b8324efd8 100644 --- a/programs/games/tetris/trunk/build_et.bat +++ b/programs/games/tetris/trunk/build_et.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm tetris.asm tetris @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/tetris/trunk/build_ru.bat b/programs/games/tetris/trunk/build_ru.bat index 08d5582a3..15ab3d4e9 100644 --- a/programs/games/tetris/trunk/build_ru.bat +++ b/programs/games/tetris/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 tetris.asm tetris @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/games/tetris/trunk/tetris.asm b/programs/games/tetris/trunk/tetris.asm index 95cd38c8d..63a850979 100644 --- a/programs/games/tetris/trunk/tetris.asm +++ b/programs/games/tetris/trunk/tetris.asm @@ -818,14 +818,14 @@ block_table: dd k_block_0 dd k_block_1 -if lang eq ru +if lang eq ru_RU title db ' 1.62',0 labe db '',0 text db '窨:',0 game_finished: db ' ',0 -else if lang eq et +else if lang eq et_EE title db 'Tetris 1.62',0 labe db 'PAUS',0 diff --git a/programs/load_lib.mac b/programs/load_lib.mac index 0e0e2cd33..cd4101f29 100644 --- a/programs/load_lib.mac +++ b/programs/load_lib.mac @@ -27,12 +27,12 @@ align 4 arrea_xx dd 0 file_name db '/sys/@notify',0 -if lang eq ru +if lang eq ru_RU l_lib_m1 db '"⥬ 訡',13,10,' ⥪ ',39,0 l_lib_m2 db '"⥬ 訡',13,10,'訡 ⥪ ',39,0 l_lib_m3 db 39,13,10,' 㭪 ',39,0 l_lib_m4 db 39,'" -tE',0 -else if lang eq it +else if lang eq it_IT l_lib_m1 db '"Errore di sistema',13,10,'Non trovato ',39,0 l_lib_m2 db '"Errore di sistema',13,10,'Import errato ',39,0 l_lib_m3 db 39,13,10,'funzione non trovata ',39,0 diff --git a/programs/media/animage/trunk/build.sh b/programs/media/animage/trunk/build.sh index 2d1d60940..5a8076fdf 100644 --- a/programs/media/animage/trunk/build.sh +++ b/programs/media/animage/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix ru" - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" + echo "lang fix ru_RU" > lang.inc fasm -m 16384 animage.asm animage rm -f lang.inc exit 0 diff --git a/programs/media/img_transform/Tupfile.lua b/programs/media/img_transform/Tupfile.lua index 14cc77b5c..9983dac52 100644 --- a/programs/media/img_transform/Tupfile.lua +++ b/programs/media/img_transform/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({"img_transform.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "img_transform") diff --git a/programs/media/img_transform/build_en.bat b/programs/media/img_transform/build_en.bat index d103db725..7aa4381a9 100644 --- a/programs/media/img_transform/build_en.bat +++ b/programs/media/img_transform/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm img_transform.asm img_transform.kex @kpack img_transform.kex @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/img_transform/build_ru.bat b/programs/media/img_transform/build_ru.bat index ab4c3fc88..c60fa3d59 100644 --- a/programs/media/img_transform/build_ru.bat +++ b/programs/media/img_transform/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm img_transform.asm img_transform.kex @kpack img_transform.kex @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/img_transform/img_transform.asm b/programs/media/img_transform/img_transform.asm index 50fc51e8d..2321ffc08 100644 --- a/programs/media/img_transform/img_transform.asm +++ b/programs/media/img_transform/img_transform.asm @@ -1386,7 +1386,7 @@ db 0 txt_space db ' ',0 -if lang eq ru +if lang eq ru_RU txt_err_save_img_file db ' ࠭ *.png 䠩.',0 txt_about db '" ணࠬ',13,10,\ ' ணࠬ ᤥ ८ࠧ ࠦ.',13,10,\ diff --git a/programs/media/midamp/trunk/Tupfile.lua b/programs/media/midamp/trunk/Tupfile.lua index 914f082cc..cef5dd9ed 100644 --- a/programs/media/midamp/trunk/Tupfile.lua +++ b/programs/media/midamp/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({"midamp.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "midamp") diff --git a/programs/media/midamp/trunk/build.bat b/programs/media/midamp/trunk/build.bat index ebc266856..e102866ce 100644 --- a/programs/media/midamp/trunk/build.bat +++ b/programs/media/midamp/trunk/build.bat @@ -1,4 +1,4 @@ -@echo lang fix en > lang.inc +@echo lang fix en_US > lang.inc @fasm midamp.asm midamp @kpack midamp -@pause \ No newline at end of file +@pause diff --git a/programs/media/midamp/trunk/build.sh b/programs/media/midamp/trunk/build.sh index 251e42d02..5bca0398a 100755 --- a/programs/media/midamp/trunk/build.sh +++ b/programs/media/midamp/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc mkdir bin fasm -m 65536 midamp.asm ./bin/midamp rm -f lang.inc diff --git a/programs/media/midamp/trunk/midilite.inc b/programs/media/midamp/trunk/midilite.inc index 950521d86..663fa1196 100644 --- a/programs/media/midamp/trunk/midilite.inc +++ b/programs/media/midamp/trunk/midilite.inc @@ -271,21 +271,21 @@ return: ret sHeadInv: -if lang eq ru +if lang eq ru_RU db " ",0 else db "Header invalid",0 end if sHSizeInv: -if lang eq ru +if lang eq ru_RU db ' ࠧ ',0 else db 'Header size invalid',0 end if sTypeUnsup: -if lang eq ru +if lang eq ru_RU db ' MIDI ন',0 else db 'MIDI type not supported',0 diff --git a/programs/media/midiplay/trunk/Tupfile.lua b/programs/media/midiplay/trunk/Tupfile.lua index a13c25b73..3492c8c23 100644 --- a/programs/media/midiplay/trunk/Tupfile.lua +++ b/programs/media/midiplay/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({"midiplay.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "midiplay") diff --git a/programs/media/midiplay/trunk/build_en.bat b/programs/media/midiplay/trunk/build_en.bat index 1a1337502..013f4069e 100644 --- a/programs/media/midiplay/trunk/build_en.bat +++ b/programs/media/midiplay/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 midiplay.asm midiplay @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/midiplay/trunk/build_ru.bat b/programs/media/midiplay/trunk/build_ru.bat index 2aad8a2f9..294a16e89 100644 --- a/programs/media/midiplay/trunk/build_ru.bat +++ b/programs/media/midiplay/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 midiplay.asm midiplay @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/piano/Tupfile.lua b/programs/media/piano/Tupfile.lua index 5db28a1ec..c5cb89def 100644 --- a/programs/media/piano/Tupfile.lua +++ b/programs/media/piano/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({"piano.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "piano") diff --git a/programs/media/piano/build.bat b/programs/media/piano/build.bat index b23008326..38e19f7b2 100644 --- a/programs/media/piano/build.bat +++ b/programs/media/piano/build.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm piano.asm piano @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/piano/piano.asm b/programs/media/piano/piano.asm index 107f405be..ae6059494 100644 --- a/programs/media/piano/piano.asm +++ b/programs/media/piano/piano.asm @@ -886,7 +886,7 @@ M: sc system_colors -if lang eq ru +if lang eq ru_RU message db 'ࠢ: 񫪭 2 ࠧ .',0 message1 db ' ᪮ ᪫ - ',0 message2 db ' ஥ ( !)',0 diff --git a/programs/media/pic4/trunk/Tupfile.lua b/programs/media/pic4/trunk/Tupfile.lua index 29f0a0e41..6b77c029b 100644 --- a/programs/media/pic4/trunk/Tupfile.lua +++ b/programs/media/pic4/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({"pic4.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "pic4") diff --git a/programs/media/pic4/trunk/build_en.bat b/programs/media/pic4/trunk/build_en.bat index d199cb412..36555c086 100644 --- a/programs/media/pic4/trunk/build_en.bat +++ b/programs/media/pic4/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 pic4.asm pic4 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/pic4/trunk/build_ru.bat b/programs/media/pic4/trunk/build_ru.bat index dde3f8212..721d02aae 100644 --- a/programs/media/pic4/trunk/build_ru.bat +++ b/programs/media/pic4/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 pic4.asm pic4 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/pic4/trunk/pic4.asm b/programs/media/pic4/trunk/pic4.asm index 42a9d2728..6e7147292 100644 --- a/programs/media/pic4/trunk/pic4.asm +++ b/programs/media/pic4/trunk/pic4.asm @@ -424,7 +424,7 @@ draw_window: ; DATA SECTION -if lang eq ru +if lang eq ru_RU title db ' 䮭 ࠡ祣 ⮫',0 else title db 'Background',0 diff --git a/programs/media/scrshoot/Tupfile.lua b/programs/media/scrshoot/Tupfile.lua index 2faa66920..07210fe7e 100644 --- a/programs/media/scrshoot/Tupfile.lua +++ b/programs/media/scrshoot/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({"scrshoot.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "scrshoot") diff --git a/programs/media/scrshoot/build.sh b/programs/media/scrshoot/build.sh index 7d0b94868..a1245792c 100755 --- a/programs/media/scrshoot/build.sh +++ b/programs/media/scrshoot/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix ru" - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" + echo "lang fix ru_RU" > lang.inc fasm -m 16384 scrshoot.asm scrshoot rm -f lang.inc exit 0 diff --git a/programs/media/scrshoot/build_en.bat b/programs/media/scrshoot/build_en.bat index 1a94ed5c8..1040aeaa9 100644 --- a/programs/media/scrshoot/build_en.bat +++ b/programs/media/scrshoot/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 scrshoot.asm scrshoot @kpack scrshoot @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/scrshoot/build_ru.bat b/programs/media/scrshoot/build_ru.bat index 908c5fc60..157c9a92c 100644 --- a/programs/media/scrshoot/build_ru.bat +++ b/programs/media/scrshoot/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 scrshoot.asm scrshoot @kpack scrshoot @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/scrshoot/scrshoot.asm b/programs/media/scrshoot/scrshoot.asm index c4617261e..6630196c9 100644 --- a/programs/media/scrshoot/scrshoot.asm +++ b/programs/media/scrshoot/scrshoot.asm @@ -638,7 +638,7 @@ use_rect check_box2 (5 shl 16+11),(180 shl 16 +11),5,cl_white,0,0x80000000,ch_te ; ⮭㬥 check_boxes_end: ;--------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU text: .1 db ' ࠭ 㡨 梥: bit',0 .3 db ' ࠭ ᭨:',0 @@ -886,4 +886,4 @@ i_end_tread: rb 1024 stacktop: ;--------------------------------------------------------------------- -i_end: \ No newline at end of file +i_end: diff --git a/programs/media/scrshoot/srectwin.inc b/programs/media/scrshoot/srectwin.inc index 9cba899e3..84c75dfbb 100644 --- a/programs/media/scrshoot/srectwin.inc +++ b/programs/media/scrshoot/srectwin.inc @@ -369,7 +369,7 @@ rect_input_labels: rect_input_labels_end: rect_input_labels_text: -if lang eq ru +if lang eq ru_RU .left db ' ᫥:',0 .top db ' ᢥ:',0 .width db 'ਭ:',0 @@ -386,10 +386,10 @@ use_rect_active_window check_box2 (10 shl 16)+10,(85 shl 16) +10,5,cl_white,0,0, riw_check_boxes_text, ch_flag_bottom riw_check_boxes_end: -if lang eq ru +if lang eq ru_RU riw_check_boxes_text db 'ᯮ짮 ⨢ ',0 riw_grab_text db 'न ࠧ :',0 else riw_check_boxes_text db 'Use area of the active window',0 riw_grab_text db 'Coordinates and size of the field:',0 -end if \ No newline at end of file +end if diff --git a/programs/media/voxel_editor/utilites/Tupfile.lua b/programs/media/voxel_editor/utilites/Tupfile.lua index 82bb779a5..b5f3f8118 100644 --- a/programs/media/voxel_editor/utilites/Tupfile.lua +++ b/programs/media/voxel_editor/utilites/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.foreach_rule({"vox_creator.asm", "vox_mover.asm", "vox_tgl.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B") diff --git a/programs/media/voxel_editor/utilites/build_en.bat b/programs/media/voxel_editor/utilites/build_en.bat index 35e6ac526..07683f0da 100644 --- a/programs/media/voxel_editor/utilites/build_en.bat +++ b/programs/media/voxel_editor/utilites/build_en.bat @@ -1,10 +1,10 @@ if not exist bin mkdir bin @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm.exe -m 16384 vox_creator.asm bin\vox_creator.kex @kpack bin\vox_creator.kex @fasm.exe -m 16384 vox_mover.asm bin\vox_mover.kex @kpack bin\vox_mover.kex @fasm.exe -m 16384 vox_tgl.asm bin\vox_tgl.kex @kpack bin\vox_tgl.kex -pause \ No newline at end of file +pause diff --git a/programs/media/voxel_editor/utilites/build_ru.bat b/programs/media/voxel_editor/utilites/build_ru.bat index 432c94e1f..d1e0fcf4d 100644 --- a/programs/media/voxel_editor/utilites/build_ru.bat +++ b/programs/media/voxel_editor/utilites/build_ru.bat @@ -1,10 +1,10 @@ if not exist bin mkdir bin @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm.exe -m 16384 vox_creator.asm bin\vox_creator.kex @kpack bin\vox_creator.kex @fasm.exe -m 16384 vox_mover.asm bin\vox_mover.kex @kpack bin\vox_mover.kex @fasm.exe -m 16384 vox_tgl.asm bin\vox_tgl.kex @kpack bin\vox_tgl.kex -pause \ No newline at end of file +pause diff --git a/programs/media/voxel_editor/utilites/vox_creator.asm b/programs/media/voxel_editor/utilites/vox_creator.asm index 24b544b80..43f384207 100644 --- a/programs/media/voxel_editor/utilites/vox_creator.asm +++ b/programs/media/voxel_editor/utilites/vox_creator.asm @@ -17,7 +17,7 @@ txt_buf rb 8 include '../trunk/vox_rotate.inc' @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load -if lang eq ru +if lang eq ru_RU caption db '⥫ ᥫ 04.05.20',0 ; else caption db 'Voxel creator 04.05.20',0 @@ -35,7 +35,7 @@ buf2d_bits equ byte[edi+20] ; vox_obj_size dd 0 ;ࠧ ᥫ쭮 ꥪ ( ᪮७ ⠢) txt_space db ' ',0 -if lang eq ru +if lang eq ru_RU txt_pref db ' ',0,' ',0,' ',0,' ',0 ;⠢: , , txt_f_size: db ': ' else diff --git a/programs/media/voxel_editor/utilites/vox_mover.asm b/programs/media/voxel_editor/utilites/vox_mover.asm index 180678510..7ffbcb2a2 100644 --- a/programs/media/voxel_editor/utilites/vox_mover.asm +++ b/programs/media/voxel_editor/utilites/vox_mover.asm @@ -14,7 +14,7 @@ include '../trunk/str.inc' include 'lang.inc' @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load -if lang eq ru +if lang eq ru_RU caption db '६饭 ᥫ 04.05.20',0 ; else caption db 'Voxel mover 04.05.20',0 @@ -1155,7 +1155,7 @@ dd 1 shl 30,1 shl 30,1 shl 30,1 shl 30,1 shl 30 dd 1 shl 31,1 shl 30,1 shl 30,1 shl 30,1 shl 31 rd 999 ;32*32-25 -if lang eq ru +if lang eq ru_RU txt_zoom db '⠡:',0 txt_curor: db ': ' .size: rb 10 diff --git a/programs/media/voxel_editor/utilites/vox_tgl.asm b/programs/media/voxel_editor/utilites/vox_tgl.asm index d057f0fae..9d3d15ee5 100644 --- a/programs/media/voxel_editor/utilites/vox_tgl.asm +++ b/programs/media/voxel_editor/utilites/vox_tgl.asm @@ -15,7 +15,7 @@ include '../trunk/str.inc' include 'lang.inc' @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load -if lang eq ru +if lang eq ru_RU caption db 'ᬮ ᥫ 11.11.20',0 ; else caption db 'Voxel viewer 11.11.20',0 @@ -709,7 +709,7 @@ endp align 4 txt_stat_m1: -if lang eq ru +if lang eq ru_RU db '⨪',13,10,'ᥫ: ' .v: rb 70 txt_stat_m2: diff --git a/programs/media/zsea/Tupfile.lua b/programs/media/zsea/Tupfile.lua index 8462c7cbb..090cc3711 100644 --- a/programs/media/zsea/Tupfile.lua +++ b/programs/media/zsea/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({"zSea.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "zSea") diff --git a/programs/media/zsea/build.bat b/programs/media/zsea/build.bat index 9bd8a3146..8351bf321 100644 --- a/programs/media/zsea/build.bat +++ b/programs/media/zsea/build.bat @@ -1,5 +1,5 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 zSea.asm zSea @erase lang.inc @kpack zSea -@pause \ No newline at end of file +@pause diff --git a/programs/media/zsea/build.sh b/programs/media/zsea/build.sh index 4c7bbd3cb..6e4229348 100644 --- a/programs/media/zsea/build.sh +++ b/programs/media/zsea/build.sh @@ -1,7 +1,7 @@ #!/bin/bash # This script does for linux the same as build.bat for DOS - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 65536 zSea.asm zSea kpack zSea rm -f lang.inc diff --git a/programs/media/zsea/buildall.bat b/programs/media/zsea/buildall.bat index c35c148cb..187a6d527 100644 --- a/programs/media/zsea/buildall.bat +++ b/programs/media/zsea/buildall.bat @@ -3,7 +3,7 @@ if not exist bin mkdir zSea_bin if not exist bin mkdir zSea_bin\buttons if not exist bin mkdir zSea_bin\plugins -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 zSea.asm zSea_bin\zSea @kpack zSea_bin\zSea @@ -34,4 +34,4 @@ if not exist bin mkdir zSea_bin\plugins @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/media/zsea/buildall.sh b/programs/media/zsea/buildall.sh index dd40d039b..a0dfb63f6 100755 --- a/programs/media/zsea/buildall.sh +++ b/programs/media/zsea/buildall.sh @@ -5,8 +5,8 @@ mkdir ./zSea_bin/buttons mkdir ./zSea_bin/plugins - echo "lang fix en" - echo "lang fix en" > ./lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > ./lang.inc fasm -m 16384 ./zSea.asm ./zSea_bin/zSea kpack ./zSea_bin/zSea diff --git a/programs/other/calc/trunk/build_en.bat b/programs/other/calc/trunk/build_en.bat index 356ccbbaa..917929674 100644 --- a/programs/other/calc/trunk/build_en.bat +++ b/programs/other/calc/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 calc.asm calc @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/calc/trunk/build_ru.bat b/programs/other/calc/trunk/build_ru.bat index 0ee24f2a2..a22bed63e 100644 --- a/programs/other/calc/trunk/build_ru.bat +++ b/programs/other/calc/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 calc.asm calc @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/cnc_editor/Tupfile.lua b/programs/other/cnc_editor/Tupfile.lua index ee309783f..f6010e874 100644 --- a/programs/other/cnc_editor/Tupfile.lua +++ b/programs/other/cnc_editor/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({"cnc_editor.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cnc_editor") diff --git a/programs/other/cnc_editor/build_en.bat b/programs/other/cnc_editor/build_en.bat index 0fdd2a0c7..4b40b9041 100644 --- a/programs/other/cnc_editor/build_en.bat +++ b/programs/other/cnc_editor/build_en.bat @@ -2,8 +2,8 @@ if not exist bin mkdir bin @copy *.nc bin\*.nc @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm.exe -m 32768 cnc_editor.asm bin\cnc_editor.kex @kpack bin\cnc_editor.kex -pause \ No newline at end of file +pause diff --git a/programs/other/ha/HACONFIG.ASM b/programs/other/ha/HACONFIG.ASM index 6f6efb33b..f6f730cd8 100644 --- a/programs/other/ha/HACONFIG.ASM +++ b/programs/other/ha/HACONFIG.ASM @@ -1406,7 +1406,7 @@ import box_lib,\ commonButtonText db '...', 0 ; OpenDial commonButtonTextSize = 3 -if lang eq ru ; +if lang eq ru_RU ; text db "䨣 Hot Angles ⢥砥 ன ⨢ 㣫. " db "ன ࠬ ᥡ ⪫ . " diff --git a/programs/other/ha/Tupfile.lua b/programs/other/ha/Tupfile.lua index 78a881cd9..a82c18d39 100644 --- a/programs/other/ha/Tupfile.lua +++ b/programs/other/ha/Tupfile.lua @@ -3,6 +3,6 @@ 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 "ru" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) +tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "ru_RU" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"}) tup.rule({"HA.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "HA") tup.rule({"HACONFIG.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "HACONFIG") diff --git a/programs/other/ha/build.bat b/programs/other/ha/build.bat index 78f607c9a..a34efc2d1 100644 --- a/programs/other/ha/build.bat +++ b/programs/other/ha/build.bat @@ -1,7 +1,7 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm.exe -m 16384 HA.ASM HA @fasm.exe -m 16384 HACONFIG.ASM HACONFIG @erase lang.inc @kpack HA @kpack HACONFIG -@pause \ No newline at end of file +@pause diff --git a/programs/other/kpack/trunk/build.sh b/programs/other/kpack/trunk/build.sh index 7011573ae..eb8564b4e 100755 --- a/programs/other/kpack/trunk/build.sh +++ b/programs/other/kpack/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 kpack.asm kpack rm -f lang.inc exit 0 diff --git a/programs/other/outdated/archer/trunk/arcmacro.inc b/programs/other/outdated/archer/trunk/arcmacro.inc index 32852881a..b6ff3b508 100644 --- a/programs/other/outdated/archer/trunk/arcmacro.inc +++ b/programs/other/outdated/archer/trunk/arcmacro.inc @@ -134,7 +134,7 @@ macro str_table [str] strs: -if language eq ru +if language eq ru_RU str_table \ <'*** @RCHER - Deflate Unpacker ***',13,10>,\ ;0 <'*** Copyright Wiland Inc., 2005 ***',13,10>,\ ;1 diff --git a/programs/other/outdated/archer/trunk/build_en.bat b/programs/other/outdated/archer/trunk/build_en.bat index dce7d00a5..d754c9622 100644 --- a/programs/other/outdated/archer/trunk/build_en.bat +++ b/programs/other/outdated/archer/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 @rcher.asm @rcher @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/archer/trunk/build_ru.bat b/programs/other/outdated/archer/trunk/build_ru.bat index a1bdb86ff..e28c6a48b 100644 --- a/programs/other/outdated/archer/trunk/build_ru.bat +++ b/programs/other/outdated/archer/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 @rcher.asm @rcher @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/bgitest/trunk/Tupfile.lua b/programs/other/outdated/bgitest/trunk/Tupfile.lua index 2f35ee87c..017fa8ac3 100644 --- a/programs/other/outdated/bgitest/trunk/Tupfile.lua +++ b/programs/other/outdated/bgitest/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({"bgitest.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "bgitest") diff --git a/programs/other/outdated/bgitest/trunk/bgitest.asm b/programs/other/outdated/bgitest/trunk/bgitest.asm index ef2464482..7d92ccb91 100644 --- a/programs/other/outdated/bgitest/trunk/bgitest.asm +++ b/programs/other/outdated/bgitest/trunk/bgitest.asm @@ -358,7 +358,7 @@ title_end: _M equ 30 cross dd _M shl 16+_X*2-_M,_Y shl 16+_Y,_X shl 16+_X,_M shl 16+_Y*2-_M helptxt: -if lang eq ru +if lang eq ru_RU _txt _X shl 16+60,40,0x434ba010,BGI_HACENTER,\ " :",\ "஡ - / ⥪/;",\ diff --git a/programs/other/outdated/bgitest/trunk/build_en.bat b/programs/other/outdated/bgitest/trunk/build_en.bat index d43539a82..8fc5ba7c3 100644 --- a/programs/other/outdated/bgitest/trunk/build_en.bat +++ b/programs/other/outdated/bgitest/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 bgitest.asm bgitest @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/bgitest/trunk/build_ru.bat b/programs/other/outdated/bgitest/trunk/build_ru.bat index ef4f73891..dc7b9a4a3 100644 --- a/programs/other/outdated/bgitest/trunk/build_ru.bat +++ b/programs/other/outdated/bgitest/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 bgitest.asm bgitest @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/cdp/trunk/Tupfile.lua b/programs/other/outdated/cdp/trunk/Tupfile.lua index 3e33cd540..416a5db3c 100644 --- a/programs/other/outdated/cdp/trunk/Tupfile.lua +++ b/programs/other/outdated/cdp/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({"cdp.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cdp") diff --git a/programs/other/outdated/cdp/trunk/build_en.bat b/programs/other/outdated/cdp/trunk/build_en.bat index 0cf38a004..dcd6e426a 100644 --- a/programs/other/outdated/cdp/trunk/build_en.bat +++ b/programs/other/outdated/cdp/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 cdp.asm cdp @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/cdp/trunk/build_ru.bat b/programs/other/outdated/cdp/trunk/build_ru.bat index 55396aceb..81f532f64 100644 --- a/programs/other/outdated/cdp/trunk/build_ru.bat +++ b/programs/other/outdated/cdp/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 cdp.asm cdp @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/clip/trunk/Tupfile.lua b/programs/other/outdated/clip/trunk/Tupfile.lua index 1587b82cc..6abb5e309 100644 --- a/programs/other/outdated/clip/trunk/Tupfile.lua +++ b/programs/other/outdated/clip/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.foreach_rule({"@clip.ASM", "cliptest.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "%B") diff --git a/programs/other/outdated/clip/trunk/build_ru.bat b/programs/other/outdated/clip/trunk/build_ru.bat index 3cac8083a..d76adb80e 100644 --- a/programs/other/outdated/clip/trunk/build_ru.bat +++ b/programs/other/outdated/clip/trunk/build_ru.bat @@ -1,7 +1,7 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm @clip.asm @clip @fasm cliptest.asm cliptest @fasm test2.asm test2 @erase lang.inc @kpack @clip -@rem pause \ No newline at end of file +@rem pause diff --git a/programs/other/outdated/clip/trunk/makefile b/programs/other/outdated/clip/trunk/makefile index 51f940cd2..742817b15 100644 --- a/programs/other/outdated/clip/trunk/makefile +++ b/programs/other/outdated/clip/trunk/makefile @@ -6,7 +6,7 @@ KPACK=/opt/bin/kpack LANG=lang.inc en: - echo "lang fix ru" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} \@clip.ASM \@clip ${FASM} cliptest.ASM cliptest ${FASM} test2.asm test2 diff --git a/programs/other/outdated/cmd/trunk/build_ge.bat b/programs/other/outdated/cmd/trunk/build_de.bat similarity index 53% rename from programs/other/outdated/cmd/trunk/build_ge.bat rename to programs/other/outdated/cmd/trunk/build_de.bat index 5cb91d6c4..e176018df 100644 --- a/programs/other/outdated/cmd/trunk/build_ge.bat +++ b/programs/other/outdated/cmd/trunk/build_de.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix de >lang.inc +@echo lang fix de_DE >lang.inc @fasm cmd.asm cmd @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/cmd/trunk/build_en.bat b/programs/other/outdated/cmd/trunk/build_en.bat index c5a9a7e0f..3506818b1 100644 --- a/programs/other/outdated/cmd/trunk/build_en.bat +++ b/programs/other/outdated/cmd/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 cmd.asm cmd @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/cmd/trunk/cmd.asm b/programs/other/outdated/cmd/trunk/cmd.asm index 00029a319..bf8bf25e5 100644 --- a/programs/other/outdated/cmd/trunk/cmd.asm +++ b/programs/other/outdated/cmd/trunk/cmd.asm @@ -2780,7 +2780,7 @@ title db 'CMD - Command line interpreter',0 smb_cursor db '|' prompt db 'CMD>>' -if lang eq de +if lang eq de_DE h1 db ' CMD - Command line interpreter version 0.26 ' h2 db ' copyleft Chemist - dmitry_gt@tut.by ' h3 db ' Verfuegbare Kommandos: ' @@ -2960,4 +2960,4 @@ I_END: fileinfo_buffer rb 64 direntry_buffer rb 32+304 filename rb 260 -tic_table: \ No newline at end of file +tic_table: diff --git a/programs/other/outdated/copy2/trunk/Tupfile.lua b/programs/other/outdated/copy2/trunk/Tupfile.lua index dbc4754b0..24ad72b48 100644 --- a/programs/other/outdated/copy2/trunk/Tupfile.lua +++ b/programs/other/outdated/copy2/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({"copy2.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "copy2") diff --git a/programs/other/outdated/copy2/trunk/build_ge.bat b/programs/other/outdated/copy2/trunk/build_de.bat similarity index 55% rename from programs/other/outdated/copy2/trunk/build_ge.bat rename to programs/other/outdated/copy2/trunk/build_de.bat index 519fcc9cd..f34e192d3 100644 --- a/programs/other/outdated/copy2/trunk/build_ge.bat +++ b/programs/other/outdated/copy2/trunk/build_de.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix de >lang.inc +@echo lang fix de_DE >lang.inc @fasm copy2.asm copy2 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/copy2/trunk/build_en.bat b/programs/other/outdated/copy2/trunk/build_en.bat index 1821d222b..51a1e1dca 100644 --- a/programs/other/outdated/copy2/trunk/build_en.bat +++ b/programs/other/outdated/copy2/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 copy2.asm copy2 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/copy2/trunk/build_ru.bat b/programs/other/outdated/copy2/trunk/build_ru.bat index 8692e806b..07334ace5 100644 --- a/programs/other/outdated/copy2/trunk/build_ru.bat +++ b/programs/other/outdated/copy2/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 copy2.asm copy2 @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/copy2/trunk/copy2.asm b/programs/other/outdated/copy2/trunk/copy2.asm index 51e037d63..c15a60884 100644 --- a/programs/other/outdated/copy2/trunk/copy2.asm +++ b/programs/other/outdated/copy2/trunk/copy2.asm @@ -404,7 +404,7 @@ macro strtbl name,[string] size = $ - str } -if lang eq ru +if lang eq ru_RU strtbl errors,\ "䠩 ᪮஢ ᯥ譮",\ "(⥭) ",\ @@ -421,7 +421,7 @@ strtbl errors,\ "?",\ "() 䠩 ",\ "() ⭠ 訡" -else if lang eq en +else if lang eq en_US strtbl errors,\ "Success!",\ "(read) no hd base or partition defined",\ diff --git a/programs/other/outdated/gifview/trunk/build_en.bat b/programs/other/outdated/gifview/trunk/build_en.bat index dddd6e5fa..619b77372 100644 --- a/programs/other/outdated/gifview/trunk/build_en.bat +++ b/programs/other/outdated/gifview/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 gifview.asm gifview @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/gifview/trunk/build_ru.bat b/programs/other/outdated/gifview/trunk/build_ru.bat index d47b2fb32..80caed006 100644 --- a/programs/other/outdated/gifview/trunk/build_ru.bat +++ b/programs/other/outdated/gifview/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 gifview.asm gifview @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/iconedit/trunk/Tupfile.lua b/programs/other/outdated/iconedit/trunk/Tupfile.lua index fc3ae40f3..d7c0e779e 100644 --- a/programs/other/outdated/iconedit/trunk/Tupfile.lua +++ b/programs/other/outdated/iconedit/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({"iconedit.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "iconedit") diff --git a/programs/other/outdated/iconedit/trunk/build_en.bat b/programs/other/outdated/iconedit/trunk/build_en.bat index d012a0dd5..11d0ba039 100644 --- a/programs/other/outdated/iconedit/trunk/build_en.bat +++ b/programs/other/outdated/iconedit/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 iconedit.asm iconedit @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/iconedit/trunk/build_ru.bat b/programs/other/outdated/iconedit/trunk/build_ru.bat index 0debfecb5..7f67e5a23 100644 --- a/programs/other/outdated/iconedit/trunk/build_ru.bat +++ b/programs/other/outdated/iconedit/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 iconedit.asm iconedit @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/jpegview/trunk/build_en.bat b/programs/other/outdated/jpegview/trunk/build_en.bat index 8d33ac1e1..385fd0945 100644 --- a/programs/other/outdated/jpegview/trunk/build_en.bat +++ b/programs/other/outdated/jpegview/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 jpegview.asm jpegview @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/jpegview/trunk/build_ru.bat b/programs/other/outdated/jpegview/trunk/build_ru.bat index 2cf696818..57470eaeb 100644 --- a/programs/other/outdated/jpegview/trunk/build_ru.bat +++ b/programs/other/outdated/jpegview/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm jpegview.asm jpegview @erase lang.inc @kpack jpegview -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/kerpack/trunk/build.sh b/programs/other/outdated/kerpack/trunk/build.sh index 26d0674a2..e1c931c87 100644 --- a/programs/other/outdated/kerpack/trunk/build.sh +++ b/programs/other/outdated/kerpack/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 kerpack.asm kerpack rm -f lang.inc exit 0 diff --git a/programs/other/outdated/mfar/trunk/build_en.bat b/programs/other/outdated/mfar/trunk/build_en.bat index f79001255..9bdd6feb7 100644 --- a/programs/other/outdated/mfar/trunk/build_en.bat +++ b/programs/other/outdated/mfar/trunk/build_en.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm mfar.asm mfar @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/mfar/trunk/build_ru.bat b/programs/other/outdated/mfar/trunk/build_ru.bat index 2112fe0a8..7198c73ae 100644 --- a/programs/other/outdated/mfar/trunk/build_ru.bat +++ b/programs/other/outdated/mfar/trunk/build_ru.bat @@ -1,4 +1,4 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm mfar.asm mfar @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/mfar/trunk/macros.inc b/programs/other/outdated/mfar/trunk/macros.inc index f3c83392d..b85d8cf80 100644 --- a/programs/other/outdated/mfar/trunk/macros.inc +++ b/programs/other/outdated/mfar/trunk/macros.inc @@ -74,7 +74,7 @@ struc mstr [sstring] ; language for programs -lang fix ru ; ru en fr ge fi +lang fix ru_RU ; ru_RU en_US fr_FR de_DE fi_FI ; code profiling @@ -224,4 +224,4 @@ EVM_EXIT = 1000b EVM_BACKGROUND = 10000b EVM_MOUSE = 100000b EVM_IPC = 1000000b -EVM_STACK = 10000000b \ No newline at end of file +EVM_STACK = 10000000b diff --git a/programs/other/outdated/mhc/trunk/build_ge.bat b/programs/other/outdated/mhc/trunk/build_de.bat similarity index 53% rename from programs/other/outdated/mhc/trunk/build_ge.bat rename to programs/other/outdated/mhc/trunk/build_de.bat index e0412900d..59d6020a6 100644 --- a/programs/other/outdated/mhc/trunk/build_ge.bat +++ b/programs/other/outdated/mhc/trunk/build_de.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix ge >lang.inc +@echo lang fix de_DE >lang.inc @fasm mhc.asm mhc @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/mhc/trunk/build_en.bat b/programs/other/outdated/mhc/trunk/build_en.bat index 4e218c37c..4cb4730b1 100644 --- a/programs/other/outdated/mhc/trunk/build_en.bat +++ b/programs/other/outdated/mhc/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 mhc.asm mhc @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/mhc/trunk/mhc.asm b/programs/other/outdated/mhc/trunk/mhc.asm index 8ff56a60e..f59fbdcf7 100644 --- a/programs/other/outdated/mhc/trunk/mhc.asm +++ b/programs/other/outdated/mhc/trunk/mhc.asm @@ -347,7 +347,7 @@ ENTRANCE: ; interface data - if lang eq de + if lang eq de_DE keylab db " PACKEN ENTPACKEN" dellab db " LOESCHE I/O LOESCHE *.MHC" title db "MHC 0.09" diff --git a/programs/other/outdated/mixer/trunk/Tupfile.lua b/programs/other/outdated/mixer/trunk/Tupfile.lua index 139a6f34c..c17e78e3d 100644 --- a/programs/other/outdated/mixer/trunk/Tupfile.lua +++ b/programs/other/outdated/mixer/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({"mixer.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mixer") diff --git a/programs/other/outdated/mixer/trunk/build_en.bat b/programs/other/outdated/mixer/trunk/build_en.bat index ad67da97a..909b4861f 100644 --- a/programs/other/outdated/mixer/trunk/build_en.bat +++ b/programs/other/outdated/mixer/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 mixer.asm mixer @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/mixer/trunk/build_ru.bat b/programs/other/outdated/mixer/trunk/build_ru.bat index c0096b60b..dbcc4214c 100644 --- a/programs/other/outdated/mixer/trunk/build_ru.bat +++ b/programs/other/outdated/mixer/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 mixer.asm mixer @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/mv/trunk/Tupfile.lua b/programs/other/outdated/mv/trunk/Tupfile.lua index dd1e3fe8f..3523fd9bb 100644 --- a/programs/other/outdated/mv/trunk/Tupfile.lua +++ b/programs/other/outdated/mv/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({"mv.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mv") diff --git a/programs/other/outdated/mv/trunk/build_en.bat b/programs/other/outdated/mv/trunk/build_en.bat index 858211d2e..671531a74 100644 --- a/programs/other/outdated/mv/trunk/build_en.bat +++ b/programs/other/outdated/mv/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 mv.asm mv @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/mv/trunk/build_ru.bat b/programs/other/outdated/mv/trunk/build_ru.bat index b57754cc6..5d7b36ac3 100644 --- a/programs/other/outdated/mv/trunk/build_ru.bat +++ b/programs/other/outdated/mv/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 mv.asm mv @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/param/trunk/Tupfile.lua b/programs/other/outdated/param/trunk/Tupfile.lua index 57ffc84e9..dba6b4445 100644 --- a/programs/other/outdated/param/trunk/Tupfile.lua +++ b/programs/other/outdated/param/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({"param.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "param") diff --git a/programs/other/outdated/param/trunk/build_en.bat b/programs/other/outdated/param/trunk/build_en.bat index 12b43d8f6..627da1713 100644 --- a/programs/other/outdated/param/trunk/build_en.bat +++ b/programs/other/outdated/param/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 param.asm param @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/param/trunk/build_ru.bat b/programs/other/outdated/param/trunk/build_ru.bat index a233ee981..9fba8c0d7 100644 --- a/programs/other/outdated/param/trunk/build_ru.bat +++ b/programs/other/outdated/param/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 param.asm param @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/rb/trunk/Tupfile.lua b/programs/other/outdated/rb/trunk/Tupfile.lua index 8824bb690..806f7796c 100644 --- a/programs/other/outdated/rb/trunk/Tupfile.lua +++ b/programs/other/outdated/rb/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({"rb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rb") diff --git a/programs/other/outdated/rb/trunk/build_en.bat b/programs/other/outdated/rb/trunk/build_en.bat index bf6b0c695..866772bf7 100644 --- a/programs/other/outdated/rb/trunk/build_en.bat +++ b/programs/other/outdated/rb/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 @rb.asm @rb @kpack @rb @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/rb/trunk/build_et.bat b/programs/other/outdated/rb/trunk/build_et.bat index b065bedd4..f769bd724 100644 --- a/programs/other/outdated/rb/trunk/build_et.bat +++ b/programs/other/outdated/rb/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm -m 16384 @rb.asm @rb @kpack @rb @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/rb/trunk/build_ru.bat b/programs/other/outdated/rb/trunk/build_ru.bat index ff476fa06..91cab3dd5 100644 --- a/programs/other/outdated/rb/trunk/build_ru.bat +++ b/programs/other/outdated/rb/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 @rb.asm @rb @kpack @rb @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/rb/trunk/rb.asm b/programs/other/outdated/rb/trunk/rb.asm index 65616434b..fd76eff39 100644 --- a/programs/other/outdated/rb/trunk/rb.asm +++ b/programs/other/outdated/rb/trunk/rb.asm @@ -187,7 +187,7 @@ nofuncbtns: ; ;------------------------------------------------------------------------------ _BTNS_ = 6 ; ⢮ ("㭪⮢ ") -if lang eq ru +if lang eq ru_RU font = 0x00000000 string_length = 20 ; ப wnd_x_size = 133 ; ਭ diff --git a/programs/other/outdated/sb/trunk/Tupfile.lua b/programs/other/outdated/sb/trunk/Tupfile.lua index aad54be2f..23a8df7fa 100644 --- a/programs/other/outdated/sb/trunk/Tupfile.lua +++ b/programs/other/outdated/sb/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({"sb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "sb") diff --git a/programs/other/outdated/sb/trunk/build_en.bat b/programs/other/outdated/sb/trunk/build_en.bat index 03598e322..3c2e95831 100644 --- a/programs/other/outdated/sb/trunk/build_en.bat +++ b/programs/other/outdated/sb/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 sb.asm sb @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/sb/trunk/build_ru.bat b/programs/other/outdated/sb/trunk/build_ru.bat index d8355ece2..c702b6e65 100644 --- a/programs/other/outdated/sb/trunk/build_ru.bat +++ b/programs/other/outdated/sb/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 sb.asm sb @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/slovarik/ASCL.INC b/programs/other/outdated/slovarik/ASCL.INC index f790abf2b..58afec87e 100644 --- a/programs/other/outdated/slovarik/ASCL.INC +++ b/programs/other/outdated/slovarik/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 diff --git a/programs/other/outdated/sysxtree/trunk/ascgl.inc b/programs/other/outdated/sysxtree/trunk/ascgl.inc index 4a8a94f13..2a050d144 100644 --- a/programs/other/outdated/sysxtree/trunk/ascgl.inc +++ b/programs/other/outdated/sysxtree/trunk/ascgl.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/other/outdated/sysxtree/trunk/ascgml.inc b/programs/other/outdated/sysxtree/trunk/ascgml.inc index 18d501e4d..c11ed4026 100644 --- a/programs/other/outdated/sysxtree/trunk/ascgml.inc +++ b/programs/other/outdated/sysxtree/trunk/ascgml.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler diff --git a/programs/other/outdated/sysxtree/trunk/ascl.inc b/programs/other/outdated/sysxtree/trunk/ascl.inc index 18c0a285f..fea473178 100644 --- a/programs/other/outdated/sysxtree/trunk/ascl.inc +++ b/programs/other/outdated/sysxtree/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 diff --git a/programs/other/outdated/sysxtree/trunk/ascml.inc b/programs/other/outdated/sysxtree/trunk/ascml.inc index c84669031..bbce65568 100644 --- a/programs/other/outdated/sysxtree/trunk/ascml.inc +++ b/programs/other/outdated/sysxtree/trunk/ascml.inc @@ -1,4 +1,4 @@ -lang equ ru +lang equ ru_RU ; ; Assembler @@ -90,4 +90,4 @@ looend: popad clc lend: -} \ No newline at end of file +} diff --git a/programs/other/outdated/sysxtree/trunk/build_en.bat b/programs/other/outdated/sysxtree/trunk/build_en.bat index 151823fcb..3106cd9ce 100644 --- a/programs/other/outdated/sysxtree/trunk/build_en.bat +++ b/programs/other/outdated/sysxtree/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 sysxtree.asm sysxtree @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/outdated/sysxtree/trunk/build_ru.bat b/programs/other/outdated/sysxtree/trunk/build_ru.bat index 840479d75..655f48a52 100644 --- a/programs/other/outdated/sysxtree/trunk/build_ru.bat +++ b/programs/other/outdated/sysxtree/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 sysxtree.asm sysxtree @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/rtfread/trunk/build.sh b/programs/other/rtfread/trunk/build.sh index 3a635b16e..103bc1205 100755 --- a/programs/other/rtfread/trunk/build.sh +++ b/programs/other/rtfread/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc mkdir bin fasm -m 16384 rtfread.asm ./bin/rtfread rm -f lang.inc diff --git a/programs/other/rtfread/trunk/build_en.bat b/programs/other/rtfread/trunk/build_en.bat index c5da8925f..fe615c45c 100644 --- a/programs/other/rtfread/trunk/build_en.bat +++ b/programs/other/rtfread/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm rtfread.asm rtfread @kpack rtfread @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/rtfread/trunk/build_ru.bat b/programs/other/rtfread/trunk/build_ru.bat index 548370c0d..62cce855c 100644 --- a/programs/other/rtfread/trunk/build_ru.bat +++ b/programs/other/rtfread/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm rtfread.asm rtfread @kpack rtfread @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/other/t_edit/Tupfile.lua b/programs/other/t_edit/Tupfile.lua index 8c614cf53..a99ea5e9f 100644 --- a/programs/other/t_edit/Tupfile.lua +++ b/programs/other/t_edit/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({"t_edit.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "t_edit") diff --git a/programs/other/t_edit/build_en.bat b/programs/other/t_edit/build_en.bat index 8b16e1fd5..73030b217 100644 --- a/programs/other/t_edit/build_en.bat +++ b/programs/other/t_edit/build_en.bat @@ -2,9 +2,9 @@ if not exist bin mkdir bin if not exist bin\info mkdir bin\info @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm.exe -m 16384 t_edit.asm bin\t_edit.kex @kpack bin\t_edit.kex info\build.bat info\ bin\info\ -pause \ No newline at end of file +pause diff --git a/programs/other/t_edit/build_ru.bat b/programs/other/t_edit/build_ru.bat index 233ce4ed6..5ebd6571d 100644 --- a/programs/other/t_edit/build_ru.bat +++ b/programs/other/t_edit/build_ru.bat @@ -2,9 +2,9 @@ if not exist bin mkdir bin if not exist bin\info mkdir bin\info @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm.exe -m 16384 t_edit.asm bin\t_edit.kex @kpack bin\t_edit.kex info\build.bat info\ bin\info\ -pause \ No newline at end of file +pause diff --git a/programs/other/t_edit/t_data.inc b/programs/other/t_edit/t_data.inc index 1fef21ade..4b8b13546 100644 --- a/programs/other/t_edit/t_data.inc +++ b/programs/other/t_edit/t_data.inc @@ -1 +1 @@ -fn_col_option dd def_col_file fn_syntax_dir db 'info/',0 def_col_file db 'default.syn',0 exit_code dd 0 ;६ ᯮ㥬 室 ணࠬ panel_but rb 21 ;ன ⮡ࠦ ;祭 㬮砭, ini 䠩 ini_def_window_t equ 20 ini_def_window_l equ 200 ini_def_window_w equ 570 ini_def_window_h equ 470 ini_def_symbol_w equ 7 ini_def_symbol_h equ 10 ini_def_font_s equ 0 ini_def_scroll_type equ 0 ;ᠭ ࠬ஢ ini 䠩 ini_name db 't_edit.ini',0 ini_sec_window db 'Window',0 key_window_t db 't',0 key_window_l db 'l',0 key_window_w db 'w',0 key_window_h db 'h',0 key_symbol_w db 'symbol_w',0 key_symbol_h db 'symbol_h',0 key_font_s db 'font_s',0 key_scroll_type db 'scroll_type',0 key_but_new db 'but_new',0 key_but_open db 'but_open',0 key_but_save db 'but_save',0 key_but_save_as db 'but_save_as',0 key_but_select db 'but_select',0 key_but_cut db 'but_cut',0 key_but_copy db 'but_copy',0 key_but_paste db 'but_paste',0 key_but_find db 'but_find',0 key_but_replace db 'but_replace',0 key_but_key_words db 'but_key_words',0 key_but_upper db 'but_upper',0 key_but_lower db 'but_lower',0 key_but_reverse db 'but_reverse',0 key_but_undo db 'but_undo',0 key_but_redo db 'but_redo',0 key_but_invisible db 'but_invisible',0 key_but_syntax_list db 'but_syntax_list',0 key_but_syntax_mode db 'but_syntax_mode',0 key_but_convert_1251_866 db 'but_convert_1251_866',0 key_but_convert_866_1251 db 'but_convert_866_1251',0 ini_sec_options db 'Options',0 key_synt_file: db 'syntax_' .numb: db '0',0 key_synt_ext: db 'ext_' .numb: db '0',0 ini_def_synt_f db 0 align 4 max_synt_auto_open equ 10 synt_auto_open: rb 64*max_synt_auto_open db 0 system_dir_0 db '/sys/lib/' lib_name_0 db 'box_lib.obj',0 system_dir_1 db '/sys/lib/' lib_name_1 db 'msgbox.obj',0 system_dir_2 db '/sys/lib/' lib_name_2 db 'proc_lib.obj',0 system_dir_3 db '/sys/lib/' lib_name_3 db 'libimg.obj',0 system_dir_4 db '/sys/lib/' lib_name_4 db 'libini.obj',0 system_dir_5 db '/sys/lib/' lib_name_5 db 'kmenu.obj',0 ;--------------------------------------------------------------------- align 4 import_box_lib: dd alib_init0 ;㭪 ᪠ ᮬ 1 ࠧ 祭 ⥪, ⮬ ணࠬ ⪠ 㦭 edit_box_draw dd aEdit_box_draw edit_box_key dd aEdit_box_key edit_box_mouse dd aEdit_box_mouse ;edit_box_set_text dd aEdit_box_set_text ;version_ed dd aVersion_ed init_checkbox dd ainit_checkbox check_box_draw dd acheck_box_draw check_box_mouse dd acheck_box_mouse option_box_draw dd aOption_box_draw option_box_mouse dd aOption_box_mouse ;version_op dd aVersion_op scrollbar_ver_draw dd aScrollbar_ver_draw scrollbar_ver_mouse dd aScrollbar_ver_mouse scrollbar_hor_draw dd aScrollbar_hor_draw scrollbar_hor_mouse dd aScrollbar_hor_mouse ;version_scrollbar dd aVersion_scrollbar tl_data_init dd sz_tl_data_init tl_data_clear dd sz_tl_data_clear tl_info_clear dd sz_tl_info_clear tl_key dd sz_tl_key tl_mouse dd sz_tl_mouse tl_draw dd sz_tl_draw tl_info_undo dd sz_tl_info_undo tl_info_redo dd sz_tl_info_redo tl_node_add dd sz_tl_node_add tl_node_set_data dd sz_tl_node_set_data tl_node_get_data dd sz_tl_node_get_data tl_node_delete dd sz_tl_node_delete tl_cur_beg dd sz_tl_cur_beg tl_cur_next dd sz_tl_cur_next tl_cur_perv dd sz_tl_cur_perv ;tl_node_close_open dd sz_tl_node_close_open tl_node_lev_inc dd sz_tl_node_lev_inc tl_node_lev_dec dd sz_tl_node_lev_dec ted_but_sumb_upper dd sz_ted_but_sumb_upper ted_but_sumb_lover dd sz_ted_but_sumb_lover ted_but_convert_by_table dd sz_ted_but_convert_by_table ted_can_save dd sz_ted_can_save ted_clear dd sz_ted_clear ted_delete dd sz_ted_delete ted_draw dd sz_ted_draw ted_init dd sz_ted_init ted_init_scroll_bars dd sz_ted_init_scroll_bars ted_init_syntax_file dd sz_ted_init_syntax_file ted_is_select dd sz_ted_is_select ted_key dd sz_ted_key ted_mouse dd sz_ted_mouse ted_open_file dd sz_ted_open_file ted_save_file dd sz_ted_save_file ted_text_add dd sz_ted_text_add ted_but_select_word dd sz_ted_but_select_word ted_but_cut dd sz_ted_but_cut ted_but_copy dd sz_ted_but_copy ted_but_paste dd sz_ted_but_paste ted_but_undo dd sz_ted_but_undo ted_but_redo dd sz_ted_but_redo ted_but_reverse dd sz_ted_but_reverse ted_but_find dd sz_ted_but_find ted_but_replace dd sz_ted_but_replace ted_text_colored dd sz_ted_text_colored ted_go_to_position dd sz_ted_go_to_position version_text_edit dd sz_ted_version dd 0,0 alib_init0 db 'lib_init',0 aEdit_box_draw db 'edit_box_draw',0 aEdit_box_key db 'edit_box_key',0 aEdit_box_mouse db 'edit_box_mouse',0 ;aEdit_box_set_text db 'edit_box_set_text',0 ;aVersion_ed db 'version_ed',0 ainit_checkbox db 'init_checkbox2',0 acheck_box_draw db 'check_box_draw2',0 acheck_box_mouse db 'check_box_mouse2',0 aOption_box_draw db 'option_box_draw',0 aOption_box_mouse db 'option_box_mouse',0 ;aVersion_op db 'version_op',0 aScrollbar_ver_draw db 'scrollbar_v_draw',0 aScrollbar_ver_mouse db 'scrollbar_v_mouse',0 aScrollbar_hor_draw db 'scrollbar_h_draw',0 aScrollbar_hor_mouse db 'scrollbar_h_mouse',0 ;aVersion_scrollbar db 'version_scrollbar',0 sz_tl_data_init db 'tl_data_init',0 sz_tl_data_clear db 'tl_data_clear',0 sz_tl_info_clear db 'tl_info_clear',0 sz_tl_key db 'tl_key',0 sz_tl_mouse db 'tl_mouse',0 sz_tl_draw db 'tl_draw',0 sz_tl_info_undo db 'tl_info_undo',0 sz_tl_info_redo db 'tl_info_redo',0 sz_tl_node_add db 'tl_node_add',0 sz_tl_node_set_data db 'tl_node_set_data',0 sz_tl_node_get_data db 'tl_node_get_data',0 sz_tl_node_delete db 'tl_node_delete',0 sz_tl_cur_beg db 'tl_cur_beg',0 sz_tl_cur_next db 'tl_cur_next',0 sz_tl_cur_perv db 'tl_cur_perv',0 ;sz_tl_node_close_open db 'tl_node_close_open',0 sz_tl_node_lev_inc db 'tl_node_lev_inc',0 sz_tl_node_lev_dec db 'tl_node_lev_dec',0 sz_ted_but_sumb_upper db 'ted_but_sumb_upper',0 sz_ted_but_sumb_lover db 'ted_but_sumb_lover',0 sz_ted_but_convert_by_table db 'ted_but_convert_by_table',0 sz_ted_can_save db 'ted_can_save',0 sz_ted_clear db 'ted_clear',0 sz_ted_delete db 'ted_delete',0 sz_ted_draw db 'ted_draw',0 sz_ted_init db 'ted_init',0 sz_ted_init_scroll_bars db 'ted_init_scroll_bars',0 sz_ted_init_syntax_file db 'ted_init_syntax_file',0 sz_ted_is_select db 'ted_is_select',0 sz_ted_key db 'ted_key',0 sz_ted_mouse db 'ted_mouse',0 sz_ted_open_file db 'ted_open_file',0 sz_ted_save_file db 'ted_save_file',0 sz_ted_text_add db 'ted_text_add',0 sz_ted_but_select_word db 'ted_but_select_word',0 sz_ted_but_cut db 'ted_but_cut',0 sz_ted_but_copy db 'ted_but_copy',0 sz_ted_but_paste db 'ted_but_paste',0 sz_ted_but_undo db 'ted_but_undo',0 sz_ted_but_redo db 'ted_but_redo',0 sz_ted_but_reverse db 'ted_but_reverse',0 sz_ted_but_find db 'ted_but_find',0 sz_ted_but_replace db 'ted_but_replace',0 sz_ted_text_colored db 'ted_text_colored',0 sz_ted_go_to_position db 'ted_go_to_position',0 sz_ted_version db 'version_text_edit',0 align 4 import_proclib: OpenDialog_Init dd aOpenDialog_Init OpenDialog_Start dd aOpenDialog_Start dd 0,0 aOpenDialog_Init db 'OpenDialog_init',0 aOpenDialog_Start db 'OpenDialog_start',0 align 4 import_msgbox_lib: mb_create dd amb_create mb_reinit dd amb_reinit mb_setfunctions dd amb_setfunctions dd 0,0 amb_create db 'mb_create',0 amb_reinit db 'mb_reinit',0 amb_setfunctions db 'mb_setfunctions',0 align 4 import_libimg: dd alib_init1 img_to_rgb2 dd aimg_to_rgb2 img_decode dd aimg_decode img_destroy dd aimg_destroy dd 0,0 alib_init1 db 'lib_init',0 aimg_to_rgb2 db 'img_to_rgb2',0 aimg_decode db 'img_decode',0 ;⮬᪨ । ଠ ᪨ aimg_destroy db 'img_destroy',0 align 4 import_libini: dd alib_init2 ini_get_str dd aini_get_str ini_get_int dd aini_get_int ini_get_color dd aini_get_color dd 0,0 alib_init2 db 'lib_init',0 aini_get_str db 'ini_get_str',0 aini_get_int db 'ini_get_int',0 aini_get_color db 'ini_get_color',0 align 4 import_libkmenu: kmenu_init dd akmenu_init kmainmenu_draw dd akmainmenu_draw kmainmenu_dispatch_cursorevent dd akmainmenu_dispatch_cursorevent ksubmenu_new dd aksubmenu_new ksubmenu_delete dd aksubmenu_delete ksubmenu_draw dd aksubmenu_draw ksubmenu_add dd aksubmenu_add kmenuitem_new dd akmenuitem_new kmenuitem_delete dd akmenuitem_delete kmenuitem_draw dd akmenuitem_draw dd 0,0 akmenu_init db 'kmenu_init',0 akmainmenu_draw db 'kmainmenu_draw',0 akmainmenu_dispatch_cursorevent db 'kmainmenu_dispatch_cursorevent',0 aksubmenu_new db 'ksubmenu_new',0 aksubmenu_delete db 'ksubmenu_delete',0 aksubmenu_draw db 'ksubmenu_draw',0 aksubmenu_add db 'ksubmenu_add',0 akmenuitem_new db 'kmenuitem_new',0 akmenuitem_delete db 'kmenuitem_delete',0 akmenuitem_draw db 'kmenuitem_draw',0 ;--------------------------------------------------------------------- align 4 wScr scrollbar 16,50, 300,50, 15, 100,30,0, 0,0,0, 1 align 4 hScr scrollbar 150,0, 16,50, 15, 100,30,0, 0,0,0, 1 ;୨ ஫ ListBox align 4 ws_dir_lbox scrollbar 16,0, 30,70, 15, 100,30,0, 0,0,0, 1 ;--------------------------------------------------------------------- align 4 OpenDialog_data: .type dd 0 .procinfo dd procinfo ;+4 .com_area_name dd communication_area_name ;+8 .com_area dd 0 ;+12 .opendir_path dd plugin_path ;+16 .dir_default_path dd default_dir ;+20 .start_path dd file_name ;+24 䠩 .draw_window dd draw_window ;+28 .status dd 0 ;+32 .openfile_path dd openfile_path ;+36 뢠 䠩 .filename_area dd filename_area ;+40 뢠 䠩 .filter_area dd Filter .x: .x_size dw 420 ;+48 ; Window X size .x_start dw 10 ;+50 ; Window X position .y: .y_size dw 320 ;+52 ; Window y size .y_start dw 10 ;+54 ; Window Y position default_dir db '/sys',0 ;४ 㬮砭 communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_name: db 'opendial',0 communication_area_default_path: db '/sys/File managers/',0 Filter: dd Filter.end - Filter.1 .1: db 'ASM',0 db 'CPP',0 db 'INC',0 db 'MAC',0 db 'INI',0 db 'TXT',0 db 'H',0 db 'C',0 db 'HTM',0 db 'HTML',0 db 'PY',0 db 'SH',0 db 'BAT',0 db 'LUA',0 db 'INF',0 db 'LOG',0 db 'DBG',0 db 'DAT',0 .end: db 0 txt_Info db '" -tI',0 TED_PANEL_NULL equ 0 ; ⮩ TED_PANEL_FIND equ 1 ; ᪠ TED_PANEL_REPLACE equ 2 ; TED_PANEL_SYNTAX equ 3 ; 롮 䠩 ᢥ⪨ TED_PANEL_GOTO equ 4 ; 室 TED_PANEL_WIDTH equ 150 ;ਭ count_of_dir_list_files equ 15 ;ᨬ쭮 ᫮ 䠩 ᨭ⠪ 뢠 tree1 ;------------------------------------------------------------------------------ struct TexSelect x0 dd ? y0 dd ? x1 dd ? y1 dd ? ends ;------------------------------------------------------------------------------ align 4 tedit0: ; ⥪⮢ । .wnd BOX 0,50,440,150 ;+ 0 .rec BOX 30,25,ini_def_symbol_w,ini_def_symbol_h ;+16 .drag_m db 0 ;+32 뤥 .drag_k db 0 ;+33 뤥 .sel TexSelect 0,0,0,0 ;+34 뤥 .seln TexSelect ;+50 ⥫쭠 뤥 .tex dd 0 ;+66 text memory pointer .tex_1 dd 0 ;+70 text first symbol pointer .tex_end dd 0 ;+74 text end memory pointer .cur_x dd 0 ;+78 न x .cur_y dd 0 ;+82 न y .max_chars dd maxChars ;+86 ᨬ쭮 ᫮ ᨬ 㬥 .count_colors_text dd 1 ;+90 ⢮ 梥⮢ ⥪ .count_key_words dd 0 ;+94 ⢮ 祢 ᫮ .color_cursor dd 0x808080 ;+98 梥 .color_wnd_capt dd 0x80 ;+102 梥 .color_wnd_work dd 0x0 ;+106 梥 䮭 .color_wnd_bord dd 0xd0d0d0 ;+110 梥 ⥪ .color_select dd 0x208080 ;+114 梥 뤥 .color_cur_text dd 0xff0000 ;+118 梥 ᨬ ஬ .color_wnd_text dd 0xffff00 ;+122 梥 ⥪ .syntax_file dd 0 ;+126 㪠⥫ 砫 䠩 ᨭ⠪ .syntax_file_size dd maxSyntaxFileSize ;+130 ᨬ ࠧ 䠩 ᨭ⠪ .text_colors dd 0 ;+134 㪠⥫ ᨢ 梥⮢ ⥪ .help_text_f1 dd 0 ;+138 㪠⥫ ⥪ ࠢ ( ⨨ F1) .help_id dd -1 ;+142 䨪 ࠢ .key_words_data dd 0 ;+146 㪠⥫ 祢 ᫮ TexColViv .tim_ch dd ? ;+150 ⢮ 䠩 .tim_undo dd ? ;+154 ⢮ ⬥ ⢨ .tim_ls dd ? ;+158 ६ ᫥ ࠭ .tim_co dd ? ;+162 ६ ᫥ 梥⮢ ࠧ⪨ .el_focus dd el_focus ;+166 㪠⥫ ६ 䮪 .err_save db 0 ;+170 訡 ࠭ 䠩 .panel_id db 0 ;+171 ⮩ .key_new db 0 ;+172 ᨬ, 㤥 .symbol_new_line db 20 ;+173 ᨬ 襭 ப .scr_w dd wScr ;+174 ⨪ ஫ .scr_h dd hScr ;+178 ਧ⠫ ஫ .arr_key_pos dd 0 ;+182 㪠⥫ ᨢ 権 祢 ᫮ .buffer dd buf ;+186 㪠⥫ ஢/⠢ .buffer_find dd buf_find ;+190 㪠⥫ ᪠ .cur_ins db 1 ;+194 ० ࠡ ( ) .mode_color db 1 ;+195 ० 뤥 ᫮ 梥⮬ (0-몫. 1-.) .mode_invis db 0 ;+196 ० ⠥ ᨬ .gp_opt db 0 ;+197 樨 頥 㭪樥 ted_get_pos_by_cursor .fun_on_key_ctrl_all dd ted_but_ctrl_all ;+198 㪠⥫ 㭪 뢠 ⨨ Ctrl+N,O,S,F,H,G dd 0,0,0 ;१ࢨ஢ .buffer_size dd BUF_SIZE ;+214 ࠧ ஢/⠢ .fun_find_err dd ted_on_find_err ;+218 㪠⥫ 㭪 뢠 ᫨ 稫 㤠筮 .fun_init_synt_err dd 0 ;+222 .fun_draw_panel_buttons dd draw_but_toolbar ;+226 㪠⥫ 㭪 ᮢ .fun_draw_panels dd draw_panels ;+230 㪠⥫ 㭪 ᮢ ᪠/ dd 0 ;+234 १ࢨ஢ .fun_save_err dd ted_save_err_msg ;+238 㪠⥫ 㭪 뢠 ᫨ ࠭ 䠩 稫 㤠筮 .increase_size dd 200 ;+242 ᫮ ᨬ 㤥 㢥稢 墠⪥ .ptr_free_symb dd ? ;+246 ᯮ ᪮७ ⠢ ⥪ .font_size dd 0 ;+250 ⥫ ࠧ ;------------------------------------------------------------------------------ conv_tabl rb 128 ; ⠡ ஢ scan- ascii- el_focus dd tedit0 mouse_dd dd 0 tree1 tree_list 264,count_of_dir_list_files+2, tl_key_no_edit+tl_draw_par_line+tl_list_box_mode,\ 16,16, 0x8080ff,0x0000ff,0xffffff, 0,70,TED_PANEL_WIDTH-17,120, 0,0,0, el_focus,\ ws_dir_lbox,0 ;dir_list memory tree_file_struct: dd 1,0,0,count_of_dir_list_files dd dir_mem db 0 .f: dd file_name align 4 opt_gr1 dd opt1 opt_grlist1 dd opt1,opt2,opt3,0 ;end option group opt1 option_box opt_gr1, 5, 90,6,12,0xd0d0ff, 0xff, 0x80ff,txt_f_opt_next,txt_f_opt_next.end-txt_f_opt_next opt2 option_box opt_gr1, 5,108,6,12,0xd0d0ff, 0xff, 0x80ff,txt_f_opt_perv,txt_f_opt_perv.end-txt_f_opt_perv opt3 option_box opt_gr1, 5,126,6,12,0xd0d0ff, 0xff, 0x80ff,txt_f_opt_beg,txt_f_opt_beg.end-txt_f_opt_beg check_boxes: ch1 check_box2 (5 shl 16+12),(144 shl 16 +12),5,0xffffff,0,0x80ff,ch_text.1,ch_flag_en+ch_flag_middle check_boxes_end: if lang eq ru msgbox_1: db '"',13,10,' : ' .z: rb 10 msgbox_2: db 3,0 db '',0 db '࠭ 䠩?',0 db '࠭',0 db ' ࠭',0 db '⬥',0 db 0 msgbox_3: db 1,0 db '',0 db '訡 ⨨ 䠩 梥⮢묨 ன!',13,\ '⮬ 뤥 ᫮ 梥⮬ .',13,\ ' ( 訡 =' .err: db '?' db ')',0 db '',0 db 0 msgbox_4: db 1,0 db '',0 db '訡 ⨨ 䠩!',13,\ ' 䠩 ࠢ쭮.',13,\ ' ( 訡 =' .err: db '?' db ')',0 db '',0 db 0 msgbox_6: db 1,0 db '',0 db '訡 ࠭ 䠩!',13,\ ' 䠩 ࠢ쭮.',13,\ ' ( 訡 =' .err: db '?' db ')',0 db '',0 db 0 msgbox_7: db '" ',13,10 db '஡ ." -tI',0 msgbox_9: db 3,0 db '',0 db ' ',39,' 䠩',39,'.',13 .fdp: rb 100 db 0 db '',0 db 0 txtFindCapt db ':',0 txtFindNext db ' ',0 txtRerlaceCapt db ' :',0 txtRerlace db '',0 txtRerlaceAll db ' ',0 txtFormatCapt db 'ଠ',0 txtFormatApply db 'ਬ',0 txtReplace db '',0 txtReplaceAll db ' ',0 txtGotoCapt db '室 ப:',0 txtGoto db '३',0 txt_f_opt_next: db '' .end: db 0 txt_f_opt_perv: db '' .end: db 0 txt_f_opt_beg: db ' 砫' .end: db 0 ch_text: .1 db '뢠 ॣ',0 else msgbox_1: db '"Replace',13,10,'Made replacements: ' .z: rb 10 msgbox_2: db 3,0 db 'Warning',0 db 'Save changes to the file?',0 db 'Save',0 db 'Discard',0 db 'Cancel',0 db 0 msgbox_3: db 1,0 db 'Warning',0 db 'Error opening the file with the color settings!',13,\ 'Because color selection of words is not possible.',13,\ ' (error code =' .err: db '?' db ')',0 db 'Close',0 db 0 msgbox_4: db 1,0 db 'Warning',0 db 'Error opening file!',13,\ 'Maybe the file name is not entered correctly.',13,\ ' (error code =' .err: db '?' db ')',0 db 'Close',0 db 0 msgbox_6: db 1,0 db 'Warning',0 db 'Error saving file!',13,\ 'Maybe the file name is not entered correctly.',13,\ ' (error code =' .err: db '?' db ')',0 db 'Close',0 db 0 msgbox_7: db '"Text not found.',13,10 db 'Try change the query and search again." -tI',0 msgbox_9: db 3,0 db 'Warning',0 db 'Error run ',39,'open file dialog',39,'.',13 .fdp: rb 100 db 0 db 'Close',0 db 0 txtFindCapt db 'Search:',0 txtFindNext db 'Find next',0 txtRerlaceCapt db 'Replace with:',0 txtRerlace db 'Replace',0 txtRerlaceAll db 'Replace all',0 txtFormatCapt db 'Format',0 txtFormatApply db 'Apply',0 txtReplace db 'Replace',0 txtReplaceAll db 'Replace all',0 txtGotoCapt db 'Go to line:',0 txtGoto db 'Go to',0 txt_f_opt_next: db 'Down' .end: db 0 txt_f_opt_perv: db 'Up' .end: db 0 txt_f_opt_beg: db 'At first' .end: db 0 ch_text: .1 db 'Case sensitive',0 end if ;㭪樨 ᮮ饭 msgbox_2N_funct: dd On_SaveAndNewFile dd On_NewFile dd 0 msgbox_2O_funct: dd On_SaveAndOpenFile dd ted_but_open_file.no_msg dd 0 msgbox_2E_funct: dd On_SaveAndExit dd On_Exit dd 0 KM_SHIFT equ 0x00010000 KM_CTRL equ 0x00020000 KM_ALT equ 0x00040000 KM_NUMLOCK equ 0x00080000 ; KEY CODES KEY_F1 equ 0x0000003B KEY_F2 equ 0x0000003C KEY_F3 equ 0x0000003D \ No newline at end of file +fn_col_option dd def_col_file fn_syntax_dir db 'info/',0 def_col_file db 'default.syn',0 exit_code dd 0 ;६ ᯮ㥬 室 ணࠬ panel_but rb 21 ;ன ⮡ࠦ ;祭 㬮砭, ini 䠩 ini_def_window_t equ 20 ini_def_window_l equ 200 ini_def_window_w equ 570 ini_def_window_h equ 470 ini_def_symbol_w equ 7 ini_def_symbol_h equ 10 ini_def_font_s equ 0 ini_def_scroll_type equ 0 ;ᠭ ࠬ஢ ini 䠩 ini_name db 't_edit.ini',0 ini_sec_window db 'Window',0 key_window_t db 't',0 key_window_l db 'l',0 key_window_w db 'w',0 key_window_h db 'h',0 key_symbol_w db 'symbol_w',0 key_symbol_h db 'symbol_h',0 key_font_s db 'font_s',0 key_scroll_type db 'scroll_type',0 key_but_new db 'but_new',0 key_but_open db 'but_open',0 key_but_save db 'but_save',0 key_but_save_as db 'but_save_as',0 key_but_select db 'but_select',0 key_but_cut db 'but_cut',0 key_but_copy db 'but_copy',0 key_but_paste db 'but_paste',0 key_but_find db 'but_find',0 key_but_replace db 'but_replace',0 key_but_key_words db 'but_key_words',0 key_but_upper db 'but_upper',0 key_but_lower db 'but_lower',0 key_but_reverse db 'but_reverse',0 key_but_undo db 'but_undo',0 key_but_redo db 'but_redo',0 key_but_invisible db 'but_invisible',0 key_but_syntax_list db 'but_syntax_list',0 key_but_syntax_mode db 'but_syntax_mode',0 key_but_convert_1251_866 db 'but_convert_1251_866',0 key_but_convert_866_1251 db 'but_convert_866_1251',0 ini_sec_options db 'Options',0 key_synt_file: db 'syntax_' .numb: db '0',0 key_synt_ext: db 'ext_' .numb: db '0',0 ini_def_synt_f db 0 align 4 max_synt_auto_open equ 10 synt_auto_open: rb 64*max_synt_auto_open db 0 system_dir_0 db '/sys/lib/' lib_name_0 db 'box_lib.obj',0 system_dir_1 db '/sys/lib/' lib_name_1 db 'msgbox.obj',0 system_dir_2 db '/sys/lib/' lib_name_2 db 'proc_lib.obj',0 system_dir_3 db '/sys/lib/' lib_name_3 db 'libimg.obj',0 system_dir_4 db '/sys/lib/' lib_name_4 db 'libini.obj',0 system_dir_5 db '/sys/lib/' lib_name_5 db 'kmenu.obj',0 ;--------------------------------------------------------------------- align 4 import_box_lib: dd alib_init0 ;㭪 ᪠ ᮬ 1 ࠧ 祭 ⥪, ⮬ ணࠬ ⪠ 㦭 edit_box_draw dd aEdit_box_draw edit_box_key dd aEdit_box_key edit_box_mouse dd aEdit_box_mouse ;edit_box_set_text dd aEdit_box_set_text ;version_ed dd aVersion_ed init_checkbox dd ainit_checkbox check_box_draw dd acheck_box_draw check_box_mouse dd acheck_box_mouse option_box_draw dd aOption_box_draw option_box_mouse dd aOption_box_mouse ;version_op dd aVersion_op scrollbar_ver_draw dd aScrollbar_ver_draw scrollbar_ver_mouse dd aScrollbar_ver_mouse scrollbar_hor_draw dd aScrollbar_hor_draw scrollbar_hor_mouse dd aScrollbar_hor_mouse ;version_scrollbar dd aVersion_scrollbar tl_data_init dd sz_tl_data_init tl_data_clear dd sz_tl_data_clear tl_info_clear dd sz_tl_info_clear tl_key dd sz_tl_key tl_mouse dd sz_tl_mouse tl_draw dd sz_tl_draw tl_info_undo dd sz_tl_info_undo tl_info_redo dd sz_tl_info_redo tl_node_add dd sz_tl_node_add tl_node_set_data dd sz_tl_node_set_data tl_node_get_data dd sz_tl_node_get_data tl_node_delete dd sz_tl_node_delete tl_cur_beg dd sz_tl_cur_beg tl_cur_next dd sz_tl_cur_next tl_cur_perv dd sz_tl_cur_perv ;tl_node_close_open dd sz_tl_node_close_open tl_node_lev_inc dd sz_tl_node_lev_inc tl_node_lev_dec dd sz_tl_node_lev_dec ted_but_sumb_upper dd sz_ted_but_sumb_upper ted_but_sumb_lover dd sz_ted_but_sumb_lover ted_but_convert_by_table dd sz_ted_but_convert_by_table ted_can_save dd sz_ted_can_save ted_clear dd sz_ted_clear ted_delete dd sz_ted_delete ted_draw dd sz_ted_draw ted_init dd sz_ted_init ted_init_scroll_bars dd sz_ted_init_scroll_bars ted_init_syntax_file dd sz_ted_init_syntax_file ted_is_select dd sz_ted_is_select ted_key dd sz_ted_key ted_mouse dd sz_ted_mouse ted_open_file dd sz_ted_open_file ted_save_file dd sz_ted_save_file ted_text_add dd sz_ted_text_add ted_but_select_word dd sz_ted_but_select_word ted_but_cut dd sz_ted_but_cut ted_but_copy dd sz_ted_but_copy ted_but_paste dd sz_ted_but_paste ted_but_undo dd sz_ted_but_undo ted_but_redo dd sz_ted_but_redo ted_but_reverse dd sz_ted_but_reverse ted_but_find dd sz_ted_but_find ted_but_replace dd sz_ted_but_replace ted_text_colored dd sz_ted_text_colored ted_go_to_position dd sz_ted_go_to_position version_text_edit dd sz_ted_version dd 0,0 alib_init0 db 'lib_init',0 aEdit_box_draw db 'edit_box_draw',0 aEdit_box_key db 'edit_box_key',0 aEdit_box_mouse db 'edit_box_mouse',0 ;aEdit_box_set_text db 'edit_box_set_text',0 ;aVersion_ed db 'version_ed',0 ainit_checkbox db 'init_checkbox2',0 acheck_box_draw db 'check_box_draw2',0 acheck_box_mouse db 'check_box_mouse2',0 aOption_box_draw db 'option_box_draw',0 aOption_box_mouse db 'option_box_mouse',0 ;aVersion_op db 'version_op',0 aScrollbar_ver_draw db 'scrollbar_v_draw',0 aScrollbar_ver_mouse db 'scrollbar_v_mouse',0 aScrollbar_hor_draw db 'scrollbar_h_draw',0 aScrollbar_hor_mouse db 'scrollbar_h_mouse',0 ;aVersion_scrollbar db 'version_scrollbar',0 sz_tl_data_init db 'tl_data_init',0 sz_tl_data_clear db 'tl_data_clear',0 sz_tl_info_clear db 'tl_info_clear',0 sz_tl_key db 'tl_key',0 sz_tl_mouse db 'tl_mouse',0 sz_tl_draw db 'tl_draw',0 sz_tl_info_undo db 'tl_info_undo',0 sz_tl_info_redo db 'tl_info_redo',0 sz_tl_node_add db 'tl_node_add',0 sz_tl_node_set_data db 'tl_node_set_data',0 sz_tl_node_get_data db 'tl_node_get_data',0 sz_tl_node_delete db 'tl_node_delete',0 sz_tl_cur_beg db 'tl_cur_beg',0 sz_tl_cur_next db 'tl_cur_next',0 sz_tl_cur_perv db 'tl_cur_perv',0 ;sz_tl_node_close_open db 'tl_node_close_open',0 sz_tl_node_lev_inc db 'tl_node_lev_inc',0 sz_tl_node_lev_dec db 'tl_node_lev_dec',0 sz_ted_but_sumb_upper db 'ted_but_sumb_upper',0 sz_ted_but_sumb_lover db 'ted_but_sumb_lover',0 sz_ted_but_convert_by_table db 'ted_but_convert_by_table',0 sz_ted_can_save db 'ted_can_save',0 sz_ted_clear db 'ted_clear',0 sz_ted_delete db 'ted_delete',0 sz_ted_draw db 'ted_draw',0 sz_ted_init db 'ted_init',0 sz_ted_init_scroll_bars db 'ted_init_scroll_bars',0 sz_ted_init_syntax_file db 'ted_init_syntax_file',0 sz_ted_is_select db 'ted_is_select',0 sz_ted_key db 'ted_key',0 sz_ted_mouse db 'ted_mouse',0 sz_ted_open_file db 'ted_open_file',0 sz_ted_save_file db 'ted_save_file',0 sz_ted_text_add db 'ted_text_add',0 sz_ted_but_select_word db 'ted_but_select_word',0 sz_ted_but_cut db 'ted_but_cut',0 sz_ted_but_copy db 'ted_but_copy',0 sz_ted_but_paste db 'ted_but_paste',0 sz_ted_but_undo db 'ted_but_undo',0 sz_ted_but_redo db 'ted_but_redo',0 sz_ted_but_reverse db 'ted_but_reverse',0 sz_ted_but_find db 'ted_but_find',0 sz_ted_but_replace db 'ted_but_replace',0 sz_ted_text_colored db 'ted_text_colored',0 sz_ted_go_to_position db 'ted_go_to_position',0 sz_ted_version db 'version_text_edit',0 align 4 import_proclib: OpenDialog_Init dd aOpenDialog_Init OpenDialog_Start dd aOpenDialog_Start dd 0,0 aOpenDialog_Init db 'OpenDialog_init',0 aOpenDialog_Start db 'OpenDialog_start',0 align 4 import_msgbox_lib: mb_create dd amb_create mb_reinit dd amb_reinit mb_setfunctions dd amb_setfunctions dd 0,0 amb_create db 'mb_create',0 amb_reinit db 'mb_reinit',0 amb_setfunctions db 'mb_setfunctions',0 align 4 import_libimg: dd alib_init1 img_to_rgb2 dd aimg_to_rgb2 img_decode dd aimg_decode img_destroy dd aimg_destroy dd 0,0 alib_init1 db 'lib_init',0 aimg_to_rgb2 db 'img_to_rgb2',0 aimg_decode db 'img_decode',0 ;⮬᪨ । ଠ ᪨ aimg_destroy db 'img_destroy',0 align 4 import_libini: dd alib_init2 ini_get_str dd aini_get_str ini_get_int dd aini_get_int ini_get_color dd aini_get_color dd 0,0 alib_init2 db 'lib_init',0 aini_get_str db 'ini_get_str',0 aini_get_int db 'ini_get_int',0 aini_get_color db 'ini_get_color',0 align 4 import_libkmenu: kmenu_init dd akmenu_init kmainmenu_draw dd akmainmenu_draw kmainmenu_dispatch_cursorevent dd akmainmenu_dispatch_cursorevent ksubmenu_new dd aksubmenu_new ksubmenu_delete dd aksubmenu_delete ksubmenu_draw dd aksubmenu_draw ksubmenu_add dd aksubmenu_add kmenuitem_new dd akmenuitem_new kmenuitem_delete dd akmenuitem_delete kmenuitem_draw dd akmenuitem_draw dd 0,0 akmenu_init db 'kmenu_init',0 akmainmenu_draw db 'kmainmenu_draw',0 akmainmenu_dispatch_cursorevent db 'kmainmenu_dispatch_cursorevent',0 aksubmenu_new db 'ksubmenu_new',0 aksubmenu_delete db 'ksubmenu_delete',0 aksubmenu_draw db 'ksubmenu_draw',0 aksubmenu_add db 'ksubmenu_add',0 akmenuitem_new db 'kmenuitem_new',0 akmenuitem_delete db 'kmenuitem_delete',0 akmenuitem_draw db 'kmenuitem_draw',0 ;--------------------------------------------------------------------- align 4 wScr scrollbar 16,50, 300,50, 15, 100,30,0, 0,0,0, 1 align 4 hScr scrollbar 150,0, 16,50, 15, 100,30,0, 0,0,0, 1 ;୨ ஫ ListBox align 4 ws_dir_lbox scrollbar 16,0, 30,70, 15, 100,30,0, 0,0,0, 1 ;--------------------------------------------------------------------- align 4 OpenDialog_data: .type dd 0 .procinfo dd procinfo ;+4 .com_area_name dd communication_area_name ;+8 .com_area dd 0 ;+12 .opendir_path dd plugin_path ;+16 .dir_default_path dd default_dir ;+20 .start_path dd file_name ;+24 䠩 .draw_window dd draw_window ;+28 .status dd 0 ;+32 .openfile_path dd openfile_path ;+36 뢠 䠩 .filename_area dd filename_area ;+40 뢠 䠩 .filter_area dd Filter .x: .x_size dw 420 ;+48 ; Window X size .x_start dw 10 ;+50 ; Window X position .y: .y_size dw 320 ;+52 ; Window y size .y_start dw 10 ;+54 ; Window Y position default_dir db '/sys',0 ;४ 㬮砭 communication_area_name: db 'FFFFFFFF_open_dialog',0 open_dialog_name: db 'opendial',0 communication_area_default_path: db '/sys/File managers/',0 Filter: dd Filter.end - Filter.1 .1: db 'ASM',0 db 'CPP',0 db 'INC',0 db 'MAC',0 db 'INI',0 db 'TXT',0 db 'H',0 db 'C',0 db 'HTM',0 db 'HTML',0 db 'PY',0 db 'SH',0 db 'BAT',0 db 'LUA',0 db 'INF',0 db 'LOG',0 db 'DBG',0 db 'DAT',0 .end: db 0 txt_Info db '" -tI',0 TED_PANEL_NULL equ 0 ; ⮩ TED_PANEL_FIND equ 1 ; ᪠ TED_PANEL_REPLACE equ 2 ; TED_PANEL_SYNTAX equ 3 ; 롮 䠩 ᢥ⪨ TED_PANEL_GOTO equ 4 ; 室 TED_PANEL_WIDTH equ 150 ;ਭ count_of_dir_list_files equ 15 ;ᨬ쭮 ᫮ 䠩 ᨭ⠪ 뢠 tree1 ;------------------------------------------------------------------------------ struct TexSelect x0 dd ? y0 dd ? x1 dd ? y1 dd ? ends ;------------------------------------------------------------------------------ align 4 tedit0: ; ⥪⮢ । .wnd BOX 0,50,440,150 ;+ 0 .rec BOX 30,25,ini_def_symbol_w,ini_def_symbol_h ;+16 .drag_m db 0 ;+32 뤥 .drag_k db 0 ;+33 뤥 .sel TexSelect 0,0,0,0 ;+34 뤥 .seln TexSelect ;+50 ⥫쭠 뤥 .tex dd 0 ;+66 text memory pointer .tex_1 dd 0 ;+70 text first symbol pointer .tex_end dd 0 ;+74 text end memory pointer .cur_x dd 0 ;+78 न x .cur_y dd 0 ;+82 न y .max_chars dd maxChars ;+86 ᨬ쭮 ᫮ ᨬ 㬥 .count_colors_text dd 1 ;+90 ⢮ 梥⮢ ⥪ .count_key_words dd 0 ;+94 ⢮ 祢 ᫮ .color_cursor dd 0x808080 ;+98 梥 .color_wnd_capt dd 0x80 ;+102 梥 .color_wnd_work dd 0x0 ;+106 梥 䮭 .color_wnd_bord dd 0xd0d0d0 ;+110 梥 ⥪ .color_select dd 0x208080 ;+114 梥 뤥 .color_cur_text dd 0xff0000 ;+118 梥 ᨬ ஬ .color_wnd_text dd 0xffff00 ;+122 梥 ⥪ .syntax_file dd 0 ;+126 㪠⥫ 砫 䠩 ᨭ⠪ .syntax_file_size dd maxSyntaxFileSize ;+130 ᨬ ࠧ 䠩 ᨭ⠪ .text_colors dd 0 ;+134 㪠⥫ ᨢ 梥⮢ ⥪ .help_text_f1 dd 0 ;+138 㪠⥫ ⥪ ࠢ ( ⨨ F1) .help_id dd -1 ;+142 䨪 ࠢ .key_words_data dd 0 ;+146 㪠⥫ 祢 ᫮ TexColViv .tim_ch dd ? ;+150 ⢮ 䠩 .tim_undo dd ? ;+154 ⢮ ⬥ ⢨ .tim_ls dd ? ;+158 ६ ᫥ ࠭ .tim_co dd ? ;+162 ६ ᫥ 梥⮢ ࠧ⪨ .el_focus dd el_focus ;+166 㪠⥫ ६ 䮪 .err_save db 0 ;+170 訡 ࠭ 䠩 .panel_id db 0 ;+171 ⮩ .key_new db 0 ;+172 ᨬ, 㤥 .symbol_new_line db 20 ;+173 ᨬ 襭 ப .scr_w dd wScr ;+174 ⨪ ஫ .scr_h dd hScr ;+178 ਧ⠫ ஫ .arr_key_pos dd 0 ;+182 㪠⥫ ᨢ 権 祢 ᫮ .buffer dd buf ;+186 㪠⥫ ஢/⠢ .buffer_find dd buf_find ;+190 㪠⥫ ᪠ .cur_ins db 1 ;+194 ० ࠡ ( ) .mode_color db 1 ;+195 ० 뤥 ᫮ 梥⮬ (0-몫. 1-.) .mode_invis db 0 ;+196 ० ⠥ ᨬ .gp_opt db 0 ;+197 樨 頥 㭪樥 ted_get_pos_by_cursor .fun_on_key_ctrl_all dd ted_but_ctrl_all ;+198 㪠⥫ 㭪 뢠 ⨨ Ctrl+N,O,S,F,H,G dd 0,0,0 ;१ࢨ஢ .buffer_size dd BUF_SIZE ;+214 ࠧ ஢/⠢ .fun_find_err dd ted_on_find_err ;+218 㪠⥫ 㭪 뢠 ᫨ 稫 㤠筮 .fun_init_synt_err dd 0 ;+222 .fun_draw_panel_buttons dd draw_but_toolbar ;+226 㪠⥫ 㭪 ᮢ .fun_draw_panels dd draw_panels ;+230 㪠⥫ 㭪 ᮢ ᪠/ dd 0 ;+234 १ࢨ஢ .fun_save_err dd ted_save_err_msg ;+238 㪠⥫ 㭪 뢠 ᫨ ࠭ 䠩 稫 㤠筮 .increase_size dd 200 ;+242 ᫮ ᨬ 㤥 㢥稢 墠⪥ .ptr_free_symb dd ? ;+246 ᯮ ᪮७ ⠢ ⥪ .font_size dd 0 ;+250 ⥫ ࠧ ;------------------------------------------------------------------------------ conv_tabl rb 128 ; ⠡ ஢ scan- ascii- el_focus dd tedit0 mouse_dd dd 0 tree1 tree_list 264,count_of_dir_list_files+2, tl_key_no_edit+tl_draw_par_line+tl_list_box_mode,\ 16,16, 0x8080ff,0x0000ff,0xffffff, 0,70,TED_PANEL_WIDTH-17,120, 0,0,0, el_focus,\ ws_dir_lbox,0 ;dir_list memory tree_file_struct: dd 1,0,0,count_of_dir_list_files dd dir_mem db 0 .f: dd file_name align 4 opt_gr1 dd opt1 opt_grlist1 dd opt1,opt2,opt3,0 ;end option group opt1 option_box opt_gr1, 5, 90,6,12,0xd0d0ff, 0xff, 0x80ff,txt_f_opt_next,txt_f_opt_next.end-txt_f_opt_next opt2 option_box opt_gr1, 5,108,6,12,0xd0d0ff, 0xff, 0x80ff,txt_f_opt_perv,txt_f_opt_perv.end-txt_f_opt_perv opt3 option_box opt_gr1, 5,126,6,12,0xd0d0ff, 0xff, 0x80ff,txt_f_opt_beg,txt_f_opt_beg.end-txt_f_opt_beg check_boxes: ch1 check_box2 (5 shl 16+12),(144 shl 16 +12),5,0xffffff,0,0x80ff,ch_text.1,ch_flag_en+ch_flag_middle check_boxes_end: if lang eq ru_RU msgbox_1: db '"',13,10,' : ' .z: rb 10 msgbox_2: db 3,0 db '',0 db '࠭ 䠩?',0 db '࠭',0 db ' ࠭',0 db '⬥',0 db 0 msgbox_3: db 1,0 db '',0 db '訡 ⨨ 䠩 梥⮢묨 ன!',13,\ '⮬ 뤥 ᫮ 梥⮬ .',13,\ ' ( 訡 =' .err: db '?' db ')',0 db '',0 db 0 msgbox_4: db 1,0 db '',0 db '訡 ⨨ 䠩!',13,\ ' 䠩 ࠢ쭮.',13,\ ' ( 訡 =' .err: db '?' db ')',0 db '',0 db 0 msgbox_6: db 1,0 db '',0 db '訡 ࠭ 䠩!',13,\ ' 䠩 ࠢ쭮.',13,\ ' ( 訡 =' .err: db '?' db ')',0 db '',0 db 0 msgbox_7: db '" ',13,10 db '஡ ." -tI',0 msgbox_9: db 3,0 db '',0 db ' ',39,' 䠩',39,'.',13 .fdp: rb 100 db 0 db '',0 db 0 txtFindCapt db ':',0 txtFindNext db ' ',0 txtRerlaceCapt db ' :',0 txtRerlace db '',0 txtRerlaceAll db ' ',0 txtFormatCapt db 'ଠ',0 txtFormatApply db 'ਬ',0 txtReplace db '',0 txtReplaceAll db ' ',0 txtGotoCapt db '室 ப:',0 txtGoto db '३',0 txt_f_opt_next: db '' .end: db 0 txt_f_opt_perv: db '' .end: db 0 txt_f_opt_beg: db ' 砫' .end: db 0 ch_text: .1 db '뢠 ॣ',0 else msgbox_1: db '"Replace',13,10,'Made replacements: ' .z: rb 10 msgbox_2: db 3,0 db 'Warning',0 db 'Save changes to the file?',0 db 'Save',0 db 'Discard',0 db 'Cancel',0 db 0 msgbox_3: db 1,0 db 'Warning',0 db 'Error opening the file with the color settings!',13,\ 'Because color selection of words is not possible.',13,\ ' (error code =' .err: db '?' db ')',0 db 'Close',0 db 0 msgbox_4: db 1,0 db 'Warning',0 db 'Error opening file!',13,\ 'Maybe the file name is not entered correctly.',13,\ ' (error code =' .err: db '?' db ')',0 db 'Close',0 db 0 msgbox_6: db 1,0 db 'Warning',0 db 'Error saving file!',13,\ 'Maybe the file name is not entered correctly.',13,\ ' (error code =' .err: db '?' db ')',0 db 'Close',0 db 0 msgbox_7: db '"Text not found.',13,10 db 'Try change the query and search again." -tI',0 msgbox_9: db 3,0 db 'Warning',0 db 'Error run ',39,'open file dialog',39,'.',13 .fdp: rb 100 db 0 db 'Close',0 db 0 txtFindCapt db 'Search:',0 txtFindNext db 'Find next',0 txtRerlaceCapt db 'Replace with:',0 txtRerlace db 'Replace',0 txtRerlaceAll db 'Replace all',0 txtFormatCapt db 'Format',0 txtFormatApply db 'Apply',0 txtReplace db 'Replace',0 txtReplaceAll db 'Replace all',0 txtGotoCapt db 'Go to line:',0 txtGoto db 'Go to',0 txt_f_opt_next: db 'Down' .end: db 0 txt_f_opt_perv: db 'Up' .end: db 0 txt_f_opt_beg: db 'At first' .end: db 0 ch_text: .1 db 'Case sensitive',0 end if ;㭪樨 ᮮ饭 msgbox_2N_funct: dd On_SaveAndNewFile dd On_NewFile dd 0 msgbox_2O_funct: dd On_SaveAndOpenFile dd ted_but_open_file.no_msg dd 0 msgbox_2E_funct: dd On_SaveAndExit dd On_Exit dd 0 KM_SHIFT equ 0x00010000 KM_CTRL equ 0x00020000 KM_ALT equ 0x00040000 KM_NUMLOCK equ 0x00080000 ; KEY CODES KEY_F1 equ 0x0000003B KEY_F2 equ 0x0000003C KEY_F3 equ 0x0000003D diff --git a/programs/other/t_edit/t_menu.inc b/programs/other/t_edit/t_menu.inc index 2b23d4b30..346a19abe 100644 --- a/programs/other/t_edit/t_menu.inc +++ b/programs/other/t_edit/t_menu.inc @@ -1,5 +1,5 @@ -if lang eq ru +if lang eq ru_RU sz_main_menu_File db '', 0 sz_main_menu_File_New db '', 0 @@ -150,4 +150,4 @@ tedit_menu_init: stdcall [ksubmenu_add], [main_menu_encoding], eax stdcall [kmenuitem_new], KMENUITEM_SUBMENU, sz_main_menu_Encoding, [main_menu_encoding] stdcall [ksubmenu_add], [main_menu], eax - ret \ No newline at end of file + ret diff --git a/programs/other/t_edit/wnd_k_words.inc b/programs/other/t_edit/wnd_k_words.inc index 9041ac606..1426eda97 100644 --- a/programs/other/t_edit/wnd_k_words.inc +++ b/programs/other/t_edit/wnd_k_words.inc @@ -10,7 +10,7 @@ IMAGE_TOOLBAR_ICON_SIZE equ 20*20*3 wnd_k_words_run dd 0 ;६ ᫥ ⥬ - ᪠ 1- ६ -if lang eq ru +if lang eq ru_RU txt_caption db ' 祢 ᫮',0 else txt_caption db 'Search in keywords',0 @@ -206,4 +206,4 @@ editboxes_end: string1 rb MAX_COLOR_WORD_LEN align 4 -w_scr_t3 scrollbar 16,0, 3,0, 15, 100, 0,0, 0xeeeeee, 0xbbddff, 0, 1 \ No newline at end of file +w_scr_t3 scrollbar 16,0, 3,0, 15, 100, 0,0, 0xeeeeee, 0xbbddff, 0, 1 diff --git a/programs/system/MyKey/trunk/MyKey.asm b/programs/system/MyKey/trunk/MyKey.asm index e415f6fc1..baee823c8 100644 --- a/programs/system/MyKey/trunk/MyKey.asm +++ b/programs/system/MyKey/trunk/MyKey.asm @@ -901,7 +901,7 @@ RunProgram: clc ret .err_out: - if lang eq it + if lang eq it_IT print "Impossibile caricare il programma" ;-------------------------------------- else @@ -923,7 +923,7 @@ mykey_window dd 0 ; Slot number of MyKey ;########### Input Thread data start ############ ; Input Thread Title -if lang eq it +if lang eq it_IT it_labelt db "Inserisci hotkey e nome " ;-------------------------------------- else @@ -937,7 +937,7 @@ it_window dd 0 ; Slot number of the input thread it_alive db 0 ; Flag of the input thread existance it_keycode db 0 it_hotkey_addr dd 0 -if lang eq it +if lang eq it_IT it_hint db 'o premi Esc per cancellare',0 ;-------------------------------------- else @@ -947,7 +947,7 @@ end if ;########### Input Thread data end ############ ;Button names -if lang eq it +if lang eq it_IT AddKeyText db 'Aggiungi',0 ReloadKeyText db 'Ricarica',0 SaveKeyText db 'Salva',0 @@ -979,7 +979,7 @@ sys_path: system_dir0 db '/sys/lib/' boxlib_name db 'box_lib.obj',0 -if lang eq it +if lang eq it_IT err_message_found_lib db "Non trovo box_lib.obj",0 head_f_i: head_f_l db 'Errore di sistema',0 diff --git a/programs/system/MyKey/trunk/Tupfile.lua b/programs/system/MyKey/trunk/Tupfile.lua index c14afc9d8..3b1a5cc5c 100644 --- a/programs/system/MyKey/trunk/Tupfile.lua +++ b/programs/system/MyKey/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({"MyKey.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "MyKey") diff --git a/programs/system/MyKey/trunk/makefile b/programs/system/MyKey/trunk/makefile index af7af1157..4b12a3a2b 100644 --- a/programs/system/MyKey/trunk/makefile +++ b/programs/system/MyKey/trunk/makefile @@ -9,10 +9,10 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/RunOD/1/make_sp.bat b/programs/system/RunOD/1/make_es.bat similarity index 100% rename from programs/system/RunOD/1/make_sp.bat rename to programs/system/RunOD/1/make_es.bat diff --git a/programs/system/RunOD/RunOD.asm b/programs/system/RunOD/RunOD.asm index 30ac02947..14f90fcbb 100644 --- a/programs/system/RunOD/RunOD.asm +++ b/programs/system/RunOD/RunOD.asm @@ -1 +1 @@ - ; Run with OpenDialog ; org 0 use32 STACK_SIZE equ 256 REDRAW_EVENT equ 1 KEY_EVENT equ 2 BUTTON_EVENT equ 3 MOUSE_EVENT equ 6 BUTTON_RUN equ 10 BUTTON_BROWSE equ 20 MENUET01 db 'MENUET01' version dd 1 program.start dd start_ program.end dd data_ program.memory dd end_ + STACK_SIZE program.stack dd end_ + STACK_SIZE program.params dd 0 program.path dd 0 include 'lang.inc' include '../../develop/libraries/box_lib/trunk/box_lib.mac' ; ======================================================================= ; start_: mov byte [file_info], 7 ; set.event mov eax, 40 mov ebx, 39 int 64 push sz_box_lib call load.library mov [box_lib], eax push dword[box_lib] push sz_edit_box call getprocaddress mov [edit_box_draw], eax push dword[box_lib] push sz_edit_box_key call getprocaddress mov [edit_box_key], eax push dword[box_lib] push sz_edit_box_mouse call getprocaddress mov [edit_box_mouse], eax push dword[box_lib] push sz_edit_box_set_text call getprocaddress mov [edit_box_set_text], eax push sz_proc_lib call load.library mov [proc_lib], eax push dword[proc_lib] push sz_OpenDialog_init call getprocaddress mov [opendialog_init], eax push dword[proc_lib] push sz_OpenDialog_start call getprocaddress mov [opendialog_start], eax ; memory.allocate: mov eax, 68 mov ebx, 12 mov ecx, 4096 + 4096 + 4096 int 64 mov [od.procinfo], eax add eax, 1024 mov [od.filename_area], eax add eax, 4096 - 1024 mov [od.opendir_path], eax add eax, 4096 mov [od.openfile_path], eax push od call [opendialog_init] ; get.screen.size mov eax, 61 mov ebx, 1 int 64 mov [screen], eax movzx eax, word[screen.width] shr eax, 3 lea eax, [eax*2 + eax] add eax, 90 mov [window.width], eax ; skin.height mov eax, 48 mov ebx, 4 int 64 add eax, 100 mov [window.height], eax movzx eax, word[screen.width] sub eax, [window.width] shr eax, 1 mov [window.left], eax movzx eax, word[screen.height] sub eax, [window.height] sub eax, 100 mov [window.top], eax mov eax, [window.width] sub eax, 80 mov [edit1.width], eax mov eax, [od.openfile_path] mov [edit1.text], eax call on_redraw ; ----------------------- ; .loop: ; wait.event mov eax, 10 int 64 cmp eax, REDRAW_EVENT jne .check_key call on_redraw jmp .loop ; ----------------------- ; .check_key: cmp eax, KEY_EVENT jne .check_button mov eax, 2 int 64 cmp ah, 13 jne .no_key_enter call on_button_run jmp .loop ; ----------------------- ; .no_key_enter: cmp ah, 185 jne .no_key_insert call on_button_browse jmp .loop .no_key_insert: push edit1 call [edit_box_key] jmp .loop ; ----------------------- ; .check_button: cmp eax, BUTTON_EVENT jne .check_mouse ; get.button.number mov eax, 17 int 64 cmp ah, 1 jne .check_button_run ; program.terminate or eax, -1 int 64 ; ----------------------- ; .check_button_run: cmp ah, BUTTON_RUN jne .check_button_browse call on_button_run jmp .loop ; ----------------------- ; .check_button_browse: cmp ah, BUTTON_BROWSE jne .loop call on_button_browse jmp .loop ; ----------------------- ; .check_mouse: cmp eax, MOUSE_EVENT jne .loop push edit1 call [edit_box_mouse] jmp .loop ; ======================================================================= ; on_button_run: push dword[edit1.text] call extractrunpathandparams ;file.run: mov eax, 70 mov ebx, file_info int 64 mov dl, byte[lastendpath] mov ecx, [ptrlastendpath] mov [ecx], dl test eax, eax jnge .error mov [runresult], dword sz_Program_run_successfully jmp .exit .error: ; ----------------------- ; .5: cmp al, -5 jne .31 mov [runresult], dword sz_File_not_found jmp .exit ; ----------------------- ; .31: cmp al, -31 jne .32 mov [runresult], dword sz_File_is_not_executable jmp .exit ; ----------------------- ; .32: cmp al, -32 jne .10 mov [runresult], dword sz_Too_many_processes jmp .exit ; ----------------------- ; .10: cmp al, -10 jne .30 mov [runresult], dword sz_Access_denied jmp .exit ; ----------------------- ; .30: cmp al, -30 jne .unknown mov [runresult], dword sz_Out_of_memory jmp .exit ; ----------------------- ; .unknown: mov [runresult], dword sz_Unknown_error ; ----------------------- ; .exit: call on_redraw ret ; ======================================================================= ; on_button_browse: push od call [opendialog_start] mov eax, [od.status] test eax, eax je .exit ;======== if space exist in filepath, then quote filepath mov eax, [od.openfile_path] ; ----------------------- ; .check_space: cmp [eax], byte 0 je .no_space cmp [eax], byte 32 ;space je .space inc eax jmp .check_space .space: ; ----------------------- ; .find_end_zero: inc eax cmp [eax], byte 0 jne .find_end_zero mov [eax + 2], byte 0 mov [eax + 1], byte 34 ; quote ; ----------------------- ; .shift_path: dec eax mov dl, byte [eax ] mov [eax + 1], dl cmp eax, [od.openfile_path] jne .shift_path mov [eax ], byte 34 ; quote .no_space: ;================================= push dword[od.openfile_path] push edit1 call [edit_box_set_text] ; ----------------------- ; .exit: ret ; ======================================================================= ; on_redraw: ; redraw.start mov eax, 12 mov ebx, 1 int 64 ; get.standart.colors mov eax, 48 mov ebx, 3 mov ecx, sc mov edx, 40 int 64 mov eax, [sc.work_graph] mov [edit1.shift_color], eax mov eax, [sc.work_graph] mov [edit1.focus_border_color], eax mov eax, [sc.frames] mov [edit1.blur_border_color], eax mov eax, [sc.work_text] bts eax, 28 mov [edit1.text_color], eax ; draw.window xor eax, eax mov ebx, [window.left] shl ebx, 16 add ebx, [window.width] mov ecx, [window.top] shl ecx, 16 add ecx, [window.height] mov edx, [sc.work] or edx, 34000000h mov edi, title int 64 push 5 push 5 push sz_Type_name_of_program push dword [sc.work_text] call draw.text ; ====================| browse button |==================== push 20 mov eax, [window.width] sub eax, 70 push eax push 26 push 52 push 21 call draw.button mov eax, [window.width] sub eax, 56 push eax push 29 push sz_browse push dword [sc.work_button_text] call draw.text ; ====================| run button |==================== push 10 push 5 push 52 mov eax, [window.width] sub eax, 22 push eax push 21 call draw.button mov eax, [window.width] shr eax, 1 sub eax, 40 push eax push 55 push sz_run push dword [sc.work_button_text] call draw.text ; ===================================================== push 5 push 80 push dword[runresult] push dword [sc.work_text] call draw.text push edit1 call [edit_box_draw] ; redraw.finish mov eax, 12 mov ebx, 2 int 64 ret ; ======================================================================= ; extractrunpathandparams: xor ecx, ecx mov eax, [esp + 4] mov [runpath], eax movzx eax, byte [eax] cmp eax, 34 jne .start_without_quote inc ecx ; ----------------------- ; .loop1: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp eax, 34 jne .not_quote mov eax, [runpath] mov [eax + ecx], byte 0 mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 34 inc ecx ; ----------------------- ; .skip_space1: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp al, 32 jne .skipped1 inc ecx jmp .skip_space1 ; ----------------------- ; .skipped1: mov eax, [runpath] add eax, ecx mov [runparams], eax inc dword [runpath] jmp .exit ; ----------------------- ; .not_quote: mov eax, [runpath] movzx eax, byte [eax + ecx] test eax, eax jne .not_zero1 mov eax, [runpath] add eax, ecx mov [runparams], eax mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 0 jmp .exit ; ----------------------- ; .not_zero1: inc ecx jmp .loop1 ; ----------------------- ; .start_without_quote: ; ----------------------- ; .loop2: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp eax, 32 jne .not_space mov eax, [runpath] mov [eax + ecx], byte 0 mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 32 inc ecx ; ----------------------- ; .skip_space2: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp al, 32 jne .skipped2 inc ecx jmp .skip_space2 ; ----------------------- ; .skipped2: mov eax, [runpath] add eax, ecx mov [runparams], eax jmp .exit ; ----------------------- ; .not_space: mov eax, [runpath] movzx eax, byte [eax + ecx] test eax, eax jne .not_zero2 mov eax, [runpath] add eax, ecx mov [runparams], eax mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 0 jmp .exit ; ----------------------- ; .not_zero2: inc ecx jmp .loop2 ; ----------------------- ; .exit: ret 4 ; ======================================================================= ; draw.button: mov eax, 8 mov ebx, [esp + 16] shl ebx, 16 add ebx, [esp + 8] mov ecx, [esp + 12] shl ecx, 16 add ecx, [esp + 4] mov edx, [esp + 20] mov esi, [sc.work_button] int 64 ret 20 ; ======================================================================= ; draw.text: mov eax, 4 mov ebx, [esp + 16] shl ebx, 16 add ebx, [esp + 12] mov ecx, [esp + 4] or ecx, 90000000h mov edx, [esp + 8] int 64 ret 16 ; ======================================================================= ; load.library: mov eax, 68 mov ebx, 19 mov ecx, [esp + 4] int 64 ret 4 ; ======================================================================= ; getprocaddress: mov edx, [esp + 8] ; hlib xor eax, eax test edx, edx ; If hlib = 0 then goto .end jz .end ; ----------------------- ; .next: cmp [edx], dword 0 ; If end of export table then goto .end jz .end xor eax, eax mov esi, [edx] mov edi, [esp + 4] ; name ; ----------------------- ; .next_: lodsb scasb jne .fail or al, al jnz .next_ jmp .ok ; ----------------------- ; .fail: add edx, 8 jmp .next ; ----------------------- ; .ok: ; return address mov eax, [edx + 4] ; ----------------------- ; .end: ret 8 data_: sz_box_lib db "/sys/lib/box_lib.obj",0 sz_edit_box db "edit_box",0 sz_edit_box_key db "edit_box_key",0 sz_edit_box_mouse db "edit_box_mouse",0 sz_edit_box_set_text db "edit_box_set_text",0 sz_proc_lib db "/sys/lib/proc_lib.obj",0 sz_OpenDialog_init db "OpenDialog_init",0 sz_OpenDialog_start db "OpenDialog_start",0 sz_FFFFFFFF_open_dialog db "FFFFFFFF_open_dialog",0 sz_SYS db "/sys",0 sz_opendial_path db "/sys/File managers/opendial",0 if lang eq it sz_Program_run_successfully db "Programma eseguito correttamente",0 sz_File_not_found db "File non trovato",0 sz_File_is_not_executable db "File non eseguibile",0 sz_Too_many_processes db "Troppi processi",0 sz_Access_denied db "Accesso negato",0 sz_Out_of_memory db "Out of memory",0 sz_Unknown_error db "Errore sconosciuto",0 sz_Type_name_of_program db "Digita il nome del programma per eseguirlo",0 sz_run db " Esegui",0 sz_browse db "Browse",0 title db "Esegui",0 else if lang eq ru sz_Program_run_successfully db "ணࠬ 饭 ᯥ譮",0 sz_File_not_found db " ",0 sz_File_is_not_executable db "  ᯮ塞",0 sz_Too_many_processes db "誮 ᮢ",0 sz_Access_denied db " 饭",0 sz_Out_of_memory db "筮 ",0 sz_Unknown_error db "⭠ 訡",0 sz_Type_name_of_program db " ணࠬ",0 sz_run db "",0 sz_browse db "...",0 title db " ணࠬ",0 else sz_Program_run_successfully db "Program run successfully",0 sz_File_not_found db "File not found",0 sz_File_is_not_executable db "File is not executable",0 sz_Too_many_processes db "Too many processes",0 sz_Access_denied db "Access denied",0 sz_Out_of_memory db "Out of memory",0 sz_Unknown_error db "Unknown error",0 sz_Type_name_of_program db "Type name of program to run",0 sz_run db " Run",0 sz_browse db "...",0 title db "Run",0 end if align 4 od: .mode dd 0 .procinfo dd 0 .com_area_name dd sz_FFFFFFFF_open_dialog .com_area dd 0 .opendir_path dd 0 .dir_default_path dd sz_SYS .start_path dd sz_opendial_path .draw_window dd on_redraw .status dd 0 .openfile_path dd 0 .filename_area dd 0 .filter_area dd filefilter .x_size dw 414 .x_start dw 0 .y_size dw 414 .y_start dw 0 runresult dd sz_empty edit1 edit_box 0, 5, 26, 0ffffffh, 0, 0, 0, 0, 4096, 0, 0, 4002h box_lib dd ? proc_lib dd ? filefilter dd ? ptrlastendpath dd ? edit_box_draw dd ? edit_box_key dd ? edit_box_mouse dd ? edit_box_set_text dd ? opendialog_init dd ? opendialog_start dd ? sc: .frames dd ? .grab dd ? .grab_button dd ? .grab_button_text dd ? .grab_text dd ? .work dd ? .work_button dd ? .work_button_text dd ? .work_text dd ? .work_graph dd ? window: .left dd ? .top dd ? .width dd ? .height dd ? screen: .height dw ? .width dw ? file_info: dd ? dd ? runparams: dd ? dd ? dd ? db ? runpath: dd ? lastendpath db ? sz_empty db ? align 4 end_: \ No newline at end of file + ; Run with OpenDialog ; org 0 use32 STACK_SIZE equ 256 REDRAW_EVENT equ 1 KEY_EVENT equ 2 BUTTON_EVENT equ 3 MOUSE_EVENT equ 6 BUTTON_RUN equ 10 BUTTON_BROWSE equ 20 MENUET01 db 'MENUET01' version dd 1 program.start dd start_ program.end dd data_ program.memory dd end_ + STACK_SIZE program.stack dd end_ + STACK_SIZE program.params dd 0 program.path dd 0 include 'lang.inc' include '../../develop/libraries/box_lib/trunk/box_lib.mac' ; ======================================================================= ; start_: mov byte [file_info], 7 ; set.event mov eax, 40 mov ebx, 39 int 64 push sz_box_lib call load.library mov [box_lib], eax push dword[box_lib] push sz_edit_box call getprocaddress mov [edit_box_draw], eax push dword[box_lib] push sz_edit_box_key call getprocaddress mov [edit_box_key], eax push dword[box_lib] push sz_edit_box_mouse call getprocaddress mov [edit_box_mouse], eax push dword[box_lib] push sz_edit_box_set_text call getprocaddress mov [edit_box_set_text], eax push sz_proc_lib call load.library mov [proc_lib], eax push dword[proc_lib] push sz_OpenDialog_init call getprocaddress mov [opendialog_init], eax push dword[proc_lib] push sz_OpenDialog_start call getprocaddress mov [opendialog_start], eax ; memory.allocate: mov eax, 68 mov ebx, 12 mov ecx, 4096 + 4096 + 4096 int 64 mov [od.procinfo], eax add eax, 1024 mov [od.filename_area], eax add eax, 4096 - 1024 mov [od.opendir_path], eax add eax, 4096 mov [od.openfile_path], eax push od call [opendialog_init] ; get.screen.size mov eax, 61 mov ebx, 1 int 64 mov [screen], eax movzx eax, word[screen.width] shr eax, 3 lea eax, [eax*2 + eax] add eax, 90 mov [window.width], eax ; skin.height mov eax, 48 mov ebx, 4 int 64 add eax, 100 mov [window.height], eax movzx eax, word[screen.width] sub eax, [window.width] shr eax, 1 mov [window.left], eax movzx eax, word[screen.height] sub eax, [window.height] sub eax, 100 mov [window.top], eax mov eax, [window.width] sub eax, 80 mov [edit1.width], eax mov eax, [od.openfile_path] mov [edit1.text], eax call on_redraw ; ----------------------- ; .loop: ; wait.event mov eax, 10 int 64 cmp eax, REDRAW_EVENT jne .check_key call on_redraw jmp .loop ; ----------------------- ; .check_key: cmp eax, KEY_EVENT jne .check_button mov eax, 2 int 64 cmp ah, 13 jne .no_key_enter call on_button_run jmp .loop ; ----------------------- ; .no_key_enter: cmp ah, 185 jne .no_key_insert call on_button_browse jmp .loop .no_key_insert: push edit1 call [edit_box_key] jmp .loop ; ----------------------- ; .check_button: cmp eax, BUTTON_EVENT jne .check_mouse ; get.button.number mov eax, 17 int 64 cmp ah, 1 jne .check_button_run ; program.terminate or eax, -1 int 64 ; ----------------------- ; .check_button_run: cmp ah, BUTTON_RUN jne .check_button_browse call on_button_run jmp .loop ; ----------------------- ; .check_button_browse: cmp ah, BUTTON_BROWSE jne .loop call on_button_browse jmp .loop ; ----------------------- ; .check_mouse: cmp eax, MOUSE_EVENT jne .loop push edit1 call [edit_box_mouse] jmp .loop ; ======================================================================= ; on_button_run: push dword[edit1.text] call extractrunpathandparams ;file.run: mov eax, 70 mov ebx, file_info int 64 mov dl, byte[lastendpath] mov ecx, [ptrlastendpath] mov [ecx], dl test eax, eax jnge .error mov [runresult], dword sz_Program_run_successfully jmp .exit .error: ; ----------------------- ; .5: cmp al, -5 jne .31 mov [runresult], dword sz_File_not_found jmp .exit ; ----------------------- ; .31: cmp al, -31 jne .32 mov [runresult], dword sz_File_is_not_executable jmp .exit ; ----------------------- ; .32: cmp al, -32 jne .10 mov [runresult], dword sz_Too_many_processes jmp .exit ; ----------------------- ; .10: cmp al, -10 jne .30 mov [runresult], dword sz_Access_denied jmp .exit ; ----------------------- ; .30: cmp al, -30 jne .unknown mov [runresult], dword sz_Out_of_memory jmp .exit ; ----------------------- ; .unknown: mov [runresult], dword sz_Unknown_error ; ----------------------- ; .exit: call on_redraw ret ; ======================================================================= ; on_button_browse: push od call [opendialog_start] mov eax, [od.status] test eax, eax je .exit ;======== if space exist in filepath, then quote filepath mov eax, [od.openfile_path] ; ----------------------- ; .check_space: cmp [eax], byte 0 je .no_space cmp [eax], byte 32 ;space je .space inc eax jmp .check_space .space: ; ----------------------- ; .find_end_zero: inc eax cmp [eax], byte 0 jne .find_end_zero mov [eax + 2], byte 0 mov [eax + 1], byte 34 ; quote ; ----------------------- ; .shift_path: dec eax mov dl, byte [eax ] mov [eax + 1], dl cmp eax, [od.openfile_path] jne .shift_path mov [eax ], byte 34 ; quote .no_space: ;================================= push dword[od.openfile_path] push edit1 call [edit_box_set_text] ; ----------------------- ; .exit: ret ; ======================================================================= ; on_redraw: ; redraw.start mov eax, 12 mov ebx, 1 int 64 ; get.standart.colors mov eax, 48 mov ebx, 3 mov ecx, sc mov edx, 40 int 64 mov eax, [sc.work_graph] mov [edit1.shift_color], eax mov eax, [sc.work_graph] mov [edit1.focus_border_color], eax mov eax, [sc.frames] mov [edit1.blur_border_color], eax mov eax, [sc.work_text] bts eax, 28 mov [edit1.text_color], eax ; draw.window xor eax, eax mov ebx, [window.left] shl ebx, 16 add ebx, [window.width] mov ecx, [window.top] shl ecx, 16 add ecx, [window.height] mov edx, [sc.work] or edx, 34000000h mov edi, title int 64 push 5 push 5 push sz_Type_name_of_program push dword [sc.work_text] call draw.text ; ====================| browse button |==================== push 20 mov eax, [window.width] sub eax, 70 push eax push 26 push 52 push 21 call draw.button mov eax, [window.width] sub eax, 56 push eax push 29 push sz_browse push dword [sc.work_button_text] call draw.text ; ====================| run button |==================== push 10 push 5 push 52 mov eax, [window.width] sub eax, 22 push eax push 21 call draw.button mov eax, [window.width] shr eax, 1 sub eax, 40 push eax push 55 push sz_run push dword [sc.work_button_text] call draw.text ; ===================================================== push 5 push 80 push dword[runresult] push dword [sc.work_text] call draw.text push edit1 call [edit_box_draw] ; redraw.finish mov eax, 12 mov ebx, 2 int 64 ret ; ======================================================================= ; extractrunpathandparams: xor ecx, ecx mov eax, [esp + 4] mov [runpath], eax movzx eax, byte [eax] cmp eax, 34 jne .start_without_quote inc ecx ; ----------------------- ; .loop1: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp eax, 34 jne .not_quote mov eax, [runpath] mov [eax + ecx], byte 0 mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 34 inc ecx ; ----------------------- ; .skip_space1: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp al, 32 jne .skipped1 inc ecx jmp .skip_space1 ; ----------------------- ; .skipped1: mov eax, [runpath] add eax, ecx mov [runparams], eax inc dword [runpath] jmp .exit ; ----------------------- ; .not_quote: mov eax, [runpath] movzx eax, byte [eax + ecx] test eax, eax jne .not_zero1 mov eax, [runpath] add eax, ecx mov [runparams], eax mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 0 jmp .exit ; ----------------------- ; .not_zero1: inc ecx jmp .loop1 ; ----------------------- ; .start_without_quote: ; ----------------------- ; .loop2: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp eax, 32 jne .not_space mov eax, [runpath] mov [eax + ecx], byte 0 mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 32 inc ecx ; ----------------------- ; .skip_space2: mov eax, [runpath] movzx eax, byte [eax + ecx] cmp al, 32 jne .skipped2 inc ecx jmp .skip_space2 ; ----------------------- ; .skipped2: mov eax, [runpath] add eax, ecx mov [runparams], eax jmp .exit ; ----------------------- ; .not_space: mov eax, [runpath] movzx eax, byte [eax + ecx] test eax, eax jne .not_zero2 mov eax, [runpath] add eax, ecx mov [runparams], eax mov eax, [runpath] add eax, ecx mov [ptrlastendpath], eax mov [lastendpath], byte 0 jmp .exit ; ----------------------- ; .not_zero2: inc ecx jmp .loop2 ; ----------------------- ; .exit: ret 4 ; ======================================================================= ; draw.button: mov eax, 8 mov ebx, [esp + 16] shl ebx, 16 add ebx, [esp + 8] mov ecx, [esp + 12] shl ecx, 16 add ecx, [esp + 4] mov edx, [esp + 20] mov esi, [sc.work_button] int 64 ret 20 ; ======================================================================= ; draw.text: mov eax, 4 mov ebx, [esp + 16] shl ebx, 16 add ebx, [esp + 12] mov ecx, [esp + 4] or ecx, 90000000h mov edx, [esp + 8] int 64 ret 16 ; ======================================================================= ; load.library: mov eax, 68 mov ebx, 19 mov ecx, [esp + 4] int 64 ret 4 ; ======================================================================= ; getprocaddress: mov edx, [esp + 8] ; hlib xor eax, eax test edx, edx ; If hlib = 0 then goto .end jz .end ; ----------------------- ; .next: cmp [edx], dword 0 ; If end of export table then goto .end jz .end xor eax, eax mov esi, [edx] mov edi, [esp + 4] ; name ; ----------------------- ; .next_: lodsb scasb jne .fail or al, al jnz .next_ jmp .ok ; ----------------------- ; .fail: add edx, 8 jmp .next ; ----------------------- ; .ok: ; return address mov eax, [edx + 4] ; ----------------------- ; .end: ret 8 data_: sz_box_lib db "/sys/lib/box_lib.obj",0 sz_edit_box db "edit_box",0 sz_edit_box_key db "edit_box_key",0 sz_edit_box_mouse db "edit_box_mouse",0 sz_edit_box_set_text db "edit_box_set_text",0 sz_proc_lib db "/sys/lib/proc_lib.obj",0 sz_OpenDialog_init db "OpenDialog_init",0 sz_OpenDialog_start db "OpenDialog_start",0 sz_FFFFFFFF_open_dialog db "FFFFFFFF_open_dialog",0 sz_SYS db "/sys",0 sz_opendial_path db "/sys/File managers/opendial",0 if lang eq it_IT sz_Program_run_successfully db "Programma eseguito correttamente",0 sz_File_not_found db "File non trovato",0 sz_File_is_not_executable db "File non eseguibile",0 sz_Too_many_processes db "Troppi processi",0 sz_Access_denied db "Accesso negato",0 sz_Out_of_memory db "Out of memory",0 sz_Unknown_error db "Errore sconosciuto",0 sz_Type_name_of_program db "Digita il nome del programma per eseguirlo",0 sz_run db " Esegui",0 sz_browse db "Browse",0 title db "Esegui",0 else if lang eq ru_RU sz_Program_run_successfully db "ணࠬ 饭 ᯥ譮",0 sz_File_not_found db " ",0 sz_File_is_not_executable db "  ᯮ塞",0 sz_Too_many_processes db "誮 ᮢ",0 sz_Access_denied db " 饭",0 sz_Out_of_memory db "筮 ",0 sz_Unknown_error db "⭠ 訡",0 sz_Type_name_of_program db " ணࠬ",0 sz_run db "",0 sz_browse db "...",0 title db " ணࠬ",0 else sz_Program_run_successfully db "Program run successfully",0 sz_File_not_found db "File not found",0 sz_File_is_not_executable db "File is not executable",0 sz_Too_many_processes db "Too many processes",0 sz_Access_denied db "Access denied",0 sz_Out_of_memory db "Out of memory",0 sz_Unknown_error db "Unknown error",0 sz_Type_name_of_program db "Type name of program to run",0 sz_run db " Run",0 sz_browse db "...",0 title db "Run",0 end if align 4 od: .mode dd 0 .procinfo dd 0 .com_area_name dd sz_FFFFFFFF_open_dialog .com_area dd 0 .opendir_path dd 0 .dir_default_path dd sz_SYS .start_path dd sz_opendial_path .draw_window dd on_redraw .status dd 0 .openfile_path dd 0 .filename_area dd 0 .filter_area dd filefilter .x_size dw 414 .x_start dw 0 .y_size dw 414 .y_start dw 0 runresult dd sz_empty edit1 edit_box 0, 5, 26, 0ffffffh, 0, 0, 0, 0, 4096, 0, 0, 4002h box_lib dd ? proc_lib dd ? filefilter dd ? ptrlastendpath dd ? edit_box_draw dd ? edit_box_key dd ? edit_box_mouse dd ? edit_box_set_text dd ? opendialog_init dd ? opendialog_start dd ? sc: .frames dd ? .grab dd ? .grab_button dd ? .grab_button_text dd ? .grab_text dd ? .work dd ? .work_button dd ? .work_button_text dd ? .work_text dd ? .work_graph dd ? window: .left dd ? .top dd ? .width dd ? .height dd ? screen: .height dw ? .width dw ? file_info: dd ? dd ? runparams: dd ? dd ? dd ? db ? runpath: dd ? lastendpath db ? sz_empty db ? align 4 end_: diff --git a/programs/system/RunOD/Tupfile.lua b/programs/system/RunOD/Tupfile.lua index 3690e1c00..bf7a65d5c 100644 --- a/programs/system/RunOD/Tupfile.lua +++ b/programs/system/RunOD/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({"RunOD.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "RunOD") diff --git a/programs/system/RunOD/build_en.bat b/programs/system/RunOD/build_en.bat index 47edf6bd8..3578e3e8a 100644 --- a/programs/system/RunOD/build_en.bat +++ b/programs/system/RunOD/build_en.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm runOD.asm run @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/RunOD/build_ru.bat b/programs/system/RunOD/build_ru.bat index 9e41f0a88..20ed21fa2 100644 --- a/programs/system/RunOD/build_ru.bat +++ b/programs/system/RunOD/build_ru.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm runOD.asm run @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/RunOD/makefile b/programs/system/RunOD/makefile index d6a448a37..e14899f17 100644 --- a/programs/system/RunOD/makefile +++ b/programs/system/RunOD/makefile @@ -1 +1 @@ -#!gmake # Macro FASM=/opt/bin/fasm KPACK=/opt/bin/kpack LANG=lang.inc FILE=RunOD SOURCE=${FILE}.asm OUT=${FILE}.bin en: echo "lang fix en" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: echo "lang fix ru" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: echo "lang fix it" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: rm -f ${LANG} ${OUT} \ No newline at end of file +#!gmake # Macro FASM=/opt/bin/fasm KPACK=/opt/bin/kpack LANG=lang.inc FILE=RunOD SOURCE=${FILE}.asm OUT=${FILE}.bin en: echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: rm -f ${LANG} ${OUT} diff --git a/programs/system/beep/build.sh b/programs/system/beep/build.sh index 58e9cb95b..646532b27 100644 --- a/programs/system/beep/build.sh +++ b/programs/system/beep/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc mkdir bin fasm -m 65536 beep.asm ./bin/beep rm -f lang.inc diff --git a/programs/system/board/trunk/Tupfile.lua b/programs/system/board/trunk/Tupfile.lua index 3180448c1..9c91277c8 100644 --- a/programs/system/board/trunk/Tupfile.lua +++ b/programs/system/board/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({"board.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "board") diff --git a/programs/system/board/trunk/board.asm b/programs/system/board/trunk/board.asm index 2c3cbe162..b7c8a9e50 100644 --- a/programs/system/board/trunk/board.asm +++ b/programs/system/board/trunk/board.asm @@ -418,11 +418,11 @@ CheckUnique: ;------------------------------------------------------------------------------ ; DATA -if lang eq ru +if lang eq ru_RU title db '᪠ ⫠ ᮮ饭',0 -else if lang eq it +else if lang eq it_IT title db 'Notifiche e informazioni generiche per il debug',0 -else if lang eq ge +else if lang eq de_DE title db 'Allgemeines debug- & nachrichtenboard',0 else title db 'General debug & message board',0 diff --git a/programs/system/board/trunk/build_ge.bat b/programs/system/board/trunk/build_de.bat similarity index 60% rename from programs/system/board/trunk/build_ge.bat rename to programs/system/board/trunk/build_de.bat index f5433a700..7375cc3c8 100644 --- a/programs/system/board/trunk/build_ge.bat +++ b/programs/system/board/trunk/build_de.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ge >lang.inc +@echo lang fix de_DE >lang.inc @fasm board.asm board @kpack board @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/board/trunk/build_en.bat b/programs/system/board/trunk/build_en.bat index 0af1a3253..1cd2f5d49 100644 --- a/programs/system/board/trunk/build_en.bat +++ b/programs/system/board/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm board.asm board @kpack board @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/board/trunk/build_ru.bat b/programs/system/board/trunk/build_ru.bat index 0b5add341..60ccaaca5 100644 --- a/programs/system/board/trunk/build_ru.bat +++ b/programs/system/board/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm board.asm board @kpack board @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/board/trunk/makefile b/programs/system/board/trunk/makefile index 61a8627b5..6845665e4 100644 --- a/programs/system/board/trunk/makefile +++ b/programs/system/board/trunk/makefile @@ -9,19 +9,19 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} -ge: - echo "lang fix ge" > ${LANG} +de: + echo "lang fix de_DE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} diff --git a/programs/system/calendar/trunk/Tupfile.lua b/programs/system/calendar/trunk/Tupfile.lua index aa578b75c..4e3fdcb90 100644 --- a/programs/system/calendar/trunk/Tupfile.lua +++ b/programs/system/calendar/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({"calendar.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "calendar") diff --git a/programs/system/calendar/trunk/build_ge.bat b/programs/system/calendar/trunk/build_de.bat similarity index 58% rename from programs/system/calendar/trunk/build_ge.bat rename to programs/system/calendar/trunk/build_de.bat index 9e4d2125b..fb9f129b2 100644 --- a/programs/system/calendar/trunk/build_ge.bat +++ b/programs/system/calendar/trunk/build_de.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix de >lang.inc +@echo lang fix de_DE >lang.inc @fasm calendar.asm calendar @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/calendar/trunk/build_en.bat b/programs/system/calendar/trunk/build_en.bat index e2c398808..dbe9e2446 100644 --- a/programs/system/calendar/trunk/build_en.bat +++ b/programs/system/calendar/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 calendar.asm calendar @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/calendar/trunk/build_et.bat b/programs/system/calendar/trunk/build_et.bat index 5195cac8e..6c81f7f5b 100644 --- a/programs/system/calendar/trunk/build_et.bat +++ b/programs/system/calendar/trunk/build_et.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm calendar.asm calendar @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/calendar/trunk/build_ru.bat b/programs/system/calendar/trunk/build_ru.bat index dfd04721d..a83fac684 100644 --- a/programs/system/calendar/trunk/build_ru.bat +++ b/programs/system/calendar/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 calendar.asm calendar @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/calendar/trunk/data.inc b/programs/system/calendar/trunk/data.inc index 774d4f412..ddae8fbaf 100644 --- a/programs/system/calendar/trunk/data.inc +++ b/programs/system/calendar/trunk/data.inc @@ -89,7 +89,7 @@ day_count db 3,0,3,2,3,2,3,3,2,3,2,3 Fkeys db 210,211,212,213,214,215,216,217,208,209,228,159 month_name: -if lang eq ru +if lang eq ru_RU db 8 db ' ' db 'ࠫ ' @@ -103,7 +103,7 @@ if lang eq ru db ' ' db ' ' db ' ' -else if lang eq de +else if lang eq de_DE db 9 db 'Januar ' db 'Februar ' @@ -117,7 +117,7 @@ else if lang eq de db 'Oktober ' db 'November ' db 'Dezember ' -else if lang eq fr +else if lang eq fr_FR db 9 db 'Janvier ' db 'Fevrier ' @@ -131,7 +131,7 @@ else if lang eq fr db 'Octobre ' db 'Novembre ' db 'Decembre ' -else if lang eq fi +else if lang eq fi_FI db 9 db 'Tammikuu ' db 'Helmikuu ' @@ -145,7 +145,7 @@ else if lang eq fi db 'Lokakuu ' db 'Marraskuu' db 'Joulukuu ' -else if lang eq et +else if lang eq et_EE db 9 db 'Jaanuar ' db 'Veebruar ' @@ -159,7 +159,7 @@ else if lang eq et db 'Oktoober ' db 'November ' db 'Detsember' -else if lang eq it +else if lang eq it_IT db 9 db 'Gennaio ' db 'Febbraio ' @@ -189,7 +189,7 @@ else db 'December ' end if week_days: -if lang eq ru +if lang eq ru_RU db 2 db 1 db '' @@ -199,7 +199,7 @@ if lang eq ru db '' db '' db '' -else if lang eq de +else if lang eq de_DE db 2 db 7 db 'So' @@ -209,7 +209,7 @@ else if lang eq de db 'Do' db 'Fr' db 'Sa' -else if lang eq fr +else if lang eq fr_FR db 3 db 7 db 'Dim' @@ -219,7 +219,7 @@ else if lang eq fr db 'Jeu' db 'Ven' db 'Sam' -else if lang eq fi +else if lang eq fi_FI db 2 db 7 db 'Su' @@ -229,7 +229,7 @@ else if lang eq fi db 'To' db 'Pe' db 'La' -else if lang eq et +else if lang eq et_EE db 3 db 7 db 'Esm' @@ -239,7 +239,7 @@ else if lang eq et db 'Ree' db 'Lau' db 'Ph' -else if lang eq it +else if lang eq it_IT db 3 db 7 db 'Dom' @@ -262,30 +262,30 @@ else end if title: -if lang eq ru +if lang eq ru_RU db '',0 -else if lang eq ge +else if lang eq de_DE db 'Kalender',0 -else if lang eq fr +else if lang eq fr_FR db 'Calendrier',0 -else if lang eq et +else if lang eq et_EE db 'Kalender',0 -else if lang eq it +else if lang eq it_IT db 'Calendario',0 else db 'Calendar',0 end if today_msg: -if lang eq ru +if lang eq ru_RU db '' -else if lang eq ge +else if lang eq de_DE db 'Heute' -else if lang eq fr +else if lang eq fr_FR db "Aujourd'hui" -else if lang eq et +else if lang eq et_EE db 'Tna' -else if lang eq it +else if lang eq it_IT db 'Oggi' else db 'Today' @@ -296,11 +296,11 @@ new_style dd 1 dropped db 0 sys_text: -if lang eq ru +if lang eq ru_RU db '६',0 -else if lang eq it +else if lang eq it_IT db ' Ora',0 -else if lang eq et +else if lang eq et_EE db ' Aeg ',0 else db ' Time',0 @@ -309,11 +309,11 @@ separator db ':',0 plus db '+',0 minus db '-',0 set_date_t: -if lang eq ru +if lang eq ru_RU db '⠭ ',0 -else if lang eq it +else if lang eq it_IT db ' Impostazioni ',0 -else if lang eq et +else if lang eq et_EE db ' Mra kuupev ',0 else db ' Set date ',0 diff --git a/programs/system/calendar/trunk/makefile b/programs/system/calendar/trunk/makefile index d2d8a08c3..a47890028 100644 --- a/programs/system/calendar/trunk/makefile +++ b/programs/system/calendar/trunk/makefile @@ -9,19 +9,19 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} et: - echo "lang fix et" > ${LANG} + echo "lang fix et_EE" > ${LANG} ${FASM} ${SOURCE} ${OUT} -ge: - echo "lang fix ge" > ${LANG} +de: + echo "lang fix de_DE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/cd_tray/CD_tray.ASM b/programs/system/cd_tray/CD_tray.ASM index bd929bf78..0e74fa9c0 100644 --- a/programs/system/cd_tray/CD_tray.ASM +++ b/programs/system/cd_tray/CD_tray.ASM @@ -87,7 +87,7 @@ draw_window: ; 1 - ; - if lang eq it + if lang eq it_IT mcall 0, <100,250>, <100,110>, 0x03AABBCC, 0x805080D0, 0x005080D0 else mcall 0, <100,230>, <100,110>, 0x03AABBCC, 0x805080D0, 0x005080D0 @@ -100,7 +100,7 @@ draw_window: mcall call draw_buttons - if lang eq it + if lang eq it_IT mcall 4, <16,25>, 0x80ffffff,text1 else mcall 4, <25,25>, 0x80ffffff,text1 @@ -121,21 +121,21 @@ draw_window: draw_buttons: pusha - if lang eq it + if lang eq it_IT add ebx,60 shl 16 else add ebx,50 shl 16 end if inc edx mcall - if lang eq it + if lang eq it_IT add ebx,60 shl 16 else add ebx,50 shl 16 end if inc edx mcall - if lang eq it + if lang eq it_IT add ebx,60 shl 16 else add ebx,50 shl 16 @@ -148,7 +148,7 @@ draw_buttons: ;--- ---------------------------------------------- ;--------------------------------------------------------------------- header db ' ATAPI Device Tray Control',0 -if lang eq it +if lang eq it_IT text3 db 'espelli espelli espelli espelli',0 text2 db 'carica carica carica carica',0 text1 db '/cd0/ /cd1/ /cd2/ /cd3/',0 diff --git a/programs/system/cd_tray/makefile b/programs/system/cd_tray/makefile index d9599a8d5..2c15566b5 100644 --- a/programs/system/cd_tray/makefile +++ b/programs/system/cd_tray/makefile @@ -9,10 +9,10 @@ SOURCE=${FILE}.ASM OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/colrdial/color_dialog.bat b/programs/system/colrdial/color_dialog.bat index 66ecd0523..272fef19b 100644 --- a/programs/system/colrdial/color_dialog.bat +++ b/programs/system/colrdial/color_dialog.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm color_dialog.asm colrdial @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/cpu/trunk/Tupfile.lua b/programs/system/cpu/trunk/Tupfile.lua index af94fc89c..f49486fc9 100644 --- a/programs/system/cpu/trunk/Tupfile.lua +++ b/programs/system/cpu/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({"cpu.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "cpu") diff --git a/programs/system/cpu/trunk/build_ge.bat b/programs/system/cpu/trunk/build_de.bat similarity index 61% rename from programs/system/cpu/trunk/build_ge.bat rename to programs/system/cpu/trunk/build_de.bat index 93e2220d7..406199ca0 100644 --- a/programs/system/cpu/trunk/build_ge.bat +++ b/programs/system/cpu/trunk/build_de.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix de >lang.inc +@echo lang fix de_DE >lang.inc @fasm -m 16384 cpu.asm cpu @kpack cpu @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/cpu/trunk/build_en.bat b/programs/system/cpu/trunk/build_en.bat index e4120e25d..d6714788e 100644 --- a/programs/system/cpu/trunk/build_en.bat +++ b/programs/system/cpu/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 cpu.asm cpu @kpack cpu @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/cpu/trunk/build_et.bat b/programs/system/cpu/trunk/build_et.bat index 32bc40647..2ead9a78f 100644 --- a/programs/system/cpu/trunk/build_et.bat +++ b/programs/system/cpu/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm -m 16384 cpu.asm cpu @kpack cpu @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/cpu/trunk/build_ru.bat b/programs/system/cpu/trunk/build_ru.bat index 323e01ccd..d001ba805 100644 --- a/programs/system/cpu/trunk/build_ru.bat +++ b/programs/system/cpu/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 cpu.asm cpu @kpack cpu @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/cpu/trunk/cpu.asm b/programs/system/cpu/trunk/cpu.asm index 84900f412..40f9e127e 100644 --- a/programs/system/cpu/trunk/cpu.asm +++ b/programs/system/cpu/trunk/cpu.asm @@ -918,7 +918,7 @@ sys_reboot: db "/sys/end",0 ;------------------------------------------------------------------------------- strings: -if lang eq de +if lang eq de_DE .window_caption utf8z "Prozesse v0.2.3 - [Ctrl+Alt+Del]" .process_name utf8z "NAME/BEENDEN" @@ -941,7 +941,7 @@ if lang eq de .MB utf8z " MB" .GB utf8z " GB" ;------------------------------------------------------------------------------- -else if lang eq et +else if lang eq et_EE .window_caption utf8z "Protsessid v0.2.3 - [Ctrl+Alt+Del]" .process_name utf8z "NIMI/LÕPETA" @@ -964,7 +964,7 @@ else if lang eq et .MB utf8z " MB" .GB utf8z " GB" ;------------------------------------------------------------------------------- -else if lang eq ru +else if lang eq ru_RU .window_caption utf8z "Диспетчер процессов v0.2.3 - [Ctrl+Alt+Del]" .process_name utf8z "ИМЯ/ЗАВЕРШИТЬ" @@ -987,7 +987,7 @@ else if lang eq ru .MB utf8z " МБ" .GB utf8z " ГБ" ;------------------------------------------------------------------------------- -else if lang eq it +else if lang eq it_IT .window_caption utf8z "Gestore processi v0.2.3 - [Ctrl+Alt+Del]" .process_name utf8z "NOME-PROGRAMMA" diff --git a/programs/system/cpu/trunk/makefile b/programs/system/cpu/trunk/makefile index e3b12a018..0e6062223 100644 --- a/programs/system/cpu/trunk/makefile +++ b/programs/system/cpu/trunk/makefile @@ -9,23 +9,23 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} et: - echo "lang fix et" > ${LANG} + echo "lang fix et_EE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} -ge: - echo "lang fix ge" > ${LANG} +de: + echo "lang fix de_DE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} clean: diff --git a/programs/system/docpack/trunk/build_en.bat b/programs/system/docpack/trunk/build_en.bat index 318f742d5..ce9130202 100644 --- a/programs/system/docpack/trunk/build_en.bat +++ b/programs/system/docpack/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 32768 docpack.asm docpack @erase lang.inc @kpack docpack -@pause \ No newline at end of file +@pause diff --git a/programs/system/docpack/trunk/build_ru.bat b/programs/system/docpack/trunk/build_ru.bat index ec7b09e8c..ae4b68fd1 100644 --- a/programs/system/docpack/trunk/build_ru.bat +++ b/programs/system/docpack/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 32768 docpack.asm docpack @erase lang.inc @kpack docpack -@pause \ No newline at end of file +@pause diff --git a/programs/system/docpack/trunk/makefile b/programs/system/docpack/trunk/makefile index f59ccc661..72d8131bd 100644 --- a/programs/system/docpack/trunk/makefile +++ b/programs/system/docpack/trunk/makefile @@ -9,7 +9,7 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} diff --git a/programs/system/end/light/Tupfile.lua b/programs/system/end/light/Tupfile.lua index 1ec0b6d4c..f8d80f072 100644 --- a/programs/system/end/light/Tupfile.lua +++ b/programs/system/end/light/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({"end.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "end") diff --git a/programs/system/end/light/build_ge.bat b/programs/system/end/light/build_de.bat similarity index 58% rename from programs/system/end/light/build_ge.bat rename to programs/system/end/light/build_de.bat index b061933e5..3079c132f 100644 --- a/programs/system/end/light/build_ge.bat +++ b/programs/system/end/light/build_de.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ge >lang.inc +@echo lang fix de_DE >lang.inc @fasm end.asm end @kpack end @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/end/light/build_en.bat b/programs/system/end/light/build_en.bat index ddcdf959d..935a5af51 100644 --- a/programs/system/end/light/build_en.bat +++ b/programs/system/end/light/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm end.asm end @kpack end @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/end/light/build_it.bat b/programs/system/end/light/build_it.bat index c310cadeb..1f487fc4a 100644 --- a/programs/system/end/light/build_it.bat +++ b/programs/system/end/light/build_it.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix it >lang.inc +@echo lang fix it_IT >lang.inc @fasm end.asm end @kpack end @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/end/light/build_ru.bat b/programs/system/end/light/build_ru.bat index 25920e889..21135b157 100644 --- a/programs/system/end/light/build_ru.bat +++ b/programs/system/end/light/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm end.asm end @kpack end @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/end/light/data.inc b/programs/system/end/light/data.inc index ed6b30c9b..f6b3faf02 100644 --- a/programs/system/end/light/data.inc +++ b/programs/system/end/light/data.inc @@ -13,7 +13,7 @@ TEXT_ENTER: db 'Enter',0 TEXT_END: db 'End',0 TEXT_CANCEL: db 'x',0 ;--------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU TEXT_WTITLE: db '襭 ࠡ',0 TEXT_RDSAVE1: db '࠭ , ᤥ ',0 TEXT_RDSAVE2: db ' ࠡ ⥬ (Ctrl+S)',0 @@ -21,7 +21,7 @@ if lang eq ru TEXT_REBOOT: db '१㧪',0 TEXT_OFF: db '몫祭',0 TEXT_SAVING: db '࠭ ࠧ...',0 -else if lang eq ge +else if lang eq de_DE TEXT_WTITLE: db 'Shutdown computer',0 TEXT_RDSAVE1: db 'Save all changes that were done',0 TEXT_RDSAVE2: db 'during system work (Ctrl+S)',0 @@ -29,7 +29,7 @@ else if lang eq ge TEXT_REBOOT: db 'Neustart',0 TEXT_OFF: db 'Beenden',0 TEXT_SAVING: db 'Saving RAM-drive...',0 -else if lang eq it +else if lang eq it_IT TEXT_WTITLE: db 'Shutdown computer',0 TEXT_RDSAVE1: db 'Save all changes that were done',0 TEXT_RDSAVE2: db 'during system work (Ctrl+S)',0 diff --git a/programs/system/end/light/makefile b/programs/system/end/light/makefile index 3b4e78269..f08065286 100644 --- a/programs/system/end/light/makefile +++ b/programs/system/end/light/makefile @@ -9,19 +9,19 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} -ge: - echo "lang fix ge" > ${LANG} +de: + echo "lang fix de_DE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} diff --git a/programs/system/format/format.asm b/programs/system/format/format.asm index c503acec9..069801dfc 100644 --- a/programs/system/format/format.asm +++ b/programs/system/format/format.asm @@ -346,7 +346,7 @@ ch2 check_box2 Otstup shl 16 + 12, (190+dy) shl 16 + 12, 6, 0xFFFFFFFF, 0xAABBCC browse db '...', 0 -if lang eq ru_RU ;RU language +if lang eq ru_RU ; Russian language title db "Formatting Disk Utility", 0 @@ -372,7 +372,7 @@ unittext: .6 db '32 ', 0 .7 db '64 ', 0 -else ;EN language +else ; English language title db "Formatting Disk Utility", 0 diff --git a/programs/system/gmon/makefile b/programs/system/gmon/makefile index ec34d9c74..5b750e3c2 100644 --- a/programs/system/gmon/makefile +++ b/programs/system/gmon/makefile @@ -9,10 +9,10 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/gmon/tab_about.inc b/programs/system/gmon/tab_about.inc index a5478adfd..4d70a019f 100644 --- a/programs/system/gmon/tab_about.inc +++ b/programs/system/gmon/tab_about.inc @@ -9,7 +9,7 @@ call show_text jmp redraw -if lang eq it +if lang eq it_IT msg_about mls \ ' Ghost Monitor',\ '',\ diff --git a/programs/system/gmon/tab_info.inc b/programs/system/gmon/tab_info.inc index 172912b2e..30285a75b 100644 --- a/programs/system/gmon/tab_info.inc +++ b/programs/system/gmon/tab_info.inc @@ -134,7 +134,7 @@ end if dub_p db ':' -if lang eq it +if lang eq it_IT lab_info_tab mls \ 'Vendor CPU',\ 'Frequenza CPU (MHz)',\ diff --git a/programs/system/gmon/tab_test.inc b/programs/system/gmon/tab_test.inc index 7c4ca97c9..49cee21ca 100644 --- a/programs/system/gmon/tab_test.inc +++ b/programs/system/gmon/tab_test.inc @@ -116,7 +116,7 @@ tmsg_p db 'Pentium (Pro/II/III)' ; 7/20 tmsg_k6 db 'K6 (I/II/III)' ; 13 tmsg_k7 db 'K7/Athlon/Duron' ; 15 tmsg_rec db 'recommended' ; 11 -if lang eq it +if lang eq it_IT tmsg_war db 'Potrebbe danneggiare lo hardware ' else tmsg_war db 'May permanently damage the hardware' diff --git a/programs/system/hdd_info/trunk/Tupfile.lua b/programs/system/hdd_info/trunk/Tupfile.lua index 1091719cd..98476cc6d 100644 --- a/programs/system/hdd_info/trunk/Tupfile.lua +++ b/programs/system/hdd_info/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({"hdd_info.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "hdd_info") diff --git a/programs/system/hdd_info/trunk/build.sh b/programs/system/hdd_info/trunk/build.sh index f17baed03..6492778a0 100755 --- a/programs/system/hdd_info/trunk/build.sh +++ b/programs/system/hdd_info/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 hdd_info.asm hdd_info rm -f lang.inc exit 0 diff --git a/programs/system/hdd_info/trunk/hdd_info.asm b/programs/system/hdd_info/trunk/hdd_info.asm index 7ec7c19f3..132f9ccf8 100644 --- a/programs/system/hdd_info/trunk/hdd_info.asm +++ b/programs/system/hdd_info/trunk/hdd_info.asm @@ -1309,7 +1309,7 @@ show_SmartBlock: ret ;--------------------------------------------------------------------- ;DATA AREA -if lang eq it +if lang eq it_IT t: .sup db 'supportato',0 .sel db 'selzionato',0 @@ -1330,7 +1330,7 @@ else .chs db 'CHS',0 end if -if lang eq it +if lang eq it_IT .10_19 db 'Numero seriale',0 .23_26 db 'Versione firmware',0 .27_46 db 'Numero modello',0 @@ -1640,7 +1640,7 @@ page_text db 'Page:',0 ;head_f_l db 'error',0 ;err_message_found_lib db 'box_lib.obj was not found',0 ;err_message_import db 'box_lib.obj was not imported ',0 -if lang eq it +if lang eq it_IT error_open_file_string_Info db 'Non riesco ad aprire Info file!',0 error_save_file_string_Info db 'Non riesco a salvare Info file!',0 diff --git a/programs/system/hdd_info/trunk/makefile b/programs/system/hdd_info/trunk/makefile index d0e73eeeb..41469f124 100644 --- a/programs/system/hdd_info/trunk/makefile +++ b/programs/system/hdd_info/trunk/makefile @@ -9,10 +9,10 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix ital" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/icon/trunk/Tupfile.lua b/programs/system/icon/trunk/Tupfile.lua index 67777ce6c..83d2cd4f3 100644 --- a/programs/system/icon/trunk/Tupfile.lua +++ b/programs/system/icon/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({"icon.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "icon") diff --git a/programs/system/icon/trunk/build.sh b/programs/system/icon/trunk/build.sh index 8c39dcb70..281299d1b 100644 --- a/programs/system/icon/trunk/build.sh +++ b/programs/system/icon/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for Linux the same as build.bat for DOS, # it compiles the current KolibriOS applications - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 icon.asm icon kpack icon rm -f lang.inc diff --git a/programs/system/icon/trunk/build_ge.bat b/programs/system/icon/trunk/build_de.bat similarity index 62% rename from programs/system/icon/trunk/build_ge.bat rename to programs/system/icon/trunk/build_de.bat index 566eed39b..048a7f7a4 100644 --- a/programs/system/icon/trunk/build_ge.bat +++ b/programs/system/icon/trunk/build_de.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ge >lang.inc +@echo lang fix de_DE >lang.inc @fasm -m 16384 icon.asm icon @kpack icon @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/icon/trunk/build_en.bat b/programs/system/icon/trunk/build_en.bat index 67cb2d57e..2cecd6e32 100644 --- a/programs/system/icon/trunk/build_en.bat +++ b/programs/system/icon/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 icon.asm icon @kpack icon @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/icon/trunk/build_ru.bat b/programs/system/icon/trunk/build_ru.bat index 2a07c3bf9..5caafac2b 100644 --- a/programs/system/icon/trunk/build_ru.bat +++ b/programs/system/icon/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 icon.asm icon @kpack icon @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/icon/trunk/data.inc b/programs/system/icon/trunk/data.inc index 8886ee108..ee5591d84 100644 --- a/programs/system/icon/trunk/data.inc +++ b/programs/system/icon/trunk/data.inc @@ -17,7 +17,7 @@ icon_table: icons_reserved: times 9 db ' ' ;------------------------------------------------------------------------------ -if lang eq ru +if lang eq ru_RU text: db 255,255,255,0, ' ' db 255,255,255,0, ' ' @@ -31,7 +31,7 @@ add_text db ' rem_text db ' ',0 title db ' ',0 -else if lang eq ge +else if lang eq de_DE text: db 255,255,255,0, ' TITLE ' db 255,255,255,0, ' APP NAME ' @@ -45,7 +45,7 @@ add_text db 'AUF UNBENUTZTE ICONPOSITION KLICKEN ',0 rem_text db 'ICON ANKLICKEN; DAS GELOESCHT WERDEN SOLL ',0 title db 'Icon Manager',0 -else if lang eq it +else if lang eq it_IT text: db 255,255,255,0, 'Titolo ' db 255,255,255,0, 'Nome app ' @@ -85,9 +85,9 @@ icon_default: db 13,10 ;------------------------------------------------------------------------------ rep_text: -if lang eq ru +if lang eq ru_RU db ' - , #' -;else if lang eq it +;else if lang eq it_IT ; db 'Icone - di , Selezionate' else db 'ICONS - OF , SELECTED' diff --git a/programs/system/icon/trunk/makefile b/programs/system/icon/trunk/makefile index 21b592e40..3bc9dda97 100644 --- a/programs/system/icon/trunk/makefile +++ b/programs/system/icon/trunk/makefile @@ -9,15 +9,15 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} -ge: - echo "lang fix ge" > ${LANG} +de: + echo "lang fix de_DE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} diff --git a/programs/system/icon_new/DlgAdd.inc b/programs/system/icon_new/DlgAdd.inc index c1c6eac34..fb277cc2f 100644 --- a/programs/system/icon_new/DlgAdd.inc +++ b/programs/system/icon_new/DlgAdd.inc @@ -465,7 +465,7 @@ proc DRedrawWin mcall ,<30+IMG_SIZE,35>,,DCaptPath mcall ,<30+IMG_SIZE,59>,,DCaptParams -if lang eq ru +if lang eq ru_RU mov ecx,[sc.work_button_text] or ecx,90000000h mcall ,<369,35+END_ICONS_AREAH>,,DCaptCancel diff --git a/programs/system/icon_new/Tupfile.lua b/programs/system/icon_new/Tupfile.lua index 1e4a24a27..f49d5356a 100644 --- a/programs/system/icon_new/Tupfile.lua +++ b/programs/system/icon_new/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({"icon.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "icon") diff --git a/programs/system/icon_new/build_en.bat b/programs/system/icon_new/build_en.bat index f1bec8fe7..eaf135a49 100644 --- a/programs/system/icon_new/build_en.bat +++ b/programs/system/icon_new/build_en.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 icon.asm @icon @erase lang.inc @kpack @icon diff --git a/programs/system/icon_new/build_en.sh b/programs/system/icon_new/build_en.sh index 4eed0e41d..f898915d2 100644 --- a/programs/system/icon_new/build_en.sh +++ b/programs/system/icon_new/build_en.sh @@ -1,8 +1,8 @@ #!/bin/bash # This script does for linux the same as build.bat for DOS, - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 icon.asm @icon kpack @icon rm -f lang.inc diff --git a/programs/system/icon_new/build_ru.bat b/programs/system/icon_new/build_ru.bat index 5277c10cf..fd9951e64 100644 --- a/programs/system/icon_new/build_ru.bat +++ b/programs/system/icon_new/build_ru.bat @@ -1,4 +1,4 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 icon.asm @icon @erase lang.inc @kpack @icon diff --git a/programs/system/icon_new/icon.asm b/programs/system/icon_new/icon.asm index e5718b070..de8516501 100644 --- a/programs/system/icon_new/icon.asm +++ b/programs/system/icon_new/icon.asm @@ -1104,7 +1104,7 @@ import libini,\ ;----- RButton.inc ------------------------------------------------------------- ;------------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU MinRMenuW dd 18*6+10 else MinRMenuW dd 15*6+10 @@ -1116,7 +1116,7 @@ curpath db '/sys',0 PredItem dd -1 -if lang eq ru +if lang eq ru_RU RMenuRedrawFon db 'ᮢ',0 RMenuAlign db '஢ ⪥',0 RMenuOffMoving db '९ ',0 @@ -1134,7 +1134,7 @@ else RMenuProp db 'Properties',0 end if -if lang eq ru +if lang eq ru_RU ErrRunProg db '訡 ᪠ ணࠬ',0 WarningSave db ' ࠭ , RDSave',0 ErrNotFoundIni db ' icon.ini',0 @@ -1149,7 +1149,7 @@ end if ;------------------------------------------------------------------------------- ;------- AddDlg.inc --------------------------------------------------------------- ;------------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU DTitleAdd db ' ',0 DTitleProp db ' ',0 diff --git a/programs/system/keybi/Tupfile.lua b/programs/system/keybi/Tupfile.lua index d56b40b36..901d65b57 100644 --- a/programs/system/keybi/Tupfile.lua +++ b/programs/system/keybi/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({"keybi.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "keybi") diff --git a/programs/system/keybi/build.bat b/programs/system/keybi/build.bat index 87712fa4a..8d4e409f9 100644 --- a/programs/system/keybi/build.bat +++ b/programs/system/keybi/build.bat @@ -1,5 +1,5 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm keybi.asm keybi @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/keybi/keybi.asm b/programs/system/keybi/keybi.asm index 6c3351da9..632b8023d 100644 --- a/programs/system/keybi/keybi.asm +++ b/programs/system/keybi/keybi.asm @@ -152,7 +152,7 @@ ch3 check_box2 (5 shl 16)+15,(29 shl 16)+10,5, 0xffffff,0x8000,0xff,\ txt_158,0+ch_flag_middle check_boxes_end: -if lang eq it +if lang eq it_IT txt_160 db 'Bloc Num',0 txt_159 db 'Bloc Maiusc',0 txt_158 db 'Bloc Scorr',0 diff --git a/programs/system/launch/trunk/launch.asm b/programs/system/launch/trunk/launch.asm index 960f8917c..37d3ffd67 100755 --- a/programs/system/launch/trunk/launch.asm +++ b/programs/system/launch/trunk/launch.asm @@ -345,7 +345,7 @@ window_title: db APP_NAME, ' ', APP_VERSION, 0 ;; Messages -if lang eq it +if lang eq it_IT message_dbg_not_found: db '%s non trovato', 10, 0 diff --git a/programs/system/launcher/trunk/build_en.bat b/programs/system/launcher/trunk/build_en.bat index 6297cd15d..8471d8a7d 100644 --- a/programs/system/launcher/trunk/build_en.bat +++ b/programs/system/launcher/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm launcher.asm launcher @kpack launcher @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/launcher/trunk/build_ru.bat b/programs/system/launcher/trunk/build_ru.bat index a0b1722da..48e4089c3 100644 --- a/programs/system/launcher/trunk/build_ru.bat +++ b/programs/system/launcher/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm launcher.asm launcher @kpack launcher @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/menu/trunk/Tupfile.lua b/programs/system/menu/trunk/Tupfile.lua index 83be720fd..78d2f230c 100644 --- a/programs/system/menu/trunk/Tupfile.lua +++ b/programs/system/menu/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({"menu.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "menu") diff --git a/programs/system/menu/trunk/build.bat b/programs/system/menu/trunk/build.bat index cc8085218..6db085a49 100644 --- a/programs/system/menu/trunk/build.bat +++ b/programs/system/menu/trunk/build.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 menu.asm @menu @kpack @menu @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/menu/trunk/build.sh b/programs/system/menu/trunk/build.sh index 10f7d1b39..eae163653 100644 --- a/programs/system/menu/trunk/build.sh +++ b/programs/system/menu/trunk/build.sh @@ -1,9 +1,7 @@ #!/bin/sh - echo "lang fix ru" - echo "lang fix en" - echo "lang fix de" - echo "lang fix it" > lang.inc + echo "lang fix it_IT" + echo "lang fix it_IT" > lang.inc #/opt/fasm/fasm menu.asm @menu fasm menu.asm @menu kpack @menu diff --git a/programs/system/menu/trunk/makefile b/programs/system/menu/trunk/makefile index f12cf60bf..950b27400 100644 --- a/programs/system/menu/trunk/makefile +++ b/programs/system/menu/trunk/makefile @@ -8,19 +8,19 @@ FILE=menu SOURCE=${FILE}.asm en: - echo "lang fix de" > lang.inc + echo "lang fix en_US" > lang.inc ${FASM} ${SOURCE} @menu ${KPACK} @menu rm ${LANG} ru: - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" > lang.inc ${FASM} ${SOURCE} @menu ${KPACK} @menu rm ${LANG} it: - echo "lang fix it" > lang.inc + echo "lang fix it_IT" > lang.inc ${FASM} ${SOURCE} @menu ${KPACK} @menu rm ${LANG} diff --git a/programs/system/mousemul/trunk/Tupfile.lua b/programs/system/mousemul/trunk/Tupfile.lua index f9759453a..04360af8e 100644 --- a/programs/system/mousemul/trunk/Tupfile.lua +++ b/programs/system/mousemul/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({"mousemul.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mousemul") diff --git a/programs/system/mousemul/trunk/build.bat b/programs/system/mousemul/trunk/build.bat index 7ef86920a..66cdf482c 100644 --- a/programs/system/mousemul/trunk/build.bat +++ b/programs/system/mousemul/trunk/build.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 mousemul.asm mousemul @kpack mousemul @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/mousemul/trunk/build.sh b/programs/system/mousemul/trunk/build.sh index 532a80e2f..8484f625a 100755 --- a/programs/system/mousemul/trunk/build.sh +++ b/programs/system/mousemul/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 mousemul.asm mousemul rm -f lang.inc exit 0 diff --git a/programs/system/mousemul/trunk/makefile b/programs/system/mousemul/trunk/makefile index 023c30c0a..875bb15d2 100644 --- a/programs/system/mousemul/trunk/makefile +++ b/programs/system/mousemul/trunk/makefile @@ -9,13 +9,13 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/mousemul/trunk/mousemul.asm b/programs/system/mousemul/trunk/mousemul.asm index fb087c47f..5af3717dd 100644 --- a/programs/system/mousemul/trunk/mousemul.asm +++ b/programs/system/mousemul/trunk/mousemul.asm @@ -285,9 +285,9 @@ DATA UDATA mouse_timer_ticks dd 0 ;----------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU ud_user_message db '"NumLock 砥 몫砥 .\nࠢ १ Numpad." -I',0 -else if lang eq it +else if lang eq it_IT ud_user_message db '"NumLock - on/off - usa Numpad per muovere il cursore." -I',0 else ud_user_message db '"NumLock - on/off mouse emul. Numpad - move cursor." -I',0 diff --git a/programs/system/open/Tupfile.lua b/programs/system/open/Tupfile.lua index e3f45df00..857ea68c3 100644 --- a/programs/system/open/Tupfile.lua +++ b/programs/system/open/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({"open.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "open") diff --git a/programs/system/open/build.bat b/programs/system/open/build.bat index f474101c0..f6e6753b0 100644 --- a/programs/system/open/build.bat +++ b/programs/system/open/build.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm open.asm @open @kpack @open @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/open/open.asm b/programs/system/open/open.asm index e16468872..a1e089625 100644 --- a/programs/system/open/open.asm +++ b/programs/system/open/open.asm @@ -28,17 +28,17 @@ end if ;=============================== -if lang eq ru +if lang eq ru_RU title db " ", 0 browse_txt db "...", 0 notify_txt db "'Incorrect ", '"', "/sys/settings/assoc.ini", '"', " file' -tE", 0 checkbox_txt db "ᯮ짮 ᥣ", 0 -else if lang eq et +else if lang eq et_EE title db "Open with", 0 browse_txt db "Browse...", 0 notify_txt db "'Incorrect ", '"', "/sys/settings/assoc.ini", '"', " file' -tE", 0 checkbox_txt db "Always use selected program", 0 -else if lang eq it +else if lang eq it_IT title db "Open with", 0 browse_txt db "Browse...", 0 notify_txt db "'Incorrect ", '"', "/sys/settings/assoc.ini", '"', " file' -tE", 0 diff --git a/programs/system/rdsave/trunk/Tupfile.lua b/programs/system/rdsave/trunk/Tupfile.lua index f4fe54ae6..32649eae1 100644 --- a/programs/system/rdsave/trunk/Tupfile.lua +++ b/programs/system/rdsave/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({"rdsave.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "rdsave") diff --git a/programs/system/rdsave/trunk/build.sh b/programs/system/rdsave/trunk/build.sh index ff76120ef..6cc1feb28 100755 --- a/programs/system/rdsave/trunk/build.sh +++ b/programs/system/rdsave/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 rdsave.asm rdsave rm -f lang.inc exit 0 diff --git a/programs/system/rdsave/trunk/build_en.bat b/programs/system/rdsave/trunk/build_en.bat index a778504f6..82de5e5d3 100644 --- a/programs/system/rdsave/trunk/build_en.bat +++ b/programs/system/rdsave/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm rdsave.asm rdsave @kpack rdsave @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/rdsave/trunk/build_et.bat b/programs/system/rdsave/trunk/build_et.bat index 3ab693ff0..b72de98ac 100644 --- a/programs/system/rdsave/trunk/build_et.bat +++ b/programs/system/rdsave/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm rdsave.asm rdsave @kpack rdsave @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/rdsave/trunk/build_it.bat b/programs/system/rdsave/trunk/build_it.bat index 680525a8a..2037cbcb6 100644 --- a/programs/system/rdsave/trunk/build_it.bat +++ b/programs/system/rdsave/trunk/build_it.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix it >lang.inc +@echo lang fix it_IT >lang.inc @fasm rdsave.asm rdsave @kpack rdsave @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/rdsave/trunk/build_ru.bat b/programs/system/rdsave/trunk/build_ru.bat index 31ae125fc..e31860b5a 100644 --- a/programs/system/rdsave/trunk/build_ru.bat +++ b/programs/system/rdsave/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm rdsave.asm rdsave @kpack rdsave @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/rdsave/trunk/makefile b/programs/system/rdsave/trunk/makefile index 36af6ed2b..2d60a8b9a 100644 --- a/programs/system/rdsave/trunk/makefile +++ b/programs/system/rdsave/trunk/makefile @@ -9,16 +9,16 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} et: - echo "lang fix et" > ${LANG} + echo "lang fix et_EE" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/rdsave/trunk/rdsave.asm b/programs/system/rdsave/trunk/rdsave.asm index fa591fb54..57249af3c 100644 --- a/programs/system/rdsave/trunk/rdsave.asm +++ b/programs/system/rdsave/trunk/rdsave.asm @@ -378,7 +378,7 @@ draw_window: ;--------------------------------------------------------------------- ;--- Data ---------------------------------------------------------- ;--------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU save db '࠭',0 cancel db '⬥',0 select db '',0 @@ -400,7 +400,7 @@ aUnknownError db ' rdError db ' ࠭ ࠧ ᠬ ᥡ',0 error db '訡: ',0 ;--------------------------------------------------------------------- -else if lang eq et +else if lang eq et_EE save db 'Salvesta',0 cancel db 'Cancel',0 select db ' Valige',0 @@ -422,7 +422,7 @@ aUnknownError db 'Tundmatu viga',0 rdError db "You can't save image on itself",0 error db 'Viga: ',0 ;--------------------------------------------------------------------- -else if lang eq it +else if lang eq it_IT save db ' Salva',0 cancel db 'Cancel',0 select db 'Seleziona',0 @@ -698,4 +698,4 @@ text_work_area: align 32 rb 4096 stacktop: -I_END: \ No newline at end of file +I_END: diff --git a/programs/system/refrscrn/Tupfile.lua b/programs/system/refrscrn/Tupfile.lua index c540ef395..c31246318 100644 --- a/programs/system/refrscrn/Tupfile.lua +++ b/programs/system/refrscrn/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({"refrscrn.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "refrscrn") diff --git a/programs/system/refrscrn/makefile b/programs/system/refrscrn/makefile index 4eebd76ce..0a8994be5 100644 --- a/programs/system/refrscrn/makefile +++ b/programs/system/refrscrn/makefile @@ -9,7 +9,7 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/run/trunk/Tupfile.lua b/programs/system/run/trunk/Tupfile.lua index 34daf9336..17fe2d193 100644 --- a/programs/system/run/trunk/Tupfile.lua +++ b/programs/system/run/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({"run.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "run") diff --git a/programs/system/run/trunk/build_en.bat b/programs/system/run/trunk/build_en.bat index 5108faf74..00a535283 100644 --- a/programs/system/run/trunk/build_en.bat +++ b/programs/system/run/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm run.asm run @kpack run @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/run/trunk/build_ru.bat b/programs/system/run/trunk/build_ru.bat index 8b47780d8..cb7244f25 100644 --- a/programs/system/run/trunk/build_ru.bat +++ b/programs/system/run/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm run.asm run @kpack run @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/run/trunk/makefile b/programs/system/run/trunk/makefile index 416dff685..ca8ff9bc7 100644 --- a/programs/system/run/trunk/makefile +++ b/programs/system/run/trunk/makefile @@ -9,13 +9,13 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/run/trunk/run.asm b/programs/system/run/trunk/run.asm index c7311659b..b81fd3901 100644 --- a/programs/system/run/trunk/run.asm +++ b/programs/system/run/trunk/run.asm @@ -237,7 +237,7 @@ run_but txt_button 0,5,20,33,2,0,0x90000000,run_but_text, input_fn edit_box 0,5,5,0xffffff,0x6a9480,0,0xaaaaaa,0x90000000,511,fn,mouse_dd,ed_focus+ed_always_focus ;mouse_flag: dd 0x0 input_fn_end: -if lang eq ru +if lang eq ru_RU hello db ' 䠩 Enter',0 bad_file_sys db '⭠ 䠩 ⥬',0 ; 3 file_not_find db ' ',0 ; 5 @@ -250,7 +250,7 @@ if lang eq ru run_ok db 'ணࠬ ᯥ譮 饭',0 grab_text db ' ணࠬ',0 run_but_text db '',0 -else if lang eq it +else if lang eq it_IT hello db 'Inserisci percorso completo al file e premi ',0 bad_file_sys db 'Filesysrem sconosciuto',0 ; 3 file_not_find db 'File non trovato',0 ; 5 diff --git a/programs/system/setup/trunk/setup.asm b/programs/system/setup/trunk/setup.asm index 5353cecfa..d2605475b 100644 --- a/programs/system/setup/trunk/setup.asm +++ b/programs/system/setup/trunk/setup.asm @@ -484,7 +484,7 @@ stringsAmount = 6 align 4 langs: db 'ENGLISH FINNISH GERMAN RUSSIAN FRENCH ESTONIANSPANISH ITALIAN ' -sz langMarks, 'en','fi','de','ru','fr','et','sp','it' +sz langMarks, 'en','fi','de','ru','fr','et','es','it' textrus: db ' ⥬ : < > ਬ' diff --git a/programs/system/skincfg/trunk/Tupfile.lua b/programs/system/skincfg/trunk/Tupfile.lua index 5461643cd..5ce9033cb 100644 --- a/programs/system/skincfg/trunk/Tupfile.lua +++ b/programs/system/skincfg/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({"skincfg.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "skincfg") diff --git a/programs/system/skincfg/trunk/build_en.bat b/programs/system/skincfg/trunk/build_en.bat index ad83f4c71..4334512b7 100644 --- a/programs/system/skincfg/trunk/build_en.bat +++ b/programs/system/skincfg/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm skincfg.asm skincfg @kpack skincfg @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/skincfg/trunk/build_en.sh b/programs/system/skincfg/trunk/build_en.sh index 6def4f754..7efefb720 100755 --- a/programs/system/skincfg/trunk/build_en.sh +++ b/programs/system/skincfg/trunk/build_en.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 skincfg.asm skincfg rm -f lang.inc exit 0 diff --git a/programs/system/skincfg/trunk/build_sp.bat b/programs/system/skincfg/trunk/build_es.bat similarity index 62% rename from programs/system/skincfg/trunk/build_sp.bat rename to programs/system/skincfg/trunk/build_es.bat index 202a803ea..7a942f24c 100644 --- a/programs/system/skincfg/trunk/build_sp.bat +++ b/programs/system/skincfg/trunk/build_es.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix sp >lang.inc +@echo lang fix es_ES >lang.inc @fasm skincfg.asm skincfg @kpack skincfg @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/skincfg/trunk/build_et.bat b/programs/system/skincfg/trunk/build_et.bat index 0fde35864..a5923c38e 100644 --- a/programs/system/skincfg/trunk/build_et.bat +++ b/programs/system/skincfg/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm skincfg.asm skincfg @kpack skincfg @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/skincfg/trunk/build_et.sh b/programs/system/skincfg/trunk/build_et.sh index 6fe84eb54..7208634c5 100755 --- a/programs/system/skincfg/trunk/build_et.sh +++ b/programs/system/skincfg/trunk/build_et.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix et" - echo "lang fix et" > lang.inc + echo "lang fix et_EE" + echo "lang fix et_EE" > lang.inc fasm -m 16384 skincfg.asm skincfg rm -f lang.inc exit 0 diff --git a/programs/system/skincfg/trunk/build_it.bat b/programs/system/skincfg/trunk/build_it.bat index b9eab68c5..e02b19f23 100644 --- a/programs/system/skincfg/trunk/build_it.bat +++ b/programs/system/skincfg/trunk/build_it.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix it >lang.inc +@echo lang fix it_IT >lang.inc @fasm skincfg.asm skincfg @kpack skincfg @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/skincfg/trunk/build_ru.bat b/programs/system/skincfg/trunk/build_ru.bat index 27d43f28c..5335d79da 100644 --- a/programs/system/skincfg/trunk/build_ru.bat +++ b/programs/system/skincfg/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm skincfg.asm skincfg @kpack skincfg @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/system/skincfg/trunk/build_ru.sh b/programs/system/skincfg/trunk/build_ru.sh index cc6704e38..27a1f7b40 100755 --- a/programs/system/skincfg/trunk/build_ru.sh +++ b/programs/system/skincfg/trunk/build_ru.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix ru" - echo "lang fix ru" > lang.inc + echo "lang fix ru_RU" + echo "lang fix ru_RU" > lang.inc fasm -m 16384 skincfg.asm skincfg rm -f lang.inc exit 0 diff --git a/programs/system/skincfg/trunk/build_sp.sh b/programs/system/skincfg/trunk/build_sp.sh index b14649b51..c339e88db 100755 --- a/programs/system/skincfg/trunk/build_sp.sh +++ b/programs/system/skincfg/trunk/build_sp.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix sp" - echo "lang fix sp" > lang.inc + echo "lang fix es_ES" + echo "lang fix es_ES" > lang.inc fasm -m 16384 skincfg.asm skincfg rm -f lang.inc exit 0 diff --git a/programs/system/skincfg/trunk/idata.inc b/programs/system/skincfg/trunk/idata.inc index b19fd54c5..4992bc971 100644 --- a/programs/system/skincfg/trunk/idata.inc +++ b/programs/system/skincfg/trunk/idata.inc @@ -1,6 +1,6 @@ ;----------------------------------------------------------------------------- text: -if lang eq ru +if lang eq ru_RU db ' Unused1 ' db ' Unused2 ' db ' 3d ⥬ ஭ ' @@ -12,7 +12,7 @@ if lang eq ru db ' ' db ' 䨪 ' db 'x' -else if lang eq et +else if lang eq et_EE db ' Unused1 ' db ' Unused2 ' db ' 3d dark ' @@ -38,43 +38,43 @@ else db 'x' end if ;----------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU sz t1,' ' -else if lang eq et +else if lang eq et_EE sz t1,' LAADI SALVESTA KINNITA' else sz t1,' LOAD SAVE APPLY' end if ;----------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU sz t2,' 3D ' -else if lang eq et +else if lang eq et_EE sz t2,' LAADI 3D LAME KINNITA' else sz t2,' LOAD 3D FLAT APPLY' end if ;----------------------------------------------------------------------------- select_dtp_text: -if lang eq ru +if lang eq ru_RU db ' 롮 梥⮢ ଫ: ',0 -else if lang eq et +else if lang eq et_EE db ' Valik varviskeeme: ',0 else db ' Choice of color schemes: ',0 end if ;----------------------------------------------------------------------------- select_skin_text: -if lang eq ru +if lang eq ru_RU db ' 롮 ᪨: ',0 -else if lang eq et +else if lang eq et_EE db ' Valik nahad: ',0 else db ' Choice of skins: ',0 end if ;----------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU sz caption_text,'' -else if lang eq et +else if lang eq et_EE sz caption_text,'Pealkiri' else sz caption_text,'Caption' @@ -82,27 +82,27 @@ end if ;----------------------------------------------------------------------------- sz close_text,'x' ;----------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU sz window_text,' ' -else if lang eq et +else if lang eq et_EE sz window_text,'Akna tekst' else sz window_text,'Window text' end if ;----------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU sz button_text,' ' -else if lang eq et +else if lang eq et_EE sz button_text,'Nupu tekst' else sz button_text,'Button text' end if ;----------------------------------------------------------------------------- -if lang eq ru +if lang eq ru_RU title db 'ன ',0 -else if lang eq et +else if lang eq et_EE title db 'Akna seaded',0 -else if lang eq it +else if lang eq it_IT title db 'Impostazioni',0 else title db 'Windows settings',0 diff --git a/programs/system/skincfg/trunk/makefile b/programs/system/skincfg/trunk/makefile index b2acb67d3..635f434b1 100644 --- a/programs/system/skincfg/trunk/makefile +++ b/programs/system/skincfg/trunk/makefile @@ -9,19 +9,19 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} et: - echo "lang fix et" > ${LANG} + echo "lang fix et_EE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} -sp: - echo "lang fix sp" > ${LANG} +es: + echo "lang fix es_ES" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/system/skincfg/trunk/skincfg.asm b/programs/system/skincfg/trunk/skincfg.asm index 0ed62a350..c3e580407 100644 --- a/programs/system/skincfg/trunk/skincfg.asm +++ b/programs/system/skincfg/trunk/skincfg.asm @@ -503,7 +503,7 @@ draw_window: test eax,100b jne .end -;if lang eq ru +;if lang eq ru_RU load_w = (5*2+6*9) save_w = (5*2+6*9) flat_w = (5*2+6*7) @@ -588,4 +588,4 @@ IM_END: include 'udata.inc' ;----------------------------------------------------------------------------- I_END: -;----------------------------------------------------------------------------- \ No newline at end of file +;----------------------------------------------------------------------------- diff --git a/programs/system/taskbar/trunk/TASKBAR.ASM b/programs/system/taskbar/trunk/TASKBAR.ASM index f09cd9440..88bcfb663 100644 --- a/programs/system/taskbar/trunk/TASKBAR.ASM +++ b/programs/system/taskbar/trunk/TASKBAR.ASM @@ -87,7 +87,7 @@ time_bgr_color = 0x66cc ;PANEL_HEIGHT = 18 ML_SIZE = 10 MR_SIZE = 10 -if lang eq et +if lang eq et_EE MENU_SIZE = 60 else MENU_SIZE = 50 diff --git a/programs/system/taskbar/trunk/build_en.bat b/programs/system/taskbar/trunk/build_en.bat index c10019d71..214d2208a 100644 --- a/programs/system/taskbar/trunk/build_en.bat +++ b/programs/system/taskbar/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 taskbar.asm @taskbar @erase lang.inc @kpack @taskbar -@pause \ No newline at end of file +@pause diff --git a/programs/system/taskbar/trunk/build_et.bat b/programs/system/taskbar/trunk/build_et.bat index 6ef92a71f..c9d7e8cc7 100644 --- a/programs/system/taskbar/trunk/build_et.bat +++ b/programs/system/taskbar/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix et >lang.inc +@echo lang fix et_EE >lang.inc @fasm -m 16384 taskbar.asm @taskbar @erase lang.inc @kpack @taskbar -@pause \ No newline at end of file +@pause diff --git a/programs/system/taskbar/trunk/build_ru.bat b/programs/system/taskbar/trunk/build_ru.bat index ffedd69ce..e0a6a1622 100644 --- a/programs/system/taskbar/trunk/build_ru.bat +++ b/programs/system/taskbar/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 taskbar.asm @taskbar @erase lang.inc @kpack @taskbar -@pause \ No newline at end of file +@pause diff --git a/programs/system/taskbar/trunk/drawwind.inc b/programs/system/taskbar/trunk/drawwind.inc index 38e185bd4..525f8fe74 100644 --- a/programs/system/taskbar/trunk/drawwind.inc +++ b/programs/system/taskbar/trunk/drawwind.inc @@ -276,7 +276,7 @@ align 4 sub bx,7 mov ecx,[PanelText_color] or ecx,0x10000000 - if lang eq et + if lang eq et_EE mcall 4,,,m_text,5 else mcall 4,,,m_text,4 diff --git a/programs/system/taskbar/trunk/makefile b/programs/system/taskbar/trunk/makefile index 81a2df354..3bb525795 100644 --- a/programs/system/taskbar/trunk/makefile +++ b/programs/system/taskbar/trunk/makefile @@ -9,19 +9,19 @@ SOURCE=${FILE}.ASM OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} et: - echo "lang fix et" > ${LANG} + echo "lang fix et_EE" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} ru: - echo "lang fix ru" > ${LANG} + echo "lang fix ru_RU" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} diff --git a/programs/testing/cpuid/trunk/Build.bat b/programs/testing/cpuid/trunk/Build.bat index 58654f914..8e6b40566 100644 --- a/programs/testing/cpuid/trunk/Build.bat +++ b/programs/testing/cpuid/trunk/Build.bat @@ -1,4 +1,4 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm cpuid.asm cpuid @pause -@erase lang.inc \ No newline at end of file +@erase lang.inc diff --git a/programs/testing/cpuid/trunk/CPUID.ASM b/programs/testing/cpuid/trunk/CPUID.ASM index f382bd2c2..37c31ae75 100644 --- a/programs/testing/cpuid/trunk/CPUID.ASM +++ b/programs/testing/cpuid/trunk/CPUID.ASM @@ -3140,7 +3140,7 @@ techlen: name: -if lang eq it +if lang eq it_IT db 'Codename:',0 @@ -3155,7 +3155,7 @@ namelen: vendorname: -if lang eq it +if lang eq it_IT db 'Vendor CPU ', 0 @@ -3169,7 +3169,7 @@ vendornamelen: cpuname: -if lang eq it +if lang eq it_IT db 'Vendor CPU ', 0 @@ -3184,7 +3184,7 @@ cpunamelen: fam: -if lang eq it +if lang eq it_IT db 'Famiglia: std ext', 0 @@ -3198,7 +3198,7 @@ famlen: mode: -if lang eq it +if lang eq it_IT db 'Modello: std ext', 0 @@ -3212,7 +3212,7 @@ modelen: step: -if lang eq it +if lang eq it_IT db 'Stepping: ', 0 @@ -3296,7 +3296,7 @@ logcpuslen: speed : -if lang eq it +if lang eq it_IT ; db 'Performance',0 @@ -3320,7 +3320,7 @@ kbperseclen: instruct: -if lang eq it +if lang eq it_IT db 'Set istruzioni' @@ -3354,7 +3354,7 @@ EXTCAlen: oblom: -if lang eq it +if lang eq it_IT db 'CPUID non e disponibile' @@ -3369,7 +3369,7 @@ oblomlen: other: -if lang eq it +if lang eq it_IT db 'Questo vendor non e supportato' @@ -3392,7 +3392,7 @@ cacheP4len: typen: -if lang eq it +if lang eq it_IT db 'Tipo:' diff --git a/programs/testing/cpuid/trunk/Tupfile.lua b/programs/testing/cpuid/trunk/Tupfile.lua index 4561c23c2..517b723de 100644 --- a/programs/testing/cpuid/trunk/Tupfile.lua +++ b/programs/testing/cpuid/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({"CPUID.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o -m70000" .. tup.getconfig("KPACK_CMD"), "CPUID") diff --git a/programs/testing/cpuid/trunk/makefile b/programs/testing/cpuid/trunk/makefile index 41f259edf..ef8cae0c2 100644 --- a/programs/testing/cpuid/trunk/makefile +++ b/programs/testing/cpuid/trunk/makefile @@ -13,10 +13,10 @@ SOURCE=${FILE}.ASM OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/testing/disptest/trunk/Tupfile.lua b/programs/testing/disptest/trunk/Tupfile.lua index 8d7ae98df..8362dae32 100644 --- a/programs/testing/disptest/trunk/Tupfile.lua +++ b/programs/testing/disptest/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({"disptest.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "disptest") diff --git a/programs/testing/disptest/trunk/build_en.bat b/programs/testing/disptest/trunk/build_en.bat index b72d967de..026afe8ec 100644 --- a/programs/testing/disptest/trunk/build_en.bat +++ b/programs/testing/disptest/trunk/build_en.bat @@ -1,5 +1,5 @@ -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm disptest.asm disptest @erase lang.inc kpack disptest -@pause \ No newline at end of file +@pause diff --git a/programs/testing/disptest/trunk/build_ru.bat b/programs/testing/disptest/trunk/build_ru.bat index ae7f0b122..540da0dab 100644 --- a/programs/testing/disptest/trunk/build_ru.bat +++ b/programs/testing/disptest/trunk/build_ru.bat @@ -1,5 +1,5 @@ -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm disptest.asm disptest @erase lang.inc kpack disptest -@pause \ No newline at end of file +@pause diff --git a/programs/testing/fspeed/Tupfile.lua b/programs/testing/fspeed/Tupfile.lua index 0822a71ab..b2b9732b3 100644 --- a/programs/testing/fspeed/Tupfile.lua +++ b/programs/testing/fspeed/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({"fspeed.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "fspeed") diff --git a/programs/testing/fspeed/build_en.bat b/programs/testing/fspeed/build_en.bat index 19363b553..38be02f0b 100644 --- a/programs/testing/fspeed/build_en.bat +++ b/programs/testing/fspeed/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm fspeed.asm fspeed @kpack fspeed @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/testing/fspeed/build_ru.bat b/programs/testing/fspeed/build_ru.bat index aefe71fdc..8059000ac 100644 --- a/programs/testing/fspeed/build_ru.bat +++ b/programs/testing/fspeed/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm fspeed.asm fspeed @kpack fspeed @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/testing/fspeed/idata.inc b/programs/testing/fspeed/idata.inc index 1d70173a8..d296fcbe0 100644 --- a/programs/testing/fspeed/idata.inc +++ b/programs/testing/fspeed/idata.inc @@ -1,20 +1,20 @@ ;----------------------------------------------------------------------------- s_text: -if lang eq ru +if lang eq ru_RU db '롮 䠩',0 else db 'Select file',0 end if ;----------------------------------------------------------------------------- r_text: -if lang eq ru +if lang eq ru_RU db '',0 else db 'Start',0 end if ;----------------------------------------------------------------------------- result_table_text: -if lang eq ru +if lang eq ru_RU db ' ⥭ (/) (/)',0 else db 'Size Read (KB/s) Write (KB/s)',0 @@ -168,14 +168,14 @@ check1 check_box2 (100 shl 16)+12,(27 shl 16)+12,6,0xFFFFFF,0,0xffffff,\ check_text1,ch_flag_middle check_text1: -if lang eq ru +if lang eq ru_RU db '஢ ',0 else db 'Use testing of write',0 end if check_box_warning_text: -if lang eq ru +if lang eq ru_RU db '! ஢ઠ ᪮ 㭨⮦ ᮤন 䠩!',0 else db 'WARNING! Testing of write speed is destroy contents of file!',0 diff --git a/programs/testing/kbd/trunk/Tupfile.lua b/programs/testing/kbd/trunk/Tupfile.lua index d1e67bf9a..42f3de9af 100644 --- a/programs/testing/kbd/trunk/Tupfile.lua +++ b/programs/testing/kbd/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({"kbd.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "kbd") diff --git a/programs/testing/kbd/trunk/kbd.ASM b/programs/testing/kbd/trunk/kbd.ASM index 82e8cf2b0..cf4540756 100644 --- a/programs/testing/kbd/trunk/kbd.ASM +++ b/programs/testing/kbd/trunk/kbd.ASM @@ -234,7 +234,7 @@ bd_stat: db 0 ; 0 - nb_name dd nb_nf bd_msk dd msk_i440 -if lang eq it +if lang eq it_IT ;nb_nf db 9, 'Non trovato' nb_nf db 11, 'Non trovato' else @@ -593,7 +593,7 @@ msg_nb db 'North bridge :' msg_stat db 'Status :' .length = $ - msg_stat -if lang eq it +if lang eq it_IT msg_en db 'Abilitato ' .length = $ - msg_en msg_dis db 'Disabilitato' diff --git a/programs/testing/kbd/trunk/makefile b/programs/testing/kbd/trunk/makefile index 865eab363..f286e1c1d 100644 --- a/programs/testing/kbd/trunk/makefile +++ b/programs/testing/kbd/trunk/makefile @@ -8,10 +8,10 @@ SOURCE=${FILE}.ASM OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/testing/mgb/trunk/Tupfile.lua b/programs/testing/mgb/trunk/Tupfile.lua index 12521973e..e9c80af5f 100644 --- a/programs/testing/mgb/trunk/Tupfile.lua +++ b/programs/testing/mgb/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({"mgb.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "mgb") diff --git a/programs/testing/mgb/trunk/build.bat b/programs/testing/mgb/trunk/build.bat index 1173b0047..d1c7408dd 100644 --- a/programs/testing/mgb/trunk/build.bat +++ b/programs/testing/mgb/trunk/build.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 mgb.asm mgb @kpack mgb @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/testing/mgb/trunk/build.sh b/programs/testing/mgb/trunk/build.sh index 9f3735c05..8b83934c8 100755 --- a/programs/testing/mgb/trunk/build.sh +++ b/programs/testing/mgb/trunk/build.sh @@ -2,8 +2,8 @@ # This script does for linux the same as build.bat for DOS, # it compiles the KoOS kernel, hopefully ;-) - echo "lang fix en" - echo "lang fix en" > lang.inc + echo "lang fix en_US" + echo "lang fix en_US" > lang.inc fasm -m 16384 mgb.asm mgb rm -f lang.inc exit 0 diff --git a/programs/testing/mgb/trunk/makefile b/programs/testing/mgb/trunk/makefile index 269c327e8..e90e74ead 100644 --- a/programs/testing/mgb/trunk/makefile +++ b/programs/testing/mgb/trunk/makefile @@ -9,10 +9,10 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/testing/mgb/trunk/mgb.asm b/programs/testing/mgb/trunk/mgb.asm index 55d6d799b..9d6fc4335 100644 --- a/programs/testing/mgb/trunk/mgb.asm +++ b/programs/testing/mgb/trunk/mgb.asm @@ -872,7 +872,7 @@ TEST_REC_SIZE = 16 LINE_DESCRIPTION_CHARS = 58 TESTS_NUM = ($ - results_table) / TEST_REC_SIZE - 1 ;--------------------------------------------------------------------- -if lang eq it +if lang eq it_IT aDrawingWindow db 'Window Of Type #3, 325x400 px',0 aDrawingBar db 'Filled Rectangle, 100x250 px',0 aDrawingPicture db 'Picture, 90x123, px',0 @@ -899,7 +899,7 @@ if lang eq it aComment1 db 'Attuale test',0 aComment2 db 'previous test',0 aCommentT db 'Commenti',0 -else if lang eq ru +else if lang eq ru_RU aDrawingWindow db '⥬ ᪨, 325x400 px',0 aDrawingBar db '襭 אַ㣮쭨, 100x250 px',0 aDrawingPicture db '⨭, 90x123, px',0 @@ -959,7 +959,7 @@ system_dir_Boxlib db '/sys/lib/box_lib.obj',0 system_dir_ProcLib db '/sys/lib/proc_lib.obj',0 ;--------------------------------------------------------------------- head_f_i: -if lang eq it +if lang eq it_IT head_f_l db 'Errore Sistema',0 else head_f_l db 'System error',0 diff --git a/programs/testing/pcidev/branches/new_api/PCIDEV.ASM b/programs/testing/pcidev/branches/new_api/PCIDEV.ASM index 7fac5af62..53136558e 100644 --- a/programs/testing/pcidev/branches/new_api/PCIDEV.ASM +++ b/programs/testing/pcidev/branches/new_api/PCIDEV.ASM @@ -422,7 +422,7 @@ Form: dw 800 ; window width (no more, special for 800x600) dw 420 ; window height dw 100 ; window y start -if lang eq it +if lang eq it_IT title db 'PCI Device Enumeration v 2.1n new PCI API test', 0 PCIWin mls \ 'Ricordarsi di abilitare l accesso alla PCI per le applicazioni dal menu.',\ diff --git a/programs/testing/pcidev/branches/new_api/makefile b/programs/testing/pcidev/branches/new_api/makefile index 81a571a55..2286f2bb2 100644 --- a/programs/testing/pcidev/branches/new_api/makefile +++ b/programs/testing/pcidev/branches/new_api/makefile @@ -9,10 +9,10 @@ SOURCE=${FILE}.ASM OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/testing/pcidev/trunk/PCIDEV.ASM b/programs/testing/pcidev/trunk/PCIDEV.ASM index 1047c968d..fd2402e3a 100644 --- a/programs/testing/pcidev/trunk/PCIDEV.ASM +++ b/programs/testing/pcidev/trunk/PCIDEV.ASM @@ -743,7 +743,7 @@ Form: dw 800 ; window width (no more, special for 800x600) title db 'PCI Device Enumerator v 2.3', 0 -if lang eq it +if lang eq it_IT PCIWin mls \ ' Don`t forget to enable PCI Access to Applications in Setup Menu.',\ '',\ diff --git a/programs/testing/pcidev/trunk/Tupfile.lua b/programs/testing/pcidev/trunk/Tupfile.lua index a8e5a32f1..557ac93e0 100644 --- a/programs/testing/pcidev/trunk/Tupfile.lua +++ b/programs/testing/pcidev/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({"PCIDEV.ASM", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "PCIDEV") diff --git a/programs/testing/pcidev/trunk/build_en.bat b/programs/testing/pcidev/trunk/build_en.bat index e134938b8..36de1f3f5 100644 --- a/programs/testing/pcidev/trunk/build_en.bat +++ b/programs/testing/pcidev/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 pcidev.asm pcidev @kpack pcidev @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/testing/pcidev/trunk/makefile b/programs/testing/pcidev/trunk/makefile index d32aeb25e..f0c1c5820 100644 --- a/programs/testing/pcidev/trunk/makefile +++ b/programs/testing/pcidev/trunk/makefile @@ -9,11 +9,11 @@ SOURCE=${FILE}.ASM OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} ${KPACK} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/testing/protection/trunk/Tupfile.lua b/programs/testing/protection/trunk/Tupfile.lua index fbdce36db..711b93bb0 100644 --- a/programs/testing/protection/trunk/Tupfile.lua +++ b/programs/testing/protection/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({"test.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "test") diff --git a/programs/testing/protection/trunk/build_en.bat b/programs/testing/protection/trunk/build_en.bat index e7d243cde..b4e7af1d9 100644 --- a/programs/testing/protection/trunk/build_en.bat +++ b/programs/testing/protection/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix en >lang.inc +@echo lang fix en_US >lang.inc @fasm -m 16384 test.asm test @kpack test @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/testing/protection/trunk/build_ru.bat b/programs/testing/protection/trunk/build_ru.bat index 6be0bd460..b7cfa98f1 100644 --- a/programs/testing/protection/trunk/build_ru.bat +++ b/programs/testing/protection/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc -@echo lang fix ru >lang.inc +@echo lang fix ru_RU >lang.inc @fasm -m 16384 test.asm test @kpack test @erase lang.inc -@pause \ No newline at end of file +@pause diff --git a/programs/testing/protection/trunk/makefile b/programs/testing/protection/trunk/makefile index 2a84d6362..8b023a4e2 100644 --- a/programs/testing/protection/trunk/makefile +++ b/programs/testing/protection/trunk/makefile @@ -8,10 +8,10 @@ SOURCE=${FILE}.asm OUT=${FILE}.bin en: - echo "lang fix en" > ${LANG} + echo "lang fix en_US" > ${LANG} ${FASM} ${SOURCE} ${OUT} it: - echo "lang fix it" > ${LANG} + echo "lang fix it_IT" > ${LANG} ${FASM} ${SOURCE} ${OUT} clean: diff --git a/programs/testing/protection/trunk/test.asm b/programs/testing/protection/trunk/test.asm index cfb22d012..c60a20094 100644 --- a/programs/testing/protection/trunk/test.asm +++ b/programs/testing/protection/trunk/test.asm @@ -122,7 +122,7 @@ draw_window: ;------------------------------------------------------------------------------- ; DATA AREA ;------------------------------------------------------------------------------- -if lang eq it +if lang eq it_IT text: db 'Il programma usa 0x1000 byte di memoria ' db ' ' @@ -142,7 +142,7 @@ text: db ' ' db ' OUT 0x60,AL ' db 'x' -else if lang eq ru +else if lang eq ru_RU text: db 'ਫ ᯮ 0x1000 ' db ' ' @@ -184,10 +184,10 @@ text: db 'x' end if ;------------------------------------------------------------------------------- -if lang eq it +if lang eq it_IT tlabel: db 'Kolibri prova di protezione',0 -else if lang eq ru +else if lang eq ru_RU tlabel: db 'Kolibri ஢ઠ ',0 else @@ -202,4 +202,4 @@ align 4 stack_top: ;------------------------------------------------------------------------------- IM_END: -;------------------------------------------------------------------------------- \ No newline at end of file +;-------------------------------------------------------------------------------