diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 0587e1b5ca..0f98e776dd 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -74,7 +74,7 @@ img_files = {
 }
 
 -- For russian build, add russian-only files.
-if build_type == "rus" then tup.append_table(img_files, {
+if build_type == "ru_RU" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/rus/example.asm"},
  {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy_ru"},
  {"GAMES/BASEKURS.KLA", build_type .. "/games/basekurs.kla"},
@@ -84,7 +84,7 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAMES.INI", "rus/settings/games.ini"},
  {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "rus/settings/syspanel.ini"},
-}) elseif build_type == "eng" then tup.append_table(img_files, {
+}) elseif build_type == "en_US" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
  {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
@@ -93,7 +93,7 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
  {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
-}) elseif build_type == "sp" then tup.append_table(img_files, {
+}) elseif build_type == "es_ES" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
  {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
@@ -102,7 +102,7 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
  {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
-}) elseif build_type == "it" then tup.append_table(img_files, {
+}) elseif build_type == "it_IT" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
  {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
@@ -310,7 +310,7 @@ extra_files = {
  {"kolibrios/utils/tedit/info/HTML.SYN", VAR_PROGS .. "/other/t_edit/info/html.syn"},
  {"kolibrios/utils/tedit/info/INI.SYN", VAR_PROGS .. "/other/t_edit/info/ini_files.syn"},
  }
-if build_type == "rus" then tup.append_table(extra_files, {
+if build_type == "ru_RU" then tup.append_table(extra_files, {
  {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"},
  {"Docs/cp866/gnu.txt", build_type .. "/docs/GNU.TXT"},
  {"Docs/cp866/history.txt", build_type .. "/docs/HISTORY.TXT"},
@@ -360,7 +360,7 @@ if build_type == "rus" then tup.append_table(extra_files, {
 Files to be included in distribution kit outside of kolibri.img, but not kolibri.iso.
 Same syntax as extra_files.
 ]]--
-if build_type == "rus" then
+if build_type == "ru_RU" then
 distr_extra_files = {
  {"/readme_dos.txt", build_type .. "/distr_data/readme_dos_distr.txt"},
  {"/readme.txt", build_type .. "/distr_data/readme_distr.txt", cp1251_from = build_type .. "/distr_data/readme_dos_distr.txt"},
@@ -374,7 +374,7 @@ end
 Files to be included in kolibri.iso outside of kolibri.img, but not distribution kit.
 Same syntax as extra_files.
 ]]--
-if build_type == "rus" then
+if build_type == "ru_RU" then
 iso_extra_files = {
  {"/readme_dos.txt", build_type .. "/distr_data/readme_dos.txt"},
  {"/readme.txt", "$(VAR_DATA)/$(build_type)/distr_data/readme.txt", cp1251_from = build_type .. "/distr_data/readme_dos.txt"},
@@ -615,7 +615,7 @@ tup.append_table(extra_files, {
  {"kolibrios/utils/tedit/t_edit", VAR_PROGS .. "/other/t_edit/t_edit"},
 })
 -- For russian build, add russian-only programs.
-if build_type == "rus" then tup.append_table(img_files, {
+if build_type == "ru_RU" then tup.append_table(img_files, {
  {"PERIOD", VAR_PROGS .. "/other/period/trunk/period"},
  {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/trunk/klavisha"},
  {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
@@ -623,7 +623,7 @@ if build_type == "rus" then tup.append_table(img_files, {
  {"DEVELOP/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"},
 }) end
 
-if build_type == "rus" then tup.append_table(extra_files, {
+if build_type == "ru_RU" then tup.append_table(extra_files, {
  {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
 }) end
 
@@ -793,7 +793,7 @@ if tup.getconfig('NO_NASM') ~= 'full' then
   })
 end
 -- For russian build, add russian-only programs.
-if build_type == "rus" then tup.append_table(extra_files, {
+if build_type == "ru_RU" then tup.append_table(extra_files, {
  {"kolibrios/games/21days", VAR_PROGS .. "/games/21days/21days"},
 }) end
 end -- tup.getconfig('NO_GCC') ~= 'full'
@@ -877,16 +877,15 @@ for i,v in ipairs(img_files) do
   local_file = v[2]
   if v[1] == "KERNEL.MNT"
   then
-    -- for kernel.mnt, insert autobuild revision identifier
-    -- from .revision to .kernel.mnt
-    -- note that .revision and .kernel.mnt must begin with .
-    -- to prevent tup from tracking them
+    -- for kernel.mnt, insert autobuild commit id to .kernel.mnt
+    -- note that .kernel.mnt must begin with a dot to prevent
+    -- tup from tracking it
     cmd = "cp %f %o"
-    if tup.getconfig("INSERT_REVISION_ID") ~= ""
+    if tup.getconfig("INSERT_COMMIT_ID") ~= ""
     then
-      if build_type == "rus"
-      then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(get-current-revision)]"|iconv -f utf8 -t cp866)'
-      else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-revision)]")'
+      if build_type == "ru_RU"
+      then str='$(LANG=ru_RU.utf8 date -u +"[автосборка %d %b %Y %R, r$(get-current-cmtid)]"|iconv -f utf8 -t cp866)'
+      else str='$(date -u +"[auto-build %d %b %Y %R, r$(get-current-cmtid)]")'
       end
       str = string.gsub(str, "%$", "\\$") -- escape $ as \$
       str = string.gsub(str, "%%", "%%%%") -- escape % as %%
@@ -912,8 +911,8 @@ for i,v in ipairs(iso_extra_files) do
 end
 
 -- generate tup rule for kolibri.iso
-if tup.getconfig("INSERT_REVISION_ID") ~= ""
-then volume_id = "KolibriOS r`get-current-revision`"
+if tup.getconfig("INSERT_COMMIT_ID") ~= ""
+then volume_id = "KolibriOS r`get-current-cmtid`"
 else volume_id = "KolibriOS"
 end
 tup.definerule{inputs = input_deps, command =
diff --git a/data/ca/distr_data/readme.txt b/data/ca_ES/distr_data/readme.txt
similarity index 100%
rename from data/ca/distr_data/readme.txt
rename to data/ca_ES/distr_data/readme.txt
diff --git a/data/ca/distr_data/readme_distr.txt b/data/ca_ES/distr_data/readme_distr.txt
similarity index 100%
rename from data/ca/distr_data/readme_distr.txt
rename to data/ca_ES/distr_data/readme_distr.txt
diff --git a/data/ca/docs/CONFIG.TXT b/data/ca_ES/docs/CONFIG.TXT
similarity index 100%
rename from data/ca/docs/CONFIG.TXT
rename to data/ca_ES/docs/CONFIG.TXT
diff --git a/data/ca/docs/COPYING.TXT b/data/ca_ES/docs/COPYING.TXT
similarity index 100%
rename from data/ca/docs/COPYING.TXT
rename to data/ca_ES/docs/COPYING.TXT
diff --git a/data/ca/docs/CREDITS.TXT b/data/ca_ES/docs/CREDITS.TXT
similarity index 100%
rename from data/ca/docs/CREDITS.TXT
rename to data/ca_ES/docs/CREDITS.TXT
diff --git a/data/ca/docs/FARA.TXT b/data/ca_ES/docs/FARA.TXT
similarity index 100%
rename from data/ca/docs/FARA.TXT
rename to data/ca_ES/docs/FARA.TXT
diff --git a/data/ca/docs/HOT_KEYS.TXT b/data/ca_ES/docs/HOT_KEYS.TXT
similarity index 100%
rename from data/ca/docs/HOT_KEYS.TXT
rename to data/ca_ES/docs/HOT_KEYS.TXT
diff --git a/data/ca/docs/INI.TXT b/data/ca_ES/docs/INI.TXT
similarity index 100%
rename from data/ca/docs/INI.TXT
rename to data/ca_ES/docs/INI.TXT
diff --git a/data/ca/docs/INSTALL.TXT b/data/ca_ES/docs/INSTALL.TXT
similarity index 100%
rename from data/ca/docs/INSTALL.TXT
rename to data/ca_ES/docs/INSTALL.TXT
diff --git a/data/ca/docs/KFAR_KEYS.TXT b/data/ca_ES/docs/KFAR_KEYS.TXT
similarity index 100%
rename from data/ca/docs/KFAR_KEYS.TXT
rename to data/ca_ES/docs/KFAR_KEYS.TXT
diff --git a/data/ca/docs/MTDBG.TXT b/data/ca_ES/docs/MTDBG.TXT
similarity index 100%
rename from data/ca/docs/MTDBG.TXT
rename to data/ca_ES/docs/MTDBG.TXT
diff --git a/data/ca/docs/OPENDIAL.TXT b/data/ca_ES/docs/OPENDIAL.TXT
similarity index 100%
rename from data/ca/docs/OPENDIAL.TXT
rename to data/ca_ES/docs/OPENDIAL.TXT
diff --git a/data/ca/games/megamaze b/data/ca_ES/games/megamaze
similarity index 100%
rename from data/ca/games/megamaze
rename to data/ca_ES/games/megamaze
diff --git a/data/ca/games/soko b/data/ca_ES/games/soko
similarity index 100%
rename from data/ca/games/soko
rename to data/ca_ES/games/soko
diff --git a/data/ca/lang.inc b/data/ca_ES/lang.inc
similarity index 100%
rename from data/ca/lang.inc
rename to data/ca_ES/lang.inc
diff --git a/data/ca/settings/icon.ini b/data/ca_ES/settings/icon.ini
similarity index 100%
rename from data/ca/settings/icon.ini
rename to data/ca_ES/settings/icon.ini
diff --git a/data/ca/settings/kolibri.lbl b/data/ca_ES/settings/kolibri.lbl
similarity index 100%
rename from data/ca/settings/kolibri.lbl
rename to data/ca_ES/settings/kolibri.lbl
diff --git a/data/ca/settings/lang.ini b/data/ca_ES/settings/lang.ini
similarity index 100%
rename from data/ca/settings/lang.ini
rename to data/ca_ES/settings/lang.ini
diff --git a/data/ca/settings/menu.dat b/data/ca_ES/settings/menu.dat
similarity index 100%
rename from data/ca/settings/menu.dat
rename to data/ca_ES/settings/menu.dat
diff --git a/data/ca/tup.config b/data/ca_ES/tup.config
similarity index 100%
rename from data/ca/tup.config
rename to data/ca_ES/tup.config
diff --git a/data/eng/distr_data/readme.txt b/data/en_US/distr_data/readme.txt
similarity index 100%
rename from data/eng/distr_data/readme.txt
rename to data/en_US/distr_data/readme.txt
diff --git a/data/eng/distr_data/readme_distr.txt b/data/en_US/distr_data/readme_distr.txt
similarity index 100%
rename from data/eng/distr_data/readme_distr.txt
rename to data/en_US/distr_data/readme_distr.txt
diff --git a/data/eng/docs/CONFIG.TXT b/data/en_US/docs/CONFIG.TXT
similarity index 100%
rename from data/eng/docs/CONFIG.TXT
rename to data/en_US/docs/CONFIG.TXT
diff --git a/data/eng/docs/COPYING.TXT b/data/en_US/docs/COPYING.TXT
similarity index 100%
rename from data/eng/docs/COPYING.TXT
rename to data/en_US/docs/COPYING.TXT
diff --git a/data/eng/docs/CREDITS.TXT b/data/en_US/docs/CREDITS.TXT
similarity index 100%
rename from data/eng/docs/CREDITS.TXT
rename to data/en_US/docs/CREDITS.TXT
diff --git a/data/eng/docs/FARA.TXT b/data/en_US/docs/FARA.TXT
similarity index 100%
rename from data/eng/docs/FARA.TXT
rename to data/en_US/docs/FARA.TXT
diff --git a/data/eng/docs/HOT_KEYS.TXT b/data/en_US/docs/HOT_KEYS.TXT
similarity index 100%
rename from data/eng/docs/HOT_KEYS.TXT
rename to data/en_US/docs/HOT_KEYS.TXT
diff --git a/data/eng/docs/INI.TXT b/data/en_US/docs/INI.TXT
similarity index 100%
rename from data/eng/docs/INI.TXT
rename to data/en_US/docs/INI.TXT
diff --git a/data/eng/docs/INSTALL.TXT b/data/en_US/docs/INSTALL.TXT
similarity index 100%
rename from data/eng/docs/INSTALL.TXT
rename to data/en_US/docs/INSTALL.TXT
diff --git a/data/eng/docs/KFAR_KEYS.TXT b/data/en_US/docs/KFAR_KEYS.TXT
similarity index 100%
rename from data/eng/docs/KFAR_KEYS.TXT
rename to data/en_US/docs/KFAR_KEYS.TXT
diff --git a/data/eng/docs/MTDBG.TXT b/data/en_US/docs/MTDBG.TXT
similarity index 100%
rename from data/eng/docs/MTDBG.TXT
rename to data/en_US/docs/MTDBG.TXT
diff --git a/data/eng/docs/OPENDIAL.TXT b/data/en_US/docs/OPENDIAL.TXT
similarity index 100%
rename from data/eng/docs/OPENDIAL.TXT
rename to data/en_US/docs/OPENDIAL.TXT
diff --git a/data/eng/lang.inc b/data/en_US/lang.inc
similarity index 100%
rename from data/eng/lang.inc
rename to data/en_US/lang.inc
diff --git a/data/eng/settings/icon.ini b/data/en_US/settings/icon.ini
similarity index 100%
rename from data/eng/settings/icon.ini
rename to data/en_US/settings/icon.ini
diff --git a/data/eng/settings/kolibri.lbl b/data/en_US/settings/kolibri.lbl
similarity index 100%
rename from data/eng/settings/kolibri.lbl
rename to data/en_US/settings/kolibri.lbl
diff --git a/data/eng/settings/lang.ini b/data/en_US/settings/lang.ini
similarity index 100%
rename from data/eng/settings/lang.ini
rename to data/en_US/settings/lang.ini
diff --git a/data/eng/settings/menu.dat b/data/en_US/settings/menu.dat
similarity index 100%
rename from data/eng/settings/menu.dat
rename to data/en_US/settings/menu.dat
diff --git a/data/eng/tup.config b/data/en_US/tup.config
similarity index 100%
rename from data/eng/tup.config
rename to data/en_US/tup.config
diff --git a/data/et/distr_data/readme.txt b/data/es_ES/distr_data/readme.txt
similarity index 100%
rename from data/et/distr_data/readme.txt
rename to data/es_ES/distr_data/readme.txt
diff --git a/data/et/distr_data/readme_distr.txt b/data/es_ES/distr_data/readme_distr.txt
similarity index 100%
rename from data/et/distr_data/readme_distr.txt
rename to data/es_ES/distr_data/readme_distr.txt
diff --git a/data/et/docs/CONFIG.TXT b/data/es_ES/docs/CONFIG.TXT
similarity index 100%
rename from data/et/docs/CONFIG.TXT
rename to data/es_ES/docs/CONFIG.TXT
diff --git a/data/et/docs/COPYING.TXT b/data/es_ES/docs/COPYING.TXT
similarity index 100%
rename from data/et/docs/COPYING.TXT
rename to data/es_ES/docs/COPYING.TXT
diff --git a/data/sp/docs/CREDITS.TXT b/data/es_ES/docs/CREDITS.TXT
similarity index 100%
rename from data/sp/docs/CREDITS.TXT
rename to data/es_ES/docs/CREDITS.TXT
diff --git a/data/et/docs/FARA.TXT b/data/es_ES/docs/FARA.TXT
similarity index 100%
rename from data/et/docs/FARA.TXT
rename to data/es_ES/docs/FARA.TXT
diff --git a/data/et/docs/HOT_KEYS.TXT b/data/es_ES/docs/HOT_KEYS.TXT
similarity index 100%
rename from data/et/docs/HOT_KEYS.TXT
rename to data/es_ES/docs/HOT_KEYS.TXT
diff --git a/data/et/docs/INI.TXT b/data/es_ES/docs/INI.TXT
similarity index 100%
rename from data/et/docs/INI.TXT
rename to data/es_ES/docs/INI.TXT
diff --git a/data/et/docs/INSTALL.TXT b/data/es_ES/docs/INSTALL.TXT
similarity index 100%
rename from data/et/docs/INSTALL.TXT
rename to data/es_ES/docs/INSTALL.TXT
diff --git a/data/et/docs/KFAR_KEYS.TXT b/data/es_ES/docs/KFAR_KEYS.TXT
similarity index 100%
rename from data/et/docs/KFAR_KEYS.TXT
rename to data/es_ES/docs/KFAR_KEYS.TXT
diff --git a/data/et/docs/MTDBG.TXT b/data/es_ES/docs/MTDBG.TXT
similarity index 100%
rename from data/et/docs/MTDBG.TXT
rename to data/es_ES/docs/MTDBG.TXT
diff --git a/data/et/docs/OPENDIAL.TXT b/data/es_ES/docs/OPENDIAL.TXT
similarity index 100%
rename from data/et/docs/OPENDIAL.TXT
rename to data/es_ES/docs/OPENDIAL.TXT
diff --git a/data/sp/lang.inc b/data/es_ES/lang.inc
similarity index 100%
rename from data/sp/lang.inc
rename to data/es_ES/lang.inc
diff --git a/data/it/settings/icon.ini b/data/es_ES/settings/icon.ini
similarity index 100%
rename from data/it/settings/icon.ini
rename to data/es_ES/settings/icon.ini
diff --git a/data/sp/settings/kolibri.lbl b/data/es_ES/settings/kolibri.lbl
similarity index 100%
rename from data/sp/settings/kolibri.lbl
rename to data/es_ES/settings/kolibri.lbl
diff --git a/data/sp/settings/lang.ini b/data/es_ES/settings/lang.ini
similarity index 100%
rename from data/sp/settings/lang.ini
rename to data/es_ES/settings/lang.ini
diff --git a/data/sp/settings/menu.dat b/data/es_ES/settings/menu.dat
similarity index 100%
rename from data/sp/settings/menu.dat
rename to data/es_ES/settings/menu.dat
diff --git a/data/sp/tup.config b/data/es_ES/tup.config
similarity index 100%
rename from data/sp/tup.config
rename to data/es_ES/tup.config
diff --git a/data/sp/distr_data/readme.txt b/data/et_EE/distr_data/readme.txt
similarity index 100%
rename from data/sp/distr_data/readme.txt
rename to data/et_EE/distr_data/readme.txt
diff --git a/data/sp/distr_data/readme_distr.txt b/data/et_EE/distr_data/readme_distr.txt
similarity index 100%
rename from data/sp/distr_data/readme_distr.txt
rename to data/et_EE/distr_data/readme_distr.txt
diff --git a/data/sp/docs/CONFIG.TXT b/data/et_EE/docs/CONFIG.TXT
similarity index 100%
rename from data/sp/docs/CONFIG.TXT
rename to data/et_EE/docs/CONFIG.TXT
diff --git a/data/it/docs/COPYING.TXT b/data/et_EE/docs/COPYING.TXT
similarity index 100%
rename from data/it/docs/COPYING.TXT
rename to data/et_EE/docs/COPYING.TXT
diff --git a/data/et/docs/CREDITS.TXT b/data/et_EE/docs/CREDITS.TXT
similarity index 100%
rename from data/et/docs/CREDITS.TXT
rename to data/et_EE/docs/CREDITS.TXT
diff --git a/data/sp/docs/FARA.TXT b/data/et_EE/docs/FARA.TXT
similarity index 100%
rename from data/sp/docs/FARA.TXT
rename to data/et_EE/docs/FARA.TXT
diff --git a/data/sp/docs/HOT_KEYS.TXT b/data/et_EE/docs/HOT_KEYS.TXT
similarity index 100%
rename from data/sp/docs/HOT_KEYS.TXT
rename to data/et_EE/docs/HOT_KEYS.TXT
diff --git a/data/sp/docs/INI.TXT b/data/et_EE/docs/INI.TXT
similarity index 100%
rename from data/sp/docs/INI.TXT
rename to data/et_EE/docs/INI.TXT
diff --git a/data/sp/docs/INSTALL.TXT b/data/et_EE/docs/INSTALL.TXT
similarity index 100%
rename from data/sp/docs/INSTALL.TXT
rename to data/et_EE/docs/INSTALL.TXT
diff --git a/data/sp/docs/KFAR_KEYS.TXT b/data/et_EE/docs/KFAR_KEYS.TXT
similarity index 100%
rename from data/sp/docs/KFAR_KEYS.TXT
rename to data/et_EE/docs/KFAR_KEYS.TXT
diff --git a/data/sp/docs/MTDBG.TXT b/data/et_EE/docs/MTDBG.TXT
similarity index 100%
rename from data/sp/docs/MTDBG.TXT
rename to data/et_EE/docs/MTDBG.TXT
diff --git a/data/it/docs/OPENDIAL.TXT b/data/et_EE/docs/OPENDIAL.TXT
similarity index 100%
rename from data/it/docs/OPENDIAL.TXT
rename to data/et_EE/docs/OPENDIAL.TXT
diff --git a/data/et/lang.inc b/data/et_EE/lang.inc
similarity index 100%
rename from data/et/lang.inc
rename to data/et_EE/lang.inc
diff --git a/data/et/settings/icon.ini b/data/et_EE/settings/icon.ini
similarity index 100%
rename from data/et/settings/icon.ini
rename to data/et_EE/settings/icon.ini
diff --git a/data/et/settings/kolibri.lbl b/data/et_EE/settings/kolibri.lbl
similarity index 100%
rename from data/et/settings/kolibri.lbl
rename to data/et_EE/settings/kolibri.lbl
diff --git a/data/et/settings/lang.ini b/data/et_EE/settings/lang.ini
similarity index 100%
rename from data/et/settings/lang.ini
rename to data/et_EE/settings/lang.ini
diff --git a/data/et/settings/menu.dat b/data/et_EE/settings/menu.dat
similarity index 100%
rename from data/et/settings/menu.dat
rename to data/et_EE/settings/menu.dat
diff --git a/data/et/tup.config b/data/et_EE/tup.config
similarity index 100%
rename from data/et/tup.config
rename to data/et_EE/tup.config
diff --git a/data/it/distr_data/readme.txt b/data/it_IT/distr_data/readme.txt
similarity index 100%
rename from data/it/distr_data/readme.txt
rename to data/it_IT/distr_data/readme.txt
diff --git a/data/it/distr_data/readme_distr.txt b/data/it_IT/distr_data/readme_distr.txt
similarity index 100%
rename from data/it/distr_data/readme_distr.txt
rename to data/it_IT/distr_data/readme_distr.txt
diff --git a/data/it/docs/CONFIG.TXT b/data/it_IT/docs/CONFIG.TXT
similarity index 100%
rename from data/it/docs/CONFIG.TXT
rename to data/it_IT/docs/CONFIG.TXT
diff --git a/data/sp/docs/COPYING.TXT b/data/it_IT/docs/COPYING.TXT
similarity index 100%
rename from data/sp/docs/COPYING.TXT
rename to data/it_IT/docs/COPYING.TXT
diff --git a/data/it/docs/CREDITS.TXT b/data/it_IT/docs/CREDITS.TXT
similarity index 100%
rename from data/it/docs/CREDITS.TXT
rename to data/it_IT/docs/CREDITS.TXT
diff --git a/data/it/docs/FARA.TXT b/data/it_IT/docs/FARA.TXT
similarity index 100%
rename from data/it/docs/FARA.TXT
rename to data/it_IT/docs/FARA.TXT
diff --git a/data/it/docs/HOT_KEYS.TXT b/data/it_IT/docs/HOT_KEYS.TXT
similarity index 100%
rename from data/it/docs/HOT_KEYS.TXT
rename to data/it_IT/docs/HOT_KEYS.TXT
diff --git a/data/it/docs/INI.TXT b/data/it_IT/docs/INI.TXT
similarity index 100%
rename from data/it/docs/INI.TXT
rename to data/it_IT/docs/INI.TXT
diff --git a/data/it/docs/INSTALL.TXT b/data/it_IT/docs/INSTALL.TXT
similarity index 100%
rename from data/it/docs/INSTALL.TXT
rename to data/it_IT/docs/INSTALL.TXT
diff --git a/data/it/docs/KFAR_KEYS.TXT b/data/it_IT/docs/KFAR_KEYS.TXT
similarity index 100%
rename from data/it/docs/KFAR_KEYS.TXT
rename to data/it_IT/docs/KFAR_KEYS.TXT
diff --git a/data/it/docs/MTDBG.TXT b/data/it_IT/docs/MTDBG.TXT
similarity index 100%
rename from data/it/docs/MTDBG.TXT
rename to data/it_IT/docs/MTDBG.TXT
diff --git a/data/sp/docs/OPENDIAL.TXT b/data/it_IT/docs/OPENDIAL.TXT
similarity index 100%
rename from data/sp/docs/OPENDIAL.TXT
rename to data/it_IT/docs/OPENDIAL.TXT
diff --git a/data/it/lang.inc b/data/it_IT/lang.inc
similarity index 100%
rename from data/it/lang.inc
rename to data/it_IT/lang.inc
diff --git a/data/sp/settings/icon.ini b/data/it_IT/settings/icon.ini
similarity index 100%
rename from data/sp/settings/icon.ini
rename to data/it_IT/settings/icon.ini
diff --git a/data/it/settings/kolibri.lbl b/data/it_IT/settings/kolibri.lbl
similarity index 100%
rename from data/it/settings/kolibri.lbl
rename to data/it_IT/settings/kolibri.lbl
diff --git a/data/it/settings/lang.ini b/data/it_IT/settings/lang.ini
similarity index 100%
rename from data/it/settings/lang.ini
rename to data/it_IT/settings/lang.ini
diff --git a/data/it/settings/menu.dat b/data/it_IT/settings/menu.dat
similarity index 100%
rename from data/it/settings/menu.dat
rename to data/it_IT/settings/menu.dat
diff --git a/data/it/tup.config b/data/it_IT/tup.config
similarity index 100%
rename from data/it/tup.config
rename to data/it_IT/tup.config
diff --git a/data/rus/File Managers/fNav/About.txt b/data/ru_RU/File Managers/fNav/About.txt
similarity index 100%
rename from data/rus/File Managers/fNav/About.txt
rename to data/ru_RU/File Managers/fNav/About.txt
diff --git a/data/rus/File Managers/kfar.ini b/data/ru_RU/File Managers/kfar.ini
similarity index 100%
rename from data/rus/File Managers/kfar.ini
rename to data/ru_RU/File Managers/kfar.ini
diff --git a/data/rus/distr_data/readme_dos.txt b/data/ru_RU/distr_data/readme_dos.txt
similarity index 100%
rename from data/rus/distr_data/readme_dos.txt
rename to data/ru_RU/distr_data/readme_dos.txt
diff --git a/data/rus/distr_data/readme_dos_distr.txt b/data/ru_RU/distr_data/readme_dos_distr.txt
similarity index 100%
rename from data/rus/distr_data/readme_dos_distr.txt
rename to data/ru_RU/distr_data/readme_dos_distr.txt
diff --git a/data/rus/docs/CONFIG.TXT b/data/ru_RU/docs/CONFIG.TXT
similarity index 100%
rename from data/rus/docs/CONFIG.TXT
rename to data/ru_RU/docs/CONFIG.TXT
diff --git a/data/rus/docs/CREDITS.TXT b/data/ru_RU/docs/CREDITS.TXT
similarity index 100%
rename from data/rus/docs/CREDITS.TXT
rename to data/ru_RU/docs/CREDITS.TXT
diff --git a/data/rus/docs/GNU.TXT b/data/ru_RU/docs/GNU.TXT
similarity index 100%
rename from data/rus/docs/GNU.TXT
rename to data/ru_RU/docs/GNU.TXT
diff --git a/data/rus/docs/GROBFAR.TXT b/data/ru_RU/docs/GROBFAR.TXT
similarity index 100%
rename from data/rus/docs/GROBFAR.TXT
rename to data/ru_RU/docs/GROBFAR.TXT
diff --git a/data/rus/docs/HISTORY.TXT b/data/ru_RU/docs/HISTORY.TXT
similarity index 100%
rename from data/rus/docs/HISTORY.TXT
rename to data/ru_RU/docs/HISTORY.TXT
diff --git a/data/rus/docs/HOT_KEYS.TXT b/data/ru_RU/docs/HOT_KEYS.TXT
similarity index 100%
rename from data/rus/docs/HOT_KEYS.TXT
rename to data/ru_RU/docs/HOT_KEYS.TXT
diff --git a/data/rus/docs/INI.TXT b/data/ru_RU/docs/INI.TXT
similarity index 100%
rename from data/rus/docs/INI.TXT
rename to data/ru_RU/docs/INI.TXT
diff --git a/data/rus/docs/INSTALL.TXT b/data/ru_RU/docs/INSTALL.TXT
similarity index 100%
rename from data/rus/docs/INSTALL.TXT
rename to data/ru_RU/docs/INSTALL.TXT
diff --git a/data/rus/docs/KFAR_KEYS.TXT b/data/ru_RU/docs/KFAR_KEYS.TXT
similarity index 100%
rename from data/rus/docs/KFAR_KEYS.TXT
rename to data/ru_RU/docs/KFAR_KEYS.TXT
diff --git a/data/rus/docs/MTDBG.TXT b/data/ru_RU/docs/MTDBG.TXT
similarity index 100%
rename from data/rus/docs/MTDBG.TXT
rename to data/ru_RU/docs/MTDBG.TXT
diff --git a/data/rus/docs/OPENDIAL.TXT b/data/ru_RU/docs/OPENDIAL.TXT
similarity index 100%
rename from data/rus/docs/OPENDIAL.TXT
rename to data/ru_RU/docs/OPENDIAL.TXT
diff --git a/data/rus/docs/guide/faq.htm b/data/ru_RU/docs/guide/faq.htm
similarity index 100%
rename from data/rus/docs/guide/faq.htm
rename to data/ru_RU/docs/guide/faq.htm
diff --git a/data/rus/docs/guide/guide.htm b/data/ru_RU/docs/guide/guide.htm
similarity index 100%
rename from data/rus/docs/guide/guide.htm
rename to data/ru_RU/docs/guide/guide.htm
diff --git a/data/rus/docs/guide/hardware_support.htm b/data/ru_RU/docs/guide/hardware_support.htm
similarity index 100%
rename from data/rus/docs/guide/hardware_support.htm
rename to data/ru_RU/docs/guide/hardware_support.htm
diff --git a/data/rus/games/appdata.dat b/data/ru_RU/games/appdata.dat
similarity index 100%
rename from data/rus/games/appdata.dat
rename to data/ru_RU/games/appdata.dat
diff --git a/data/rus/games/basekurs.kla b/data/ru_RU/games/basekurs.kla
similarity index 100%
rename from data/rus/games/basekurs.kla
rename to data/ru_RU/games/basekurs.kla
diff --git a/data/rus/games/descent b/data/ru_RU/games/descent
similarity index 100%
rename from data/rus/games/descent
rename to data/ru_RU/games/descent
diff --git a/data/rus/games/whowtbam b/data/ru_RU/games/whowtbam
similarity index 100%
rename from data/rus/games/whowtbam
rename to data/ru_RU/games/whowtbam
diff --git a/data/rus/lang.inc b/data/ru_RU/lang.inc
similarity index 100%
rename from data/rus/lang.inc
rename to data/ru_RU/lang.inc
diff --git a/data/rus/settings/games.ini b/data/ru_RU/settings/games.ini
similarity index 100%
rename from data/rus/settings/games.ini
rename to data/ru_RU/settings/games.ini
diff --git a/data/rus/settings/icon.ini b/data/ru_RU/settings/icon.ini
similarity index 100%
rename from data/rus/settings/icon.ini
rename to data/ru_RU/settings/icon.ini
diff --git a/data/rus/settings/kolibri.lbl b/data/ru_RU/settings/kolibri.lbl
similarity index 100%
rename from data/rus/settings/kolibri.lbl
rename to data/ru_RU/settings/kolibri.lbl
diff --git a/data/rus/settings/lang.ini b/data/ru_RU/settings/lang.ini
similarity index 100%
rename from data/rus/settings/lang.ini
rename to data/ru_RU/settings/lang.ini
diff --git a/data/rus/settings/menu.dat b/data/ru_RU/settings/menu.dat
similarity index 100%
rename from data/rus/settings/menu.dat
rename to data/ru_RU/settings/menu.dat
diff --git a/data/rus/settings/syspanel.ini b/data/ru_RU/settings/syspanel.ini
similarity index 100%
rename from data/rus/settings/syspanel.ini
rename to data/ru_RU/settings/syspanel.ini
diff --git a/data/rus/tup.config b/data/ru_RU/tup.config
similarity index 100%
rename from data/rus/tup.config
rename to data/ru_RU/tup.config
diff --git a/programs/games/LaserTank/trunk/Tupfile.lua b/programs/games/LaserTank/trunk/Tupfile.lua
index 6c70ca5f0e..7db0c33cd3 100644
--- a/programs/games/LaserTank/trunk/Tupfile.lua
+++ b/programs/games/LaserTank/trunk/Tupfile.lua
@@ -1,7 +1,7 @@
 if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_MSVC") ~= "" then return end
 HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_msvc.lua")
-if tup.getconfig("LANG") == "ru"
+if tup.getconfig("LANG") == "ru_RU"
 then CFLAGS = CFLAGS .. " /DLANG=RUS"
 else CFLAGS = CFLAGS .. " /DLANG=ENG"
 end