diff --git a/programs/develop/tinypad/trunk/build_et.bat b/programs/develop/tinypad/trunk/build_et.bat
index e06dd44a13..b18635cb6d 100644
--- a/programs/develop/tinypad/trunk/build_et.bat
+++ b/programs/develop/tinypad/trunk/build_et.bat
@@ -1,5 +1,5 @@
 @erase lang.inc
 @echo lang fix et >lang.inc
-@fasm tinypad.asm tinypad.bin
+@fasm tinypad.asm tinypad
 @erase lang.inc
 @pause
\ No newline at end of file
diff --git a/programs/develop/tinypad/trunk/tp-locale.inc b/programs/develop/tinypad/trunk/tp-locale.inc
index 947715733b..7b976c5673 100644
--- a/programs/develop/tinypad/trunk/tp-locale.inc
+++ b/programs/develop/tinypad/trunk/tp-locale.inc
@@ -145,9 +145,9 @@ popup_res mm.Options,\
   et,'Välimus...'	     ,'',Appearance  ,\
   et,'-'		     ,'',	     ,\
   et,'Secure selection'      ,'',SecureSel   ,\
-  et,'Automatic brackets'    ,'',AutoBrackets,\
-  et,'Automatic indents'     ,'',AutoIndents ,\
-  et,'Tark tabulatsioon'      ,'',SmartTabs   ,\
+  et,'Automaatsed sulud'     ,'',AutoBrackets,\
+  et,'Automaatsed taandread' ,'',AutoIndents ,\
+  et,'Tark tabulatsioon'     ,'',SmartTabs   ,\
   et,'Optimal fill on saving','',OptimalFill ,\
   et,'-'		     ,'',	     ,\
   et,'Rea numbrid'	     ,'',LineNumbers
@@ -191,11 +191,11 @@ lsz s_2cancel,\
 lsz s_color,\
   ru,'–¢¥â: 0x',\
   en,'Color: 0x',\
-  et,'Color: 0x'
+  et,'Värv: 0x'
 lsz s_tabpos,\
   ru,' á¯®«®Š¥­š¥ § ª« €®ª',\
   en,'Tabs placement',\
-  et,'Tabs placement'
+  et,'Saki asetus'
 
 lsz s_enter_filename,\
   ru,<'‚¢¥€šâ¥ š¬ï ä ©« ',0>,\
@@ -278,7 +278,18 @@ lszc s_appearance,b,\
   en,'Strings',\
   en,'Comments',\
   en,'Modified lines',\
-  en,'Saved lines'
+  en,'Saved lines',\
+\
+  et,'Tekst',\
+  et,'Taust',\
+  et,'Valitud tekst',\
+  et,'Valitud taust',\
+  et,'Sümbolid',\
+  et,'Numbrid',\
+  et,'Stringid',\
+  et,'Kommentaarid',\
+  et,'Muudetud read',\
+  et,'Salvestatud read'
 
 lsz sysfuncs_filename,\
   ru,<'SYSFUNCR.TXT',0>,\
diff --git a/programs/system/calendar/trunk/build_et.bat b/programs/system/calendar/trunk/build_et.bat
new file mode 100644
index 0000000000..5195cac8ea
--- /dev/null
+++ b/programs/system/calendar/trunk/build_et.bat
@@ -0,0 +1,5 @@
+@erase lang.inc
+@echo lang fix et >lang.inc
+@fasm calendar.asm calendar
+@erase lang.inc
+@pause
\ No newline at end of file
diff --git a/programs/system/calendar/trunk/calendar.asm b/programs/system/calendar/trunk/calendar.asm
index daf49524a8..a79f49c87e 100644
--- a/programs/system/calendar/trunk/calendar.asm
+++ b/programs/system/calendar/trunk/calendar.asm
@@ -145,6 +145,20 @@ else if lang eq fi
      db   'Lokakuu  '
      db   'Marraskuu'
      db   'Joulukuu '
+else if lang eq et
+     db   9
+     db   'Jaanuar  '
+     db   'Veebruar '
+     db   'Märts    '
+     db   'Aprill   '
+     db   'Mai      '
+     db   'Juuni    '
+     db   'Juuli    '
+     db   'August   '
+     db   'September'
+     db   'Oktoober '
+     db   'November '
+     db   'Detsember'
 else
      db   9
      db   'January  '
@@ -202,6 +216,16 @@ else if lang eq fi
      db   'To'
      db   'Pe'
      db   'La'
+else if lang eq et
+     db   3
+     db   7
+     db   'Esm'
+     db   'Tei'
+     db   'Kol'
+     db   'Nel'
+     db   'Ree'
+     db   'Lau'
+     db   'Püh'
 else
      db   3
      db   7
@@ -779,6 +803,8 @@ else if lang eq ge
      db   'KALENDER'
 else if lang eq fr
      db   'CALENDRIER'
+else if lang eq et
+     db   'KALENDER'
 else
      db   'CALENDAR'
 end if
@@ -794,6 +820,9 @@ else if lang eq fr
 else if lang eq ge
      db   ' Datum 1 '
      db   ' Datum 2 '
+else if lang eq et
+     db   'Kuupäev 1'
+     db   'Kuupäev 2'
 else
      db   '1st date '
      db   '2nd date '
@@ -806,6 +835,8 @@ else if lang eq de
      db   'Neuer Stil'
 else if lang eq fr
      db   'Nouveau'
+else if lang eq et
+     db   'Uus stiil'
 else
      db   'New style'
 end if
@@ -817,6 +848,8 @@ else if lang eq ge
      db   'Heute'
 else if lang eq fr
      db   "Aujourd'hui"
+else if lang eq et
+     db   'Täna'
 else
      db   'Today'
 end if