diff --git a/kernel/trunk/boot/ETFONT.FNT b/kernel/trunk/boot/ETFONT.FNT
new file mode 100644
index 0000000000..ca248381dc
Binary files /dev/null and b/kernel/trunk/boot/ETFONT.FNT differ
diff --git a/kernel/trunk/boot/bootcode.inc b/kernel/trunk/boot/bootcode.inc
index b59ed3a454..b70cde2fe9 100644
--- a/kernel/trunk/boot/bootcode.inc
+++ b/kernel/trunk/boot/bootcode.inc
@@ -330,6 +330,13 @@ if lang eq ru
         mov  ax,1100h
           int  10h
  ; End set VGA russian font
+else if lang eq et
+        mov  bp,ET_FNT-10000h   ; ET_FNT1
+        mov  bx,1000h           ; 
+        mov  cx,255             ; 256 symbols
+        mov  dx,0h              ; 0 - position of first symbol
+        mov  ax,1100h
+        int  10h
 end if
 
 ; draw frames
@@ -822,6 +829,12 @@ if lang eq ru
     jz    @f
     mov    cl, 'ë'
 @@:    mov    [time_str+9-0x10000], cl
+else if lang eq et
+    cmp    al, 1
+    ja     @f
+    mov    [time_str+9-0x10000], ' '
+    mov    [time_str+10-0x10000],' '
+@@: 
 else
 ; wait 5/4/3/2 seconds, 1 second
     cmp    al, 1
diff --git a/kernel/trunk/boot/bootet.inc b/kernel/trunk/boot/bootet.inc
index a66ca28287..b042aba56c 100644
--- a/kernel/trunk/boot/bootet.inc
+++ b/kernel/trunk/boot/bootet.inc
@@ -94,7 +94,7 @@ prnotfnd  db      "Fataalne - Videoreziimi ei leitud.",0
 ;modena    db      "Fataalne - VBE 0x112+ on vajalik.",0
 not386    db      "Fataalne - CPU 386+ on vajalik.",0
 btns      db      "Fataalne - Ei suuda värvisügavust määratleda.",0
-fatalsel  db      "Fataalne - Graafiline reziimi riistvara ei toeta.",0
+fatalsel  db      "Fataalne - Graafilist reziimi riistvara ei toeta.",0
 badsect   db      13,10,186," Fataalne - Vigane sektor. Asenda diskett.",0
 memmovefailed db  13,10,186," Fataalne - Int 0x15 liigutamine ebaõnnestus.",0
 okt       db      " ... OK"
@@ -106,7 +106,7 @@ boot_dev  db      0  ; 0=floppy, 1=hd
 start_msg db      "Vajuta [abcd] seadete muutmiseks, vajuta [Enter] laadimise jätkamiseks",13,10,0
 time_msg  db      " või oota "
 time_str  db      " 5 sekundit"
-          db      " automaatset jatkamist",13,10,0
+          db      " automaatseks jätkamiseks",13,10,0
 current_cfg_msg db "Praegused seaded:",13,10,0
 curvideo_msg db   " [a] Videoreziim: ",0
 mode1     db      "640x480",0
@@ -131,4 +131,4 @@ pdm2      db      "C:\kolibri.img (FAT32)",13,10,0
 pdm3      db      "kasuta juba laaditud kujutist",13,10,0
 loading_msg db    "Laadin KolibriOS...",0
 save_quest db     "Jäta meelde praegused seaded? [y/n]: ",0
-loader_block_error db "Alglaaduri andmed vigased, ei saa järkata. Peatatud.",0
+loader_block_error db "Alglaaduri andmed vigased, ei saa jätkata. Peatatud.",0
diff --git a/kernel/trunk/boot/et.inc b/kernel/trunk/boot/et.inc
new file mode 100644
index 0000000000..f03bc292b6
--- /dev/null
+++ b/kernel/trunk/boot/et.inc
@@ -0,0 +1,6 @@
+; Full ASCII code font
+; only õ and ä added
+; Kaitz
+ET_FNT:
+ fontfile file "ETFONT.FNT"
+
diff --git a/kernel/trunk/kernel16.inc b/kernel/trunk/kernel16.inc
index 1e36d23523..e69bd79df8 100644
--- a/kernel/trunk/kernel16.inc
+++ b/kernel/trunk/kernel16.inc
@@ -26,7 +26,11 @@ else
 include "boot/bootge.inc"      ; german system boot messages
 ;!!!
 end if
+if lang eq et
+include "boot/et.inc"          ; Estonian font
+else
 include "boot/ru.inc"          ; Russian font
+end if
 org $-0x10000
 
 include "boot/bootcode.inc"    ; 16 bit system boot code
diff --git a/programs/system/desktop/trunk/build_et.bat b/programs/system/desktop/trunk/build_et.bat
new file mode 100644
index 0000000000..61355c85cb
--- /dev/null
+++ b/programs/system/desktop/trunk/build_et.bat
@@ -0,0 +1,5 @@
+@erase lang.inc
+@echo lang fix et >lang.inc
+@fasm desktop.asm desktop
+@erase lang.inc
+@pause
\ No newline at end of file
diff --git a/programs/system/desktop/trunk/desktop.asm b/programs/system/desktop/trunk/desktop.asm
index 05cb00cf6b..d16d6ff23a 100644
--- a/programs/system/desktop/trunk/desktop.asm
+++ b/programs/system/desktop/trunk/desktop.asm
@@ -986,35 +986,54 @@ lsz text,\
     en,  ' WINDOW WORK AREA GRAPH         ',\
     en,  '                                ',\
     en,  '  LOAD    SAVE                  ',\
-    en,  'x'
-
+    en,  'x',\
+    et,  ' AKNA RAAM                      ',\
+    et,  ' AKNA HAARAMISE RIBA            ',\
+    et,  ' AKNA HAARAMISE NUPP            ',\
+    et,  ' AKNA HAARAMISE NUPU TEKST      ',\
+    et,  ' AKNA HAARAMISE PEALKIRI        ',\
+    et,  ' AKNA TÖÖPIIRKOND               ',\
+    et,  ' AKNA TÖÖPIIRKONNA NUPP         ',\
+    et,  ' AKNA TÖÖPIIRKONNA NUPPU TEKST  ',\
+    et,  ' AKNA TÖÖPIIRKONNA TEKST        ',\
+    et,  ' AKNA TÖÖPIIRKONNA GRAAFIKA     ',\
+    et,  '                                ',\
+    et,  '  LAADI SALVESTA                ',\
+    et,  'x'
 
 lsz t1,\
     ru, '  3D   ‹Ž‘Šˆ…   ˆŒ…ˆ’œ ',\
-    en, '  3D   FLAT    APPLY  '
+    en, '  3D   FLAT    APPLY  ',\
+    et, '  3D   LAME   KINNITA '
 
 lsz t2,\
     ru,  ' ‡€ƒ“‡ˆ’œ   ˆŒ…ˆ’œ ',\
     en,  '  LOAD     APPLY  ',\
+    et,  '  LAADI   KINNITA '
 
 lsz caption_text,\
     ru, '‡ £®«®¢®ª',\
-    en, 'Caption'
+    en, 'Caption',\
+    et, 'Pealkiri'
 
 sz  close_text,'x'
 
 lsz window_text,\
     ru, '’¥ªáâ ¢ ®ª­¥',\
-    en, 'Window text'
+    en, 'Window text',\
+    et, 'Akna tekst'
 
 lsz button_text,\
     ru, '’¥ªáâ ­  ª­®¯ª¥',\
-    en, 'Button text'
+    en, 'Button text',\
+    et, 'Nupu tekst'
 
 sz  default_skn, '/RD/1/DEFAULT.SKN',0
 
 if lang eq ru
   header db '€‘’Ž‰Š€ ŽŠŽ',0
+else if lang eq et
+  header db 'AKNA SEADED - VALI VÄRV JA VAJUTA OBJEKTILE',0
 else
   header db 'WINDOWS SETTINGS - DEFINE COLOR AND CLICK ON TARGET',0
 end if
diff --git a/programs/system/end/trunk/build_et.bat b/programs/system/end/trunk/build_et.bat
new file mode 100644
index 0000000000..aaae9b444d
--- /dev/null
+++ b/programs/system/end/trunk/build_et.bat
@@ -0,0 +1,5 @@
+@erase lang.inc
+@echo lang fix et >lang.inc
+@fasm end.asm end
+@erase lang.inc
+@pause
\ No newline at end of file
diff --git a/programs/system/end/trunk/end.asm b/programs/system/end/trunk/end.asm
index e29b0a0823..13e0c36d18 100644
--- a/programs/system/end/trunk/end.asm
+++ b/programs/system/end/trunk/end.asm
@@ -188,6 +188,20 @@ else if lang eq en
       db   '  RESTART         CANCEL'
   label3_len = $ - label3
 
+else if lang eq et
+
+  label1:
+      db   '  VALI:'
+  label1_len = $ - label1
+
+  label2:
+      db   'LÜLITA VÄLJA     KERNEL'
+  label2_len = $ - label2
+
+  label3:
+      db   '  RESTART         TÜHISTA'
+  label3_len = $ - label3
+
 else 
 
   label1: