Fixed get os version in SHELL

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>

.editorconfig

@@ -1,21 +0,0 @@
-# https://EditorConfig.org
-
-root = true
-
-[*]
-# charset = utf-8 # not system wide, just in the kernel
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
-end_of_line = lf
-insert_final_newline = true
-
-[*.{asm,inc}]
-indent_size = 8
-
-[kernel/**.{asm,inc}]
-charset = utf-8
-
-[*.{bat,cmd}]
-# Prefer Windows line endings
-end_of_line = crlf

.gitea/workflows/build.yaml

@@ -1,213 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-# SPDX-FileCopyrightText: 2025 KolibriOS team
-
-name: 'Build system'
-
-on:
-  pull_request:
-    branches:
-      - 'main'
-
-jobs:
-  codestyle:
-    name: "Check kernel codestyle"
-    runs-on: kolibri-toolchain
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Check codestyle
-        run: |
-          find kernel/trunk -iname '*.asm' -or -iname '*.inc' -exec bash -c "echo {}; cat {} | perl .gitea/workflows/checker.pl" \;
-
-  build:
-    name: 'Build'
-    runs-on: kolibri-toolchain
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Get describe
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITEA_OUTPUT
-
-      - name: Get toolchain hash
-        id: toolchain-hash
-        run: |
-          a=$(find ${{ gitea.workspace }}/programs/develop/cmm/ -type f -print0 | sort -z | xargs -0 sha1sum)
-          b=$(sha1sum ${{ gitea.workspace }}/programs/develop/ktcc/trunk/bin/kos32-tcc)
-          c=$(find ${{ gitea.workspace }}/programs/develop/objconv/ -type f -print0 | sort -z | xargs -0 sha1sum)
-          d=$(find ${{ gitea.workspace }}/programs/other/kpack/kerpack_linux/ -type f -print0 | sort -z | xargs -0 sha1sum)
-          e=$(find ${{ gitea.workspace }}/programs/other/kpack/linux/ -type f -print0 | sort -z | xargs -0 sha1sum)
-          f=$(find ${{ gitea.workspace }}/programs/develop/clink/ -type f -print0 | sort -z | xargs -0 sha1sum)
-          echo hash=$(echo $a $b $c $d $e $f | sha1sum | awk '{print $1}') >> $GITEA_OUTPUT
-
-      - name: Restore toolchain
-        id: cache-toolchain
-        uses: actions/cache/restore@v4
-        with:
-          path: /home/autobuild
-          key: kolibri-toolchain-${{ steps.toolchain-hash.outputs.hash }}
-
-      - name: Build and install C--
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-        run: |
-          cd ${{ gitea.workspace }}/programs/develop/cmm/
-          make -f Makefile.lin32
-          chmod +x c--
-          mv c-- /home/autobuild/tools/win32/bin/c--
-          cp ${{ gitea.workspace }}/programs/cmm/c--/c--.ini /home/autobuild/tools/win32/bin/c--.ini
-          make -f Makefile.lin32 clean
-
-      - name: Install TCC
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-        run: |
-          cp ${{ gitea.workspace }}/programs/develop/ktcc/trunk/bin/kos32-tcc /home/autobuild/tools/win32/bin/kos32-tcc
-          chmod +x /home/autobuild/tools/win32/bin/kos32-tcc
-
-      - name: Build and install objconv
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-        run: |
-          cd ${{ gitea.workspace }}/programs/develop/objconv/
-          g++ -o /home/autobuild/tools/win32/bin/objconv -O2 *.cpp
-          chmod +x /home/autobuild/tools/win32/bin/objconv
-
-      - name: Build and install kerpack
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-        run: |
-          cd ${{ gitea.workspace }}/programs/other/kpack/kerpack_linux/
-          make
-          chmod +x kerpack
-          mv kerpack /home/autobuild/tools/win32/bin/.
-
-      - name: Build and install kpack
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-        run: |
-          cd ${{ gitea.workspace }}/programs/other/kpack/linux/
-          bash build.sh
-          chmod +x kpack
-          mv kpack /home/autobuild/tools/win32/bin/.
-
-      - name: Build and install clink
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-        run: |
-          cd ${{ gitea.workspace }}/programs/develop/clink
-          gcc main.c -o clink
-          chmod a+x clink
-          mv clink /home/autobuild/tools/win32/bin/clink
-
-      - name: Prepare cache folder
-        run: |
-          rm /home/autobuild
-          mv /root/autobuild /home/autobuild
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-
-      - name: Save toolchain
-        if: steps.cache-toolchain.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: /home/autobuild
-          key: kolibri-toolchain-${{ steps.toolchain-hash.outputs.hash }}
-
-      - name: Configure tup
-        run: |
-          cd ${{ gitea.workspace }}
-
-          export ROOT=${{ gitea.workspace }}
-          echo "CONFIG_KPACK_CMD= && kpack --nologo %o"                                   | tee en_US.config ru_RU.config es_ES.config
-          echo "CONFIG_KERPACK_CMD= && kerpack %o"                                        | tee -a en_US.config ru_RU.config es_ES.config
-          echo "CONFIG_PESTRIP_CMD= && EXENAME=%o fasm $ROOT/data/common/pestrip.asm %o"  | tee -a en_US.config ru_RU.config es_ES.config
-          echo "CONFIG_NO_MSVC=full"                                                      | tee -a en_US.config ru_RU.config es_ES.config
-          echo "CONFIG_INSERT_REVISION_ID=1"                                              | tee -a en_US.config ru_RU.config es_ES.config
-
-          tup -v
-          tup init
-
-          # Configure en_US
-          echo "CONFIG_LANG=en_US"       >> en_US.config
-          echo "CONFIG_BUILD_TYPE=en_US" >> en_US.config
-          tup variant en_US.config
-
-          # Configure ru_RU
-          echo "CONFIG_LANG=ru_RU"       >> ru_RU.config
-          echo "CONFIG_BUILD_TYPE=ru_RU" >> ru_RU.config
-          tup variant ru_RU.config
-          
-          # Configure es_ES
-          echo "CONFIG_LANG=es_ES"       >> es_ES.config
-          echo "CONFIG_BUILD_TYPE=es_ES" >> es_ES.config
-          tup variant es_ES.config
-
-      # -------------------------- Build en_US ------------------------- #
-      - name: (en_US) Build KolibriOS
-        run: |
-          export PATH=/home/autobuild/tools/win32/bin:$PATH
-          tup build-en_US
-
-      - name: (en_US) Upload floppy image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-en_US-${{ steps.vars.outputs.sha_short }}.img
-          path: build-en_US/data/kolibri.img
-
-      - name: (en_US) Upload CD image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-en_US-${{ steps.vars.outputs.sha_short }}.iso
-          path: build-en_US/data/kolibri.iso
-
-      - name: (en_US) Upload raw image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-en_US-${{ steps.vars.outputs.sha_short }}.raw
-          path: build-en_US/data/kolibri.raw
-
-      # -------------------------- Build ru_RU ------------------------- #
-      - name: (ru_RU) Build KolibriOS
-        run: |
-          export PATH=/home/autobuild/tools/win32/bin:$PATH
-          tup build-ru_RU
-
-      - name: (ru_RU) Upload floppy image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-ru_RU-${{ steps.vars.outputs.sha_short }}.img
-          path: build-ru_RU/data/kolibri.img
-
-      - name: (ru_RU) Upload CD image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-ru_RU-${{ steps.vars.outputs.sha_short }}.iso
-          path: build-ru_RU/data/kolibri.iso
-
-      - name: (ru_RU) Upload raw image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-ru_RU-${{ steps.vars.outputs.sha_short }}.raw
-          path: build-ru_RU/data/kolibri.raw
-
-      # -------------------------- Build es_ES ------------------------- #
-      - name: (es_ES) Build KolibriOS
-        run: |
-          export PATH=/home/autobuild/tools/win32/bin:$PATH
-          tup build-es_ES
-
-      - name: (es_ES) Upload floppy image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-es_ES-${{ steps.vars.outputs.sha_short }}.img
-          path: build-es_ES/data/kolibri.img
-
-      - name: (es_ES) Upload CD image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-es_ES-${{ steps.vars.outputs.sha_short }}.iso
-          path: build-es_ES/data/kolibri.iso
-
-      - name: (es_ES) Upload raw image
-        uses: actions/upload-artifact@v3
-        with:
-          name: kolibrios-es_ES-${{ steps.vars.outputs.sha_short }}.raw
-          path: build-es_ES/data/kolibri.raw

.gitea/workflows/install_kgcc

@@ -1,82 +0,0 @@
-#!/bin/bash
-
-# SPDX-License-Identifier: GPL-2.0-only
-# SPDX-FileCopyrightText: 2025 KolibriOS Team
-
-# Written by mxlgv (Maxim Logaev)
-# Installation steps described by maxcodehack (Maxim Kuzmitsky)
-
-set -e
-
-print_msg(){
-    echo -e "\e[34m$1\e[0m"
-}
-
-print_ok(){
-    echo -e "\e[32m$1\e[0m"
-}
-
-print_err(){
-    echo -e "\e[31m$1\e[0m"
-    exit
-}
-
-check_utils(){
-    printf "%s: " $1
-    if command -v $1 &> /dev/null
-    then
-        print_ok "ok\r"
-    else
-        print_err "no\r"
-    fi
-}
-
-print_msg "Checking utilities..."
-
-check_utils wget
-check_utils 7z
-
-print_msg "Create the /home/autobuild folder..."
-sudo rm -rf ~/autobuild /home/autobuild
-mkdir -p ~/autobuild/tools
-sudo ln -sf  ~/autobuild /home/autobuild
-print_ok "Successfully!"
-
-print_msg "Download the kos32-gcc toolchain..."
-wget http://ftp.kolibrios.org/users/Serge/new/Toolchain/x86_64-linux-kos32-5.4.0.7z -O ~/autobuild/tools/kos32-toolchain.7z
-print_ok "Successfully!"
-
-print_msg "Extracting files ..."
-cd ~/autobuild/tools/
-7z x -y kos32-toolchain.7z
-rm -rf kos32-toolchain.7z
-print_ok "Successfully!"
-
-print_msg "Downloading libisl..."
-cd /tmp
-sudo wget http://board.kolibrios.org/download/file.php?id=8301libisl.so.10.2.2.7z -O /tmp/libisl.so.10.2.2.7z
-sudo 7z x -y libisl.so.10.2.2.7z
-
-if ! [ -d /usr/lib/x86_64-linux-gnu/ ]; then
-    sudo mkdir -p /usr/lib/x86_64-linux-gnu/
-fi
-
-print_msg "Fixing libisl..."
-sudo mv /tmp/libisl.so.10.2.2 /usr/lib/x86_64-linux-gnu/libisl.so.10.2.2
-sudo ln -sf /usr/lib/x86_64-linux-gnu/libisl.so.10.2.2 /usr/lib/x86_64-linux-gnu/libisl.so.10
-sudo ln -sf /usr/lib/x86_64-linux-gnu/libisl.so.10.2.2 /usr/lib/libisl.so.10
-sudo chmod go-w /usr/lib/x86_64-linux-gnu/libisl.so.10 
-sudo chmod go-w /usr/lib/x86_64-linux-gnu/libisl.so.10.2.2
-print_ok "Successfully!"
-
-print_msg "Fixing libmpfr..."
-sudo ln -sf /usr/lib/x86_64-linux-gnu/libmpfr.so.6 /usr/lib/x86_64-linux-gnu/libmpfr.so.4
-sudo ln -sf /usr/lib/libmpfr.so.6 /usr/lib/libmpfr.so.4
-print_ok "Successfully!"
-
-if ! grep -q 'export PATH=$PATH:/home/autobuild/tools/win32/bin' ~/.bashrc; then
-  export PATH=$PATH:/home/autobuild/tools/win32/bin
-  print_msg "Adding '/home/autobuild/tools/win32/bin' to '~/.bashrc'"
-  echo 'export PATH=$PATH:/home/autobuild/tools/win32/bin' >> ~/.bashrc
-fi
-print_ok "Installation was successful!"

.gitignore

@@ -1,11 +0,0 @@
-### Windows ###
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-### macOS ###
-.DS_Store
-._*
-programs/cmm/cmm.code-workspace
-programs/cmm/menu/.gitignore

build.txt

@@ -31,11 +31,10 @@ A1. Fine. You will need a corresponding compiler, obviously.
     If the compiler produces an error "file not found" regarding 'lang.inc',
     the program can be compiled using different languages of interface.
     Create a file 'lang.inc' in the same folder as <input.asm> like follows:
-        lang fix en_US
+        lang fix en
     Here the last word selects the language. Valid languages are
-    en_US, ru_RU, et_EE, it_IT, es_ES, ca_ES. Not all programs provide all
-    translations, en_US should always be available, ru_RU is the most frequent
-    after en_US.
+    en, ru, et, it, sp. Not all programs provide all translations,
+    en should always be available, ru is the most frequent after en.
 
   * For a NASM program, get NASM at http://www.nasm.us/.
     To compile, find the main .asm file of the program and run
@@ -43,7 +42,7 @@ A1. Fine. You will need a corresponding compiler, obviously.
     Multi-language is rarely supported in this category, but you could still
     see sometimes an error "file not found" regarding 'lang_nasm.inc'. If so,
     create a file 'lang_nasm.inc' in the same folder as <input.asm> like follows:
-        %define lang 'en_US'
+        %define lang 'en'
     Read the entry about fasm for description of valid languages.
 
   * For a c-- program, try to avoid compiling it and instead rewrite the code

contrib/other/jumpnbump/Tupfile.lua

@@ -4,15 +4,14 @@ tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 tup.include(HELPERDIR .. "/use_sdl_newlib.lua")
 
-SDK_DIR_CWD = tup.getcwd() .. "/../../sdk"
-SDK_DIR_VAR = tup.getvariantdir() .. "/../../sdk"
+SDK_DIR = "../../sdk"
 
 CFLAGS = CFLAGS .. " -Dstricmp=strcasecmp -DZLIB_SUPPORT -Dstrnicmp=strncasecmp -DUSE_SDL -DNDEBUG -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32"
-INCLUDES = INCLUDES .. " -I. -I " .. SDK_DIR_CWD .. "/sources/zlib"
-LDFLAGS = LDFLAGS .. " -L" .. tup.getvariantdir() .. "/sdl --subsystem native"
+INCLUDES = INCLUDES .. " -I. -I " .. SDK_DIR .. "/sources/zlib"
+LDFLAGS = LDFLAGS .. " -Lsdl --subsystem native"
 LIBS = "-ls -lz.dll " .. LIBS
 
-table.insert(LIBDEPS, SDK_DIR_VAR .. "/lib/<libz.dll.a>")
+table.insert(LIBDEPS, SDK_DIR .. "/lib/<libz.dll.a>")
 table.insert(LIBDEPS, "sdl/<libs>")
 
 compile_gcc{"filter.c", "fireworks.c", "main.c", "menu.c", "stub.c"}

contrib/other/udcli/Tupfile.lua

@@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-LDFLAGS = LDFLAGS .. " -L" .. tup.getvariantdir() .. "/libudis86"
+LDFLAGS = LDFLAGS .. " -Llibudis86"
 LIBS = "-ludis86 " .. LIBS
 table.insert(LIBDEPS, "libudis86/<libudis86>")
 INCLUDES = INCLUDES .. " -Ilibudis86"

contrib/sdk/sources/SDL-1.2.2_newlib/src/Tupfile.lua

@@ -28,7 +28,7 @@ FOLDERS = {
 for i,v in ipairs(FOLDERS) do
   compile_gcc(v .. "*.c", v .. "%B.o")
   tup.append_table(OBJS,
-    tup.foreach_rule(v .. "*.asm", "nasm -f coff -Ihermes/ -o %o %f", v .. "%B.o")
+    tup.foreach_rule(v .. "*.asm", "nasm -f coff -Ihermes -o %o %f", v .. "%B.o")
   )
 end
 tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../../lib/libSDLn.a", "../../../lib/<libSDLn>"})

contrib/sdk/sources/newlib/libc/Tupfile.lua

@@ -1,6 +1,6 @@
 if tup.getconfig("NO_GCC") ~= "" or tup.getconfig("NO_FASM") ~= "" then return end
 tup.include("../../../../../programs/use_gcc.lua")
-SDK_DIR = tup.getvariantdir() .. "/../../.."
+SDK_DIR = "../../.."
 CFLAGS =  "-c -O2 -fno-builtin -fno-ident -fomit-frame-pointer -DMISSING_SYSCALL_NAMES"
 LDFLAGS = "-shared -s -T libcdll.lds --out-implib " .. SDK_DIR .. "/lib/libc.dll.a --image-base 0"
 -- LDFLAGS = LDFLAGS .. " --output-def libc.orig.def"

contrib/sdk/sources/newlib/libc/include/sys/ksys.h

@@ -406,7 +406,7 @@ KOSAPI int __strcmp(const char* s1, const char* s2)
 }
 
 /* ####################################################################### */
-/* ############### С wrappers for system calls KolibriOS ################# */
+/* ############### С wrappers for system calls Kolibri OS ################ */
 /* ####################################################################### */
 
 /*=============== Function -1 - terminate thread/process ===============*/
@@ -1223,10 +1223,10 @@ KOSAPI void _ksys_debug_puts(const char* s)
 KOSAPI void ksys_draw_bitmap_palette(void* bitmap, int x, int y, int w, int h, int bpp, void* palette, int offset)
 {
     asm_inline(
-        "pushl %%ebp\n\t"               // save EBP register
-        "movl 0x24(%%ebp), %%ebp\n\t"   // 0x24 - "offset" param
+        "pushl %%ebp,\n\t"            // save EBP register
+        "movl 0x24(%%ebp), %%ebp\n\t" // 0x24 - "offset" param
         "int $0x40\n\t"
-        "popl %%ebp"    // restore EBP register
+        "popl %%ebp" // restore EBP register
         :
         : "a"(65),
         "b"(bitmap),

contrib/sdk/sources/sqlite3/Tupfile.lua

@@ -3,9 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-VAR_LIB = tup.getvariantdir() .. "/../../lib"
-
-LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib " .. VAR_LIB .. "/libsqlite3.dll.a -L" .. VAR_LIB
+LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib ../../lib/libsqlite3.dll.a -L../../lib "
 
 CFLAGS = CFLAGS .. " -U__MINGW32__ -UWIN32 -UWindows -U_WINDOWS -U_WIN32 -U__WIN32__ -U_WIN32 -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=0 -DHAVE_DLFCN_H=0  -DHAVE_FDATASYNC=0 -DHAVE_USLEEP=0 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_EDITLINE_READLINE_H=1 -DHAVE_EDITLINE=1 -DHAVE_ZLIB_H=1 -I. -D_REENTRANT=1 -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY -DSQLITE_HAVE_ZLIB=1 -DSQLITE_OS_OTHER=1 -USQLITE_OS_WIN_H -DSQLITE_TEMP_STORE=3 -D_NO_STDERR "
 
@@ -14,5 +12,5 @@ compile_gcc{"sqlite3.c", "kolibri_vfs.c"}
 
 OBJS.extra_inputs = {"../../lib/<libc.dll.a>", "../../lib/<libdll.a>"}
 
-tup.rule(OBJS, "kos32-ld sqlite3.def" .. LDFLAGS ..  " -o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
+tup.rule(OBJS, "kos32-ld sqlite3.def" .. LDFLAGS ..  "-o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
   {"../../bin/sqlite3.dll", extra_outputs = {"../../lib/libsqlite3.dll.a", "../../lib/<libsqlite3.dll.a>"}})

contrib/sdk/sources/sqlite3/shell/Tupfile.lua

@@ -6,14 +6,14 @@ end
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-INCLUDES += " -I .. "
+INCLUDES= INCLUDES .. " -I .. "
 
-CFLAGS += " -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DSQLITE_OS_OTHER=1 -DHAVE_UNISTD_H=0 -D_NO_STDERR -DSQLITE_OMIT_POPEN -DSQLITE_THREADSAFE=0 -D_KOLIBRI -DSQLITE_OMIT_VIRTUALTABLE -U__linux__ -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\""
+CFLAGS = CFLAGS .. " -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DSQLITE_OS_OTHER=1 -DHAVE_UNISTD_H=0 -D_NO_STDERR -DSQLITE_OMIT_POPEN -DSQLITE_THREADSAFE=0 -D_KOLIBRI -DSQLITE_OMIT_VIRTUALTABLE -U__linux__ -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\""
 
-LDFLAGS += " --subsystem console "
+LDFLAGS = LDFLAGS .. " --subsystem console "
 
-table.insert(LIBDEPS, "../../../lib/<libsqlite3.dll.a>")
-LIBS += " -L" .. tup.getvariantdir() .. "/../../../lib -lsqlite3.dll"
+table.insert(LIBDEPS,"../../../lib/<libsqlite3.dll.a>")
+LIBS = LIBS .. " -lsqlite3.dll" 
 
 -- Compile --
 compile_gcc{ 
@@ -22,3 +22,6 @@ compile_gcc{
 
 -- Link --
 link_gcc("sqlite3")
+
+
+ 

contrib/sdk/sources/zlib/Tupfile.lua

@@ -3,15 +3,14 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-VAR_LIB = tup.getvariantdir() .. "/../../lib"
-
-LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib " .. VAR_LIB .. "/libz.dll.a -L" .. VAR_LIB
+LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib ../../lib/libz.dll.a -L../../lib "
 
 CFLAGS = CFLAGS .. " -DHAVE_UNISTD_H -U_Win32 -U_WIN32 -U__MINGW32__"
 
 compile_gcc{"adler32.c", "compress.c", "crc32.c", "deflate.c", "gzclose.c", "gzlib.c", "gzread.c", "gzwrite.c", "infback.c", "inffast.c", "inflate.c", "inftrees.c", "trees.c", "uncompr.c", "zutil.c"}
+--tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libz.a", "../../lib/<libz>"})
 
 OBJS.extra_inputs = {"../../lib/<libc.dll.a>", "../../lib/<libdll.a>"}
 
-tup.rule(OBJS, "kos32-ld zlib.def " .. LDFLAGS ..  " -o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
+tup.rule(OBJS, "kos32-ld zlib.def" .. LDFLAGS ..  "-o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
   {"../../bin/libz.dll", extra_outputs = {"../../lib/libz.dll.a", "../../lib/<libz.dll.a>"}})

data/ca/docs/HOT_KEYS.TXT

@@ -0,0 +1,16 @@
+The following "hot" shortcut keys are used in the system:
+(Indexing on time of appearance in the system)
+1) Ctrl + Alt + Del start of the application CPU (the manager of processes), is a sole combination maintained on a level of a kernel, all rest "hot" key is realized at the expense of the application @TASKBAR.
+2) Ctrl + Shift - switching of keyboard layout.
+3) Win - start of the application MENU.
+4) Alt + Ctrl + F12 - start of the application END.
+5) Alt + F4 - terminate the active application.
+6) Alt + Tab - switch to the next (in the window stack) window
+7) Alt + Shift + Tab - switch to the previous (in the window stack) window
+8) Alt + Shift + NumLock - start of the application MOUSEMUL, which emulates mouse with numpad, when NumLock is on.
+9) Alt + 1...7 - fast switching to the selected keyboard layout (even if absent for Ctrl + Shift)
+10) Win + D - minimize/restore all windows (cleaning of desktop)
+11) Win + R - start of the application RUN
+12) Alt + Ctrl + ArrowLeft - to scroll back a list of the taskbar
+13) Alt + Ctrl + ArrowRight - to scroll forward a list of the taskbar
+14) Ctrl + PrintScreen - start of the application SCRSHOOT. Just do a screen shot and the user is offered to specify (with OpenDialog) where to save the BMP image.

data/ca/docs/INSTALL.TXT

@@ -0,0 +1,109 @@
+Minimal system requirements for Kolibri 0.7.x.0:
+* CPU: Pentium, AMD 5x86 or Cyrix 5x86 without MMX with frequency 100 MHz
+* RAM: 8 Mb
+* Videocard: supporting VGA (640*480*16 mode) or Vesa
+* Keyboard: AT
+* Mouse: COM or PS/2
+
+The system can boot from any of following devices:
+- Floppy 3.5
+- IDE HDD LBA
+- CD/DVD
+- USB Flash
+
+I. Install to floppy.
+  1) Insert clean floppy without bad sectors to drive.
+  2) Write to it kolibri.img image with any available methods:
+    a) (if you have already loaded Kolibri by any method) run the program
+       rdsave and select the variant corresponding to floppy
+    b) (for DOS and Windows) run subjoined install.bat
+    c) with program WinImage or its analogue (e.g. DiskExplorer)
+    d) (for Linux) set "executable" attribute to subjoined script install.sh
+       and run it
+Now you can boot from floppy (keep it in drive, reboot, set in BIOS option
+of floppy booting).
+
+II. Install to hard disk.
+There exists several loaders from hard disk. All are oriented on DOS and
+Windows users. Also standard Linux-loader GRUB can be used. All methods work
+with file kolibri.img. If you already have old version of Kolibri installed,
+simply replace kolibri.img to new. If you have booted from LiveCD, which
+does not contain the file kolibri.img, Kolibri can create it independently,
+to do this, run the program rdsave, enter the file name for saving and select
+the corresponding variant. Of course, in this case Kolibri must be able to
+write to file system of selected partitions, currently this means that
+only FAT volumes are ok.
+1) Most of all features has the loader mtldr (author - Diamond) - works with
+   DOS/Win95/98/NT/2k/XP/Vista, supports FAT32 and NTFS, has installator, can
+   be installed to any folder on disk.
+   To install, simply run file HD_load\mtldr_install.exe and select image file.
+   Apropos, by this way you can install several images. There is also
+   variant of install by hand - for those who want to know what installator
+   does: directions in HD_load\mtldr
+2) There is also the loader MeOSLoad (author - Trans, expanded by Mario79) -
+   works with DOS/Win95/98, supports FAT32, it is placed with the instruction
+   to the folder HD_load\MeOSLoad.
+3) Moreover, there exist a program which allow load Kolibri directly from
+   Windows 95/98/Me (of course, unloading it) - 9x2klbr (author - Diamond),
+   supports FAT32 and NTFS.
+4) Usage of the loader GRUB. The way of using file 'memdisk' to load Kolibri
+   has been described by derPENGUIN on english forum
+   (http://meos32.7.forumer.com/viewtopic.php?t=110).
+   The suggested method (described by Alver) is based on that description
+   and was checked on grub-0.97-19mdv2007.0.
+   1. Kolibri can write only on FAT filesystem, so if image file is placed not
+      to FAT volume, the system can not save settings. Therefore if you have
+      FAT32 partition, place 'kolibri.img' there.
+   2. This method requires the file 'memdisk' from the package 'syslinux'
+      (http://syslinux.zytor.com). You may install the whole package or only
+      extract the mentioned file. Only the file 'memdisk' is needed. (After
+      package install it will be in '/usr/lib/syslinux').
+   3. Place the file 'memdisk' to the folder 'boot' or to the partition used
+      for Kolibri.
+   4. Add to the configuration file 'menu.lst' ('grub.conf') lines as follow:
+
+      title KolibriOS
+      kernel (hd[Hard disk number],[partition number])[path]/memdisk
+      initrd (hd[Hard disk number],[partition number])[path]/kolibri.img
+
+      (Remember that numeration of partitions in GRUB starts from 0.)
+      Example:
+      title KolibriOS
+      kernel (hd0,0)/boot/memdisk
+      initrd (hd0,3)/kolibri/kolibri.img
+
+      The initial variant was:
+
+      label KolibriOS
+      root (hd[Hard disk number],[partition number])
+      kernel [path]/memdisk
+      initrd [path]/kolibri.img
+
+      Here 'memdisk' and 'kolibri.img' must be placed on the same partition.
+
+      Example:
+      label KolibriOS
+      root (hd0,0)
+      kernel /boot/memdisk
+      initrd /boot/kolibri.img
+      This example is the variant described on english forum, with install to
+      Linux boot partition (of course, without FAT partition).
+
+5) The previous method could not work as is in GRUB2 (tested by Apocalypse_dn),
+   the commands "linux16" and "initrd16" should be used instead of "kernel"
+   and "initrd" (suggested by vkos).
+
+III. Install to USB-Flash-drive.
+The special loader for FAT32-volumes has been written, it and its installer
+to flash drive can be found in the folder HD_load\USB_Boot.
+For not-FAT32 drives you may use article placed in the folder
+HD_load\USB_Boot_old.
+
+IV. Install to CD and DVD.
+There exists special LiveCD-version of Kolibri, which contains
+in addition to standard things some "heavy" (in Kolibri standards) programs:
+the ported emulator DosBox, games "Fixed Rate Pig" and "sokoban".
+You can also create bootable CD or DVD on the base of kolibri.img, adding
+anything what you want, in the mode of floppy emulation.
+The appropriate actions are determined by used CD/DVD write program
+(focus on words such as "boot floppy emulation").

data/ca/lang.inc

@@ -0,0 +1 @@
+lang fix ca

data/ca/settings/icon.ini

@@ -0,0 +1,230 @@
+[rbmenu]
+Processes=cpu
+Themes=desktop
+Background=/sys/media/palitra
+Device setup=setup
+Shell=shell
+[00]
+name=KFM2
+path=/SYS/FILE MANAGERS/KFM2
+param=
+ico=3
+x=0
+y=0
+[01]
+name=TINYPAD
+path=TINYPAD
+param=
+ico=9
+x=0
+y=68
+[02]
+name=EOLITE
+path=/SYS/FILE MANAGERS/EOLITE
+param=
+ico=1
+x=68
+y=0
+[03]
+name=SHELL
+path=SHELL
+param=
+ico=2
+x=136
+y=0
+[04]
+name=KFAR
+path=/SYS/FILE MANAGERS/KFAR
+param=
+ico=16
+x=68
+y=68
+[05]
+name=RDSAVE
+path=RDSAVE
+param=
+ico=17
+x=0
+y=136
+[06]
+name=FB2READ
+path=FB2READ
+param=
+ico=44
+x=68
+y=136
+[07]
+name=ANIMAGE
+path=/SYS/MEDIA/ANIMAGE
+param=
+ico=15
+x=136
+y=68
+[08]
+name=KPACK
+path=KPACK
+param=
+ico=10
+x=-67
+y=0
+[09]
+name=SNAKE
+path=/SYS/GAMES/SNAKE
+param=
+ico=32
+x=-135
+y=-135
+[0A]
+name=MINE
+path=/SYS/GAMES/MINE
+param=
+ico=14
+x=-67
+y=-67
+[0B]
+name=SEAWAR
+path=/SYS/GAMES/SW
+param=
+ico=66
+x=-135
+y=-67
+[0C]
+name=MBLOCKS
+path=/SYS/GAMES/MBLOCKS
+param=
+ico=11
+x=-67
+y=-135
+[0D]
+name=PONG
+path=/SYS/GAMES/PONG3
+param=
+ico=12
+x=-203
+y=-67
+[0E]
+name=15
+path=/SYS/GAMES/15
+param=
+ico=34
+x=-271
+y=-67
+[0F]
+name=DOCPACK
+path=DOCPACK
+param=
+ico=8
+x=-67
+y=68
+[10]
+name=BOARD
+path=/SYS/DEVELOP/BOARD
+param=
+ico=19
+x=-135
+y=0
+[11]
+name=HEXEDIT
+path=/SYS/DEVELOP/HEED
+param=
+ico=22
+x=-135
+y=136
+[12]
+name=DEBUG
+path=/SYS/DEVELOP/MTDBG
+param=
+ico=39
+x=-203
+y=0
+[13]
+name=PIPES
+path=/SYS/GAMES/PIPES
+param=
+ico=26
+x=0
+y=-135
+[14]
+name=SUDOKU
+path=/SYS/GAMES/SUDOKU
+param=
+ico=25
+x=0
+y=-67
+[15]
+name=GOMOKU
+path=/SYS/GAMES/GOMOKU
+param=
+ico=24
+x=68
+y=-67
+[16]
+name=XONIX
+path=/SYS/GAMES/XONIX
+param=
+ico=21
+x=68
+y=-135
+[17]
+name=FLAPPY-BIRD
+path=/SYS/GAMES/FLPYBIRD
+param=
+ico=49
+x=-271
+y=-135
+[18]
+name=KOSILKA
+path=/SYS/GAMES/KOSILKA
+param=
+ico=23
+x=136
+y=-67
+[19]
+name=FLOOD-IT
+path=/SYS/GAMES/FLOOD-IT
+param=
+ico=59
+x=136
+y=-135
+[1A]
+name=FASM
+path=/SYS/DEVELOP/FASM
+param=
+ico=10
+x=-135
+y=68
+[1B]
+name=CLICKS
+path=/SYS/GAMES/CLICKS
+param=
+ico=18
+x=-203
+y=-135
+[1C]
+name=WEBVIEW
+path=/sys/NETWORK/WebView
+param=
+ico=31
+x=136
+y=136
+[1D]
+name=SYSPANEL
+path=SYSPANEL
+param=
+ico=6
+x=-67
+y=136
+[1E]
+name=CALC
+path=CALC
+param=
+ico=4
+x=-203
+y=68
+[1F]
+name=APP+
+path=app_plus
+param=
+ico=27
+x=-203
+y=136

data/ca/settings/kolibri.lbl

@@ -1,7 +1,9 @@
 KolibriOS
 version 0770
 svnr 4483
-language it_IT
+language ca
 
 ;just comment
 ; Hi, curious person! :-)
+; Thanks
+; 08/01/2016 Creating lang català

data/ca/settings/menu.dat

@@ -0,0 +1,128 @@
+#0    **** Principal ****
+58 Welcome               |welcome.htm
+00 2D Demos           >  |@1
+00 3D Demos           >  |@2
+00 Gr<47>fics            >  |@3
+00 Multim<69>dia         >  |@4
+00 Emuladors          >  |@15
+00 Desenvolupament    >  |@5
+00 Sistema            >  |@7
+00 Proc<6F>s de dades    >  |@9
+00 Xarxa              >  |@10
+00 Altres             >  |@13
+23 Centre de jocs        |allgames
+60 System panel          |syspanel
+18 Ajuda                 |docpack
+53 Executar aplicaci<63>    |run
+04 Aturar                |end
+#1    **** DEMOS ****
+16 Cercle                |demos/circle
+16 Fractal               |demos/tinyfrac
+16 Color demo            |demos/colorref
+16 Ulls                  |demos/eyes
+16 Tub                   |demos/tube
+16 Plasma                |demos/plasma
+16 Spiral                |demos/spiral
+16 Retrocedir            |demos/movback
+16 Vida                  |demos/life2
+16 TranTest              |demos/trantest
+16 WEB                   |demos/web
+16 FireWork              |demos/firework
+16 UnvWater              |demos/unvwater
+#2  **** 3D ****
+15 Protector de pantalla |3d/crownscr
+15 3D-laberint           |3d/free3d04
+15 Cor                   |3d/3dsheart
+15 VeureDS               |3d/view3ds
+15 CubeLine              |3d/cubeline
+15 Engranatges           |3d/gears
+15 zona ondulada-3D      |3d/3dwav
+#3   **** GR<47>FICS ****
+06 Visor d'imatges KIV   |media/kiv
+06 Visor d'imatges zSea  |/kolibrios/media/zsea/zsea
+38 Animage               |media/animage
+38 IconEdit              |media/iconedit
+40 Efectes d'imatges     |media/imgf/imgf
+52 Palitra               |media/palitra
+39 Pipet                 |develop/pipet
+#4   **** MULTIM<49>DIA ****
+53 Pixie - audio         |media/pixie
+07 MidAMP                |media/midamp
+22 Toy piano             |media/piano
+52 Generador de fons     |media/palitra
+11 Fplay - video      *  |/kolibrios/media/fplay
+#5    **** DESARROLLO ****
+00 Exemples           >  |@6
+09 Arxivador KPack       |kpack
+54 Assemblador Flat      |develop/fasm
+13 Panell de depuraci<63>   |develop/board
+16 Depurador             |develop/mtdbg
+34 Hex2Dec2Bin           |develop/h2d2b
+59 Taula de car<61>cters    |develop/ASCIIVju
+59 Codis ASCII           |develop/keyascii
+59 Codis SCAN            |develop/scancode
+#6    **** EXEMPLES ****
+16 Threads               |develop/thread
+16 Selector de color     |demos/cslide
+16 Exemple de consola 1  |develop/testcon2
+16 Exemple de consola 2  |develop/test_gets
+16 Exemple Missatge caixa|demos/use_mb
+#7    **** SISTEMA ****
+00 Arxius             >  |@8
+00 Accesibilitat      >  |@14
+13 Panell depuraci<63>      |develop/board
+56 Clipboard viewer      |develop/clipview
+24 Terminal              |terminal
+24 SHELL                 |shell
+51 Virtual disks         |tmpdisk
+05 Guardar imatge RD     |rdsave
+#8  **** ARCHIUS ****
+24 KFAR                  |File Managers/kfar
+05 KFM2                  |File Managers/kfm2
+50 Eolite                |File Managers/Eolite
+20 fNav                * |/kolibrios/utils/fNav/fNav
+#9 **** PROC<4F>S DE DADES ****
+16 Calculadora           |calc
+03 Tinypad               |tinypad
+28 TextEdit              |develop/cedit
+21 Procesador de tables  |table
+47 Generador de gr<67>fique |graph
+59 Hex-Editor            |develop/heed
+09 Unarchiver Unz        |unz
+#10    **** XARXA ****
+00 Servidors         >   |@11
+00 Clients           >   |@12
+25 Dispositius de xarxa  |network/netcfg
+25 Estat de la xarxa     |network/netstat
+#11    **** SERVIDORS ****
+16 Dimoni FTP            |network/ftpd
+#12   **** CLIENTS ****
+13 Client IRC            |network/ircc
+16 Client FTP            |network/ftpc
+50 Cliente TFTP          |network/tftpc
+24 Ping                  |network/ping
+24 Client Telnet         |network/telnet
+24 Client Synergy        |network/synergyc
+24 Resoluci<63><69> de noms    |network/nslookup
+61 VNC Viewer            |network/vncc
+33 Client de baixades    |network/downloader
+12 Navegador (mode text) |network/webview
+#13    **** ALTRES ****
+16 Rellotge anal<61>gic     |aclock
+16 Rellotge binari       |demos/bcdclk
+16 Contador              |timer
+45 Capturador de pantalla|scrshoot
+45 Easyshot              |easyshot
+16 Calendari             |calendar
+03 Lector de RTF         |rtfread
+#14    **** ACCESIBILITAT ****
+49 Ampliaci<63> de pantalla |magnify
+59 Teclat en pantalla    |zkey
+#15    **** EMULADORS ****
+24 DOSBox             *  |/kolibrios/emul/DosBox/dosbox
+16 e80 (ZX Spectrum)  *  |/kolibrios/emul/e80/e80
+23 Gameboy Color      *  |/kolibrios/emul/gameboy
+23 FCE Ultra (NES)    *  |/kolibrios/emul/fceu/fceu
+23 ZSNES              *  |/kolibrios/emul/zsnes/zsnes
+16 ScummVM            *  |/kolibrios/emul/scummvm
+##

data/ca/tup.config

@@ -0,0 +1 @@
+CONFIG_LANG=ca

data/common/File Managers/icons.ini

@@ -3,165 +3,165 @@
 <up>=1
 <lot>=20
 mnt=2
+txt=3
+rtf=3
+log=3
 dic=3
 doc=3
 docx=3
 exc=3
-inf=3
-log=3
-ob07=3
-odt=3
-rtf=3
-txt=3
 wtx=3
-h=4
+inf=3
+odt=3
+ob07=3
 inc=4
+c=14
+h=4
+img=5
+ima=5
+imz=5
 bwz=5
 dsk=5
-ima=5
-img=5
-imz=5
 vfd=5
 wil=5
 wlz=5
-ani=6
-bmp=6
-cr2=6
-crw=6
-cur=6
-dcr=6
-dcx=6
-dib=6
-djv=6
-djvu=6
-fpx=6
-gif=6
-ico=6
-iff=6
-ilbm=6
-iw4=6
-j2c=6
-j2k=6
-jfif=6
-jif=6
-jp2=6
-jpc=6
+jpg=6
 jpe=6
 jpeg=6
-jpg=6
-jpk=6
+jif=6
+jfif=6
+jp2=6
 jpx=6
-lbm=6
-mrw=6
-nef=6
-orf=6
+jpk=6
+j2k=6
+jpc=6
+j2c=6
+bmp=6
+dib=6
+rle=6
 pbm=6
-pcd=6
-pct=6
-pcx=6
-pef=6
 pgm=6
-pic=6
-pict=6
-pix=6
-png=6
 pnm=6
+wbm=6
+wbmp=6
+xbm=6
+xpm=6
+gif=6
+png=6
+ico=6
+cur=6
+ani=6
+tif=6
+tiff=6
+xif=6
+tga=6
+pcx=6
+xcf=6
+dcx=6
 ppm=6
 psd=6
 psp=6
-raf=6
-ras=6
 raw=6
-rle=6
-tga=6
-tif=6
-tiff=6
-wbm=6
-wbmp=6
+raf=6
 x3f=6
-xbm=6
-xcf=6
-xif=6
-xpm=6
+orf=6
+nef=6
+mrw=6
+dcr=6
+crw=6
+cr2=6
+ras=6
+pix=6
+pict=6
+pct=6
+pic=6
+pef=6
+pcd=6
+iff=6
+lbm=6
+ilbm=6
+fpx=6
+djv=6
+djvu=6
+iw4=6
+wav=7
+mp3=7
+xm=7
+mid=22
+midi=22
 aif=7
 aifc=7
 aiff=7
 au=7
-mp3=7
 snd=7
-wav=7
-wm=7
 wma=7
-xm=7
-com=8
+wm=7
 exe=8
+com=8
 7z=9
-arj=9
-bz=9
-bz2=9
+rar=9
+zip=9
 cab=9
-gz=9
-ice=9
+arj=9
 lha=9
 lzh=9
-rar=9
 tar=9
 taz=9
 tbz=9
 tbz2=9
+bz=9
+bz2=9
+ice=9
+gz=9
 tgz=9
-uu=9
 uue=9
+uu=9
 xxe=9
 z=9
-zip=9
 ini=10
-3gp=11
 avi=11
-flv=11
-mkv=11
-mov=11
-mp4=11
+mpg=11
 mpe=11
 mpeg=11
-mpg=11
+flv=11
+3gp=11
+mkv=11
+wmv=11
+mov=11
+mp4=11
 vob=11
 webm=11
-wmv=11
-eml=12
 htm=12
 html=12
 mht=12
+eml=12
 url=12
-c=14
 cpp=14
 js=14
 json=14
+lif=15
 3ds=15
 asc=15
-bjs=15
-lif=15
-stl=15
 vox=15
+stl=15
+bjs=15
 kex=16
 skn=17
-dll=18
-drv=18
 obj=18
+dll=18
 ocx=18
 so=18
-cue=19
+drv=18
 iso=19
+cue=19
 mdf=19
 csv=21
 xls=21
 xlsx=21
-mid=22
-midi=22
-min=23
 nes=23
-sna=23
 snes=23
+sna=23
+min=23
 bat=24
 sh=24
 sys=25
@@ -178,14 +178,14 @@ ob7=29
 grf=47
 mgb=47
 ch8=48
-css=52
 dtp=52
+css=52
 pal=52
+ttf=59
+ttc=59
 chr=59
 kf=59
 mt=59
-ttc=59
-ttf=59
 cfg=60
 scr=61
 com=63
@@ -195,8 +195,9 @@ com=63
 <dir>=45
 <up>=45
 <lot>=60
-bat=1
 com=1
+bat=1
+sh=55
 exe=2
 img=3
 ini=5
@@ -207,51 +208,51 @@ xlsx=28
 vox=30
 htm=31
 html=31
-mht=31
 url=31
+mht=31
 sys=38
-3gp=40
 avi=40
-flv=40
-mkv=40
-mov=40
-mp4=40
+mpg=40
 mpe=40
 mpeg=40
-mpg=40
+flv=40
+3gp=40
+mkv=40
+wmv=40
+mov=40
+mp4=40
 vob=40
 webm=40
-wmv=40
 fb2=44
 asm=55
 log=55
-sh=55
-mp3=64
 wav=64
+mp3=64
 xm=64
+png=70
+jpg=70
+jpeg=70
 bmp=70
 gif=70
-jpeg=70
-jpg=70
 pcx=70
-png=70
 pdf=73
 mid=74
 midi=74
+mid=74
+midi=74
 3ds=78
 stl=78
+zip=89
+7z=89
+obj=92
+dll=92
 skn=80
 kex=88
-7z=89
-zip=89
-dll=92
-obj=92
 kf=118
 mgb=121
-docx=122
-rtf=122
 txt=122
-
+rtf=122
+docx=122
 
 [drives16]
 r=58
@@ -262,7 +263,6 @@ b=50
 u=57
 c=19
 
-
 [drives32]
 r=49
 f=3

data/common/distr_data/autorun.inf

@@ -1,2 +1,2 @@
 [AutoRun]
-icon=kolibrios.ico
+icon=KolibriOS_icon.ico

data/common/settings/app_plus.ini

@@ -27,6 +27,7 @@ Guide=network/webview|/kolibrios/res/guide/guide.htm,92
 DosBox=/k/emul/dosbox/dosbox,11
 Dicty=/k/utils/DICTY.KEX,79
 fNav=/k/utils/fNav/fNav,93
+TextEdit=/k/utils/tedit/t_edit,58
 CncEditor=/k/utils/cnc_editor/cnc_editor,15
 Life=/k/demos/life2,13
 Calc+=/k/utils/calcplus,4
@@ -35,4 +36,5 @@ THashView=/k/utils/thashview,124
 Notes=/k/utils/notes,117
 Table=table,28
 FtpClient=network/ftpc,90
+Quark=/k/utils/quark,85
 

data/common/settings/assoc.ini

@@ -67,9 +67,15 @@ icon=98
 exec=/kolibrios/utils/thashview
 icon=124
 
-[FASM]
-exec=/sys/develop/fasm
-icon=10
+[TextEdit]
+exec=/kolibrios/utils/tedit/t_edit
+icon=9
+next=$CodeEdit
+
+[Quark]
+exec=/kolibrios/utils/quark
+icon=85
+next=$TinyPad
 
 [TinyPad]
 exec=/sys/tinypad
@@ -79,7 +85,7 @@ next=$TextEditor
 [Assoc]
 /=/sys/file managers/eolite
 
-kf=/kolibrios/utils/kf_view
+kf=/sys/KF_VIEW
 
 txt=$CodeEdit
 log=$CodeEdit
@@ -94,11 +100,11 @@ lua=$CodeEdit
 ob07=$CodeEdit
 json=$CodeEdit
 
-asm=$CodeEdit
-inc=$CodeEdit
-mac=$CodeEdit
-inf=$CodeEdit
-conf=$CodeEdit
+asm=$TinyPad
+inc=$TinyPad
+mac=$TinyPad
+inf=$TinyPad
+conf=$TinyPad
 
 ini=$TextEditor
 

data/common/settings/games.ini

@@ -16,7 +16,6 @@ Freecell=games/freecell,68
 Pong=games/pong,101
 Pong3=games/pong3,12
 Arcanii=/kg/arcanii,12
-Dino=games/dino,129
 
 [Arcade]
 LaserTank=/kg/lasertank/lasertank,72

data/common/templates/shell_misc.sh

@@ -7,7 +7,7 @@ sleep 200
 
 echo 
 echo ==============
-echo running palitra
+echo runing palitra
 echo ==============
 
 /sys/media/palitra H 00AEC3D8 003A95BF
@@ -20,7 +20,7 @@ sleep 200
 
 echo 
 echo ==============
-echo running fillscr
+echo runing fillscr
 echo ==============
 
 /sys/media/fillscr 105,145,200, 105,145,200, 105,145,200, 60,60,128, 82,102,164, 60,60,128, 60,60,128, 60,60,128, 60,60,128
@@ -29,7 +29,7 @@ sleep 200
 
 echo 
 echo ==============
-echo running @notify
+echo runing @notify
 echo ==============
 
 /sys/@notify "Hello, I am a @notify app!"

data/en_US/lang.inc

@@ -1 +0,0 @@
-lang fix en_US