diff --git a/base/applications/charmap/charmap.rc b/base/applications/charmap/charmap.rc
index 502a476cb90..a4f95f5848d 100644
--- a/base/applications/charmap/charmap.rc
+++ b/base/applications/charmap/charmap.rc
@@ -33,6 +33,9 @@ IDI_ICON ICON "res/charmap.ico"
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_EL_GR
     #include "lang/el-GR.rc"
 #endif
diff --git a/base/applications/charmap/lang/et-EE.rc b/base/applications/charmap/lang/et-EE.rc
new file mode 100644
index 00000000000..a6d49e08529
--- /dev/null
+++ b/base/applications/charmap/lang/et-EE.rc
@@ -0,0 +1,54 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+IDD_CHARMAP DIALOGEX 6, 6, 292, 224
+FONT 8, "MS Shell Dlg", 0, 0
+STYLE DS_SHELLFONT | WS_CHILD | WS_VISIBLE
+BEGIN
+    LTEXT "&Font:", IDC_STATIC, 6, 7, 24, 9
+    COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE |
+             WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+    PUSHBUTTON "&Spikker", IDC_CMHELP, 249, 5, 35, 13
+    CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP |
+            WS_VSCROLL, 20, 22, 266, 156
+    LTEXT "&Kopeeritavad märgid:", IDC_STATIC, 6, 188, 96, 9
+    CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
+            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 86, 186, 100, 13
+    DEFPUSHBUTTON "&Vali", IDC_SELECT, 194, 186, 44, 13
+    PUSHBUTTON "&Kopeeri", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+    CONTROL "Tä&psem vaade", IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX |
+            WS_TABSTOP, 8, 208, 95, 10
+END
+
+IDD_ADVANCED DIALOGEX 0, 0, 292, 64
+STYLE DS_SHELLFONT | WS_CHILD
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "Mä&rgistik:", IDC_STATIC, 8, 8, 48, 8
+    COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT "R&ühmitusalus:", IDC_STATIC, 8, 28, 50, 8
+    COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON "&Otsi", IDC_BUTTON_SEARCH, 200, 44, 50, 14
+    EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL
+    LTEXT "Ots&itav:", IDC_STATIC, 8, 48, 42, 8
+    LTEXT "&Unicode:", IDC_STATIC, 200, 8, 30, 8
+    EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL
+END
+
+IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182
+CAPTION "Märgistikust"
+FONT 8, "MS Shell Dlg", 0, 0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+BEGIN
+    LTEXT "Märgistik v0.1\nAutoriõigus (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+    PUSHBUTTON "&Sule", IDOK, 75, 162, 44, 15
+    ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30
+    EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL |
+             WS_TABSTOP | ES_READONLY | ES_MULTILINE
+END
+
+STRINGTABLE
+BEGIN
+    IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_ABOUT "T&eave..."
+    IDS_TITLE "Märgistik"
+END
diff --git a/base/applications/charmap_new/charmap.rc b/base/applications/charmap_new/charmap.rc
index 9d8267a9252..11170684c37 100644
--- a/base/applications/charmap_new/charmap.rc
+++ b/base/applications/charmap_new/charmap.rc
@@ -39,6 +39,9 @@ IDI_ICON ICON "res/charmap.ico"
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET-EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/charmap_new/lang/et-EE.rc b/base/applications/charmap_new/lang/et-EE.rc
new file mode 100644
index 00000000000..eb92bf4695f
--- /dev/null
+++ b/base/applications/charmap_new/lang/et-EE.rc
@@ -0,0 +1,22 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+IDD_CHARMAP DIALOGEX 6, 6, 290, 224
+FONT 8, "MS Shell Dlg", 0, 0
+STYLE WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_SIZEBOX
+CAPTION "ReactOS'i Märgistik"
+BEGIN
+    LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9
+    COMBOBOX IDC_FONTCOMBO, 28, 5, 150, 210, WS_CHILD | WS_VISIBLE |
+            WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
+    LTEXT "Kopeeritavad märgid:", IDC_STATIC, 6, 188, 96, 9
+    CONTROL "", IDC_TEXTBOX, RICHEDIT_CLASS, ES_AUTOHSCROLL | WS_BORDER |
+            WS_CHILD | WS_VISIBLE | WS_TABSTOP, 86, 186, 100, 13
+    DEFPUSHBUTTON "Vali", IDC_SELECT, 194, 186, 44, 13
+    PUSHBUTTON "Kopeeri", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ABOUT "T&eave..."
+    IDS_TITLE "Märgistik"
+END
diff --git a/base/applications/clipbrd/clipbrd.rc b/base/applications/clipbrd/clipbrd.rc
index 178c6ce697a..192246002b9 100644
--- a/base/applications/clipbrd/clipbrd.rc
+++ b/base/applications/clipbrd/clipbrd.rc
@@ -35,6 +35,9 @@ CLPFILE_ICON ICON "res/clpfile.ico"
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/clipbrd/lang/et-EE.rc b/base/applications/clipbrd/lang/et-EE.rc
new file mode 100644
index 00000000000..91a68ab734e
--- /dev/null
+++ b/base/applications/clipbrd/lang/et-EE.rc
@@ -0,0 +1,65 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+ID_ACCEL ACCELERATORS
+BEGIN
+    VK_DELETE, CMD_DELETE, VIRTKEY
+END
+
+MAIN_MENU MENU
+BEGIN
+    POPUP "&Fail"
+    BEGIN
+        MENUITEM "&Ava...", CMD_OPEN
+        MENUITEM "Salvesta &nimega...", CMD_SAVE_AS
+        MENUITEM SEPARATOR
+        MENUITEM "V&älju", CMD_EXIT
+    END
+    POPUP "&Redigeeri"
+    BEGIN
+        MENUITEM "&Kustuta\tDel", CMD_DELETE
+    END
+    POPUP "&Kuva"
+    BEGIN
+        MENUITEM "&Automaatne", CMD_AUTOMATIC
+    END
+    POPUP "&Spikker"
+    BEGIN
+        MENUITEM "&Spikriteemad", CMD_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "&Teave", CMD_ABOUT
+    END
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CLIPBOARD "Lõikelaua vaatur"
+    STRING_CLIPFILE  "Lõikelaua element"
+    STRING_DELETE_MSG "Puhastada lõikelaua sisu?"
+    STRING_DELETE_TITLE "Puhasta lõikelauda"
+    STRING_FORMAT_NT "Lõikelaua failid ReactOS'i jaoks (*.clp)"
+    STRING_FORMAT_GEN "Lõikelaua failid (*.clp)"
+END
+
+STRINGTABLE
+BEGIN
+    STRING_CF_UNKNOWN "Tundmatu vorming"
+    STRING_CF_TEXT "Tekst"
+    STRING_CF_BITMAP "Bittraster"
+    STRING_CF_OEMTEXT "OEM tekst"
+    STRING_CF_UNICODETEXT "Unicode tekst"
+    STRING_CF_DIB "DIB bittraster"
+    STRING_CF_LOCALE "Lokaadi andmed"
+    STRING_CF_ENHMETAFILE "Täiustatud metafail"
+    STRING_CF_METAFILEPICT "Metafail"
+    STRING_CF_PALETTE "Värvipalett"
+    STRING_CF_DIBV5 "DIB bittraster (Versioon 5)"
+    STRING_CF_SYLK "Sümboolse lingi vorming"
+    STRING_CF_DIF "Andmevahetuse vorming"
+    STRING_CF_HDROP "Pukseeritud andmed"
+END
+
+STRINGTABLE
+BEGIN
+    ERROR_UNSUPPORTED_FORMAT "Lõikelaud sisaldab kuvamatut andmevormingut."
+    ERROR_INVALID_FILE_FORMAT "Valitud fail ei ole sobiv lõikelaua fail."
+END
diff --git a/base/applications/cmdutils/chcp/chcp.rc b/base/applications/cmdutils/chcp/chcp.rc
index 43be590a511..5329e672d93 100644
--- a/base/applications/cmdutils/chcp/chcp.rc
+++ b/base/applications/cmdutils/chcp/chcp.rc
@@ -27,6 +27,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/cmdutils/chcp/lang/et-EE.rc b/base/applications/cmdutils/chcp/lang/et-EE.rc
new file mode 100644
index 00000000000..e191697a496
--- /dev/null
+++ b/base/applications/cmdutils/chcp/lang/et-EE.rc
@@ -0,0 +1,12 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    STRING_CHCP_HELP "Kuvab või sätib aktiivse koodilehe numbri.\n\n\
+CHCP [nnn]\n\n\
+  nnn   Määrab aktiivse koodilehe numbri.\n\n\
+Kirjuta CHCP parameetriteta, et kuvada aktiivset koodilehel numbrit.\n"
+    STRING_CHCP_ERROR1 "Aktiivne koodileht: %u\n"
+    STRING_CHCP_ERROR4 "Sobimatu koodileht\n"
+    STRING_ERROR_INVALID_PARAM_FORMAT "Sobimatu parameetrite vorming - %s\n"
+END
diff --git a/base/applications/cmdutils/clip/clip.rc b/base/applications/cmdutils/clip/clip.rc
index ed784f03e57..0a5f46f53e5 100644
--- a/base/applications/cmdutils/clip/clip.rc
+++ b/base/applications/cmdutils/clip/clip.rc
@@ -21,6 +21,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/cmdutils/clip/lang/et-EE.rc b/base/applications/cmdutils/clip/lang/et-EE.rc
new file mode 100644
index 00000000000..680282dbfaa
--- /dev/null
+++ b/base/applications/cmdutils/clip/lang/et-EE.rc
@@ -0,0 +1,9 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "\nKirjuta ""CLIP /?"" kasutamise informatsiooniks.\n"
+    IDS_HELP "\nJuhib käsurea programmide väljundi lõikelauale.\n\n\
+CLIP [/?]\n\n\
+    /?  Kuvab seda spikriteemat.\n"
+END
diff --git a/base/applications/cmdutils/comp/comp.rc b/base/applications/cmdutils/comp/comp.rc
index fd687e93c82..d440990dee7 100644
--- a/base/applications/cmdutils/comp/comp.rc
+++ b/base/applications/cmdutils/comp/comp.rc
@@ -15,6 +15,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/cmdutils/comp/lang/et-EE.rc b/base/applications/cmdutils/comp/lang/et-EE.rc
new file mode 100644
index 00000000000..35248bed3d6
--- /dev/null
+++ b/base/applications/cmdutils/comp/lang/et-EE.rc
@@ -0,0 +1,23 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_HELP "Võrdleb kahe või enama faili sisu.\n\n\
+COMP [/L] [/A] [data1] [data2]\n\n\
+  data1      Määrab esimese võrreldava faili asukoha ja nime.\n\
+  data2      Määrab teise võrreldava faili asukoha ja nime.\n\
+  /A         Kuvab erinevusi ASCII tähtedes (vaikimisi: kuueteistkümnendiksüsteemis).\n\
+  /L         Kuvab erinevuste reanumbrid.\n"
+    IDS_INVALIDSWITCH "Sobimatu parameeter - /%c\n"
+    IDS_BADSYNTAX "Halb käsurea süntaks\n"
+    IDS_FILEERROR "Ei leidnud/saanud avada faili: %s\n"
+    IDS_COMPARING "%s ja %s võrdlemine...\n"
+    IDS_FILESIZEERROR "Ei saa määrata suurust failil: %s\n"
+    IDS_SIZEDIFFERS "Failid on erineva suurusega.\n"
+    IDS_READERROR "Failide lugemisetõrge.\n"
+    IDS_MISMATCHLINE "Võrdle tõrget real %d\n"
+    IDS_MISMATCHOFFSET "Võrdle tõrget nihel 0x%X\n"
+    IDS_ASCIIDIFF "fail%d = %c\n"
+    IDS_HEXADECIMALDIFF "fail%d = %X\n"
+    IDS_MATCH "Failide võrdlus OK\n"
+END
diff --git a/base/applications/cmdutils/find/find.rc b/base/applications/cmdutils/find/find.rc
index 7d9113ad6ca..92b8ae4ab26 100644
--- a/base/applications/cmdutils/find/find.rc
+++ b/base/applications/cmdutils/find/find.rc
@@ -30,6 +30,9 @@
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/cmdutils/find/lang/et-EE.rc b/base/applications/cmdutils/find/lang/et-EE.rc
new file mode 100644
index 00000000000..6a6b28ed3cf
--- /dev/null
+++ b/base/applications/cmdutils/find/lang/et-EE.rc
@@ -0,0 +1,13 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "FIND: Trükib kõik read failist, mis sisaldavad stringi.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\
+    /C  Loenda arvuna stringi sisaldavaid ridu\n\
+    /I  Tõstutundetult\n\
+    /N  Nummerda kuvatud read alustades 1-st\n\
+    /V  Trüki read, mis ei sisalda stringi"
+    IDS_NO_SUCH_FILE "FIND: %s: Sellist faili ei leitud\n"
+    IDS_CANNOT_OPEN "FIND: %s: Ei saa faili avada\n"
+END
diff --git a/base/applications/cmdutils/hostname/hostname.rc b/base/applications/cmdutils/hostname/hostname.rc
index 5977b20a853..3a41b87e2b3 100644
--- a/base/applications/cmdutils/hostname/hostname.rc
+++ b/base/applications/cmdutils/hostname/hostname.rc
@@ -21,6 +21,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/cmdutils/hostname/lang/et-EE.rc b/base/applications/cmdutils/hostname/lang/et-EE.rc
new file mode 100644
index 00000000000..b4c5eb8bb9c
--- /dev/null
+++ b/base/applications/cmdutils/hostname/lang/et-EE.rc
@@ -0,0 +1,8 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Trükib praeguse hosti nime.\n\nhostname"
+    IDS_NOSET "hostname -s ei ole toetatud."
+    IDS_ERROR "Win32 tõrge"
+END
diff --git a/base/applications/cmdutils/more/lang/et-EE.rc b/base/applications/cmdutils/more/lang/et-EE.rc
new file mode 100644
index 00000000000..250e3fa8d94
--- /dev/null
+++ b/base/applications/cmdutils/more/lang/et-EE.rc
@@ -0,0 +1,15 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Kuvab andmeid lehekülje kaupa ekraanil.\n\n\
+  MORE < [Draiv:][Tee]Faili nimi\n\
+  Käsk | MORE \n\
+  MORE [Draiv:][Tee]Faili nimi\n\n\
+  [Draiv:][Tee]Faili nimi    Fail mille sisu kuvatakse.\n\
+  Käsk\t\t\t     Käsk mille sisu kuvatakse.\n\n\
+  Küsimusel ""-- Jätka --"" võib vajutada mis tahes klahvi järgmise lehe näitamiseks.\n"
+    IDS_CONTINUE "-- Jätka --"
+    IDS_CONTINUE_PROGRESS "-- Jätka (%d%%) --"
+    IDS_FILE_ACCESS "Ei saa ligi failile %s.\n"
+END
diff --git a/base/applications/cmdutils/more/more.rc b/base/applications/cmdutils/more/more.rc
index b9339d8e9a5..6a80f66bcbd 100644
--- a/base/applications/cmdutils/more/more.rc
+++ b/base/applications/cmdutils/more/more.rc
@@ -33,6 +33,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/cmdutils/tree/lang/et-EE.rc b/base/applications/cmdutils/tree/lang/et-EE.rc
new file mode 100644
index 00000000000..3f8bcc87796
--- /dev/null
+++ b/base/applications/cmdutils/tree/lang/et-EE.rc
@@ -0,0 +1,12 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Kuvab draivi või tee visuaalset kaustastruktuuri.\n\n\
+TREE [draiv:][tee] [/F] [/A]\n\n\
+\t/F   Kuvab igas kaustas olevate failide nimed.\n\
+\t/A   Kasuta ASCII-d laiendatut tähemärkide asemel.\n"
+    IDS_NO_SUBDIRECTORIES "Ühtegi alamkausta ei ole olemas"
+    IDS_FOLDER_PATH "Kausta PATH nimekiri\n"
+    IDS_VOL_SERIAL "Draivi seerianumber on %x:%x\n"
+END
diff --git a/base/applications/cmdutils/tree/tree.rc b/base/applications/cmdutils/tree/tree.rc
index c06f93e3e1e..63ce24f11b2 100644
--- a/base/applications/cmdutils/tree/tree.rc
+++ b/base/applications/cmdutils/tree/tree.rc
@@ -17,6 +17,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/drwtsn32/drwtsn32.rc b/base/applications/drwtsn32/drwtsn32.rc
index 1e173d8de9d..abe37bec4f5 100644
--- a/base/applications/drwtsn32/drwtsn32.rc
+++ b/base/applications/drwtsn32/drwtsn32.rc
@@ -25,6 +25,9 @@
 #ifdef LANGUAGE_EN_US
     #include "lang/en-US.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/drwtsn32/lang/et-EE.rc b/base/applications/drwtsn32/lang/et-EE.rc
new file mode 100644
index 00000000000..d1f8ea7b515
--- /dev/null
+++ b/base/applications/drwtsn32/lang/et-EE.rc
@@ -0,0 +1,14 @@
+/*
+ * PROJECT:     Dr. Watson crash reporter
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
+ * PURPOSE:     et-EE resource file
+ * COPYRIGHT:   Copyright 2018 Joann Mõndresku (joannmondresku at gmail dot com)
+ */
+
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_APP_TITLE "ReactOS'i krahhi teavitaja"
+    IDS_USER_ALERT_MESSAGE "Rakendus %ls jooksis kokku. Informatsioon selle krahhi kohta on salvestatud asukohta:\r\n\r\n%ls"
+END
diff --git a/base/applications/findstr/findstr.rc b/base/applications/findstr/findstr.rc
index 99820ba945e..d9feacff659 100644
--- a/base/applications/findstr/findstr.rc
+++ b/base/applications/findstr/findstr.rc
@@ -31,6 +31,9 @@
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/findstr/lang/et-EE.rc b/base/applications/findstr/lang/et-EE.rc
new file mode 100644
index 00000000000..78ab25f8297
--- /dev/null
+++ b/base/applications/findstr/lang/et-EE.rc
@@ -0,0 +1,13 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "FINDSTR: Trükib kõik read failist, mis sisaldavad stringi.\n\n\
+  FIND [ /C ] [ /I ] [ /N ] [ /V ] ""string"" [ file... ]\n\
+    /C  Loenda arvuna stringi sisaldavaid ridu\n\
+    /I  Tõstutundetult\n\
+    /N  Nummerda kuvatud read alustades 1-st\n\
+    /V  Trüki read, mis ei sisalda stringi"
+    IDS_NO_SUCH_FILE "FINDSTR: %s: Sellist faili ei leitud\n"
+    IDS_CANNOT_OPEN "FINDSTR: %s: Ei saa faili avada\n"
+END
diff --git a/base/applications/kbswitch/kbswitch.rc b/base/applications/kbswitch/kbswitch.rc
index 06d00ca9089..7f513250324 100644
--- a/base/applications/kbswitch/kbswitch.rc
+++ b/base/applications/kbswitch/kbswitch.rc
@@ -29,6 +29,9 @@ IDI_MAIN ICON "res/kbswitch.ico"
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/kbswitch/lang/et-EE.rc b/base/applications/kbswitch/lang/et-EE.rc
new file mode 100644
index 00000000000..6f80d342145
--- /dev/null
+++ b/base/applications/kbswitch/lang/et-EE.rc
@@ -0,0 +1,11 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+IDR_POPUP MENU
+BEGIN
+    POPUP "popup"
+    BEGIN
+        MENUITEM "&Eelistused...", ID_PREFERENCES
+        MENUITEM SEPARATOR
+        MENUITEM "V&älju", ID_EXIT
+    END
+END
diff --git a/base/applications/logoff/lang/et-EE.rc b/base/applications/logoff/lang/et-EE.rc
new file mode 100644
index 00000000000..dfd3714cb43
--- /dev/null
+++ b/base/applications/logoff/lang/et-EE.rc
@@ -0,0 +1,11 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Lõpetab seansi.\n\n\
+  /v\t\tKuvab informatsiooni sooritavate tegevuste kohta.\n\
+  /?\t\tKuvab seda informatsiooni.\n\n"
+    IDS_LOGOFF_REMOTE "Seansi lõpetamine kaugjuhitaval masinal."
+    IDS_LOGOFF_LOCAL "Lõpeta praegune seanss sellel masinal."
+    IDS_ILLEGAL_PARAM "Sobimatud parameetrid\n"
+END
diff --git a/base/applications/logoff/logoff.rc b/base/applications/logoff/logoff.rc
index c80a7592b63..9ec7c65a3c6 100644
--- a/base/applications/logoff/logoff.rc
+++ b/base/applications/logoff/logoff.rc
@@ -31,6 +31,9 @@
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
diff --git a/base/applications/osk/lang/et-EE.rc b/base/applications/osk/lang/et-EE.rc
new file mode 100644
index 00000000000..e1bdf1b7380
--- /dev/null
+++ b/base/applications/osk/lang/et-EE.rc
@@ -0,0 +1,128 @@
+/*
+ * PROJECT:     ReactOS Virtual Keyboard - OSK
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * PURPOSE:     Virtual Keyboard On screen (Italian resources)
+ * COPYRIGHT:   Copyright Denis ROBERT
+ *              Copyright 2018 Joann Mõndresku (joannmondresku at gmail dot com)
+ */
+
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 463, 115
+CAPTION "Ekraaniklaviatuur"
+FONT 8, "MS Shell Dlg"
+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE
+BEGIN
+    PUSHBUTTON      "Esc",SCAN_CODE_110,3,3,15,15
+    PUSHBUTTON      "F1",SCAN_CODE_112,43,3,15,15
+    PUSHBUTTON      "F2",SCAN_CODE_113,63,3,15,15
+    PUSHBUTTON      "F3",SCAN_CODE_114,83,3,15,15
+    PUSHBUTTON      "F4",SCAN_CODE_115,103,3,15,15
+    PUSHBUTTON      "F5",SCAN_CODE_116,143,3,15,15
+    PUSHBUTTON      "F6",SCAN_CODE_117,163,3,15,15
+    PUSHBUTTON      "F7",SCAN_CODE_118,183,3,15,15
+    PUSHBUTTON      "F8",SCAN_CODE_119,203,3,15,15
+    PUSHBUTTON      "F9",SCAN_CODE_120,243,3,15,15
+    PUSHBUTTON      "F10",SCAN_CODE_121,263,3,15,15
+    PUSHBUTTON      "F11",SCAN_CODE_122,283,3,15,15
+    PUSHBUTTON      "F12",SCAN_CODE_123,303,3,15,15
+    PUSHBUTTON      "Prn",SCAN_CODE_124,323,3,15,15
+    PUSHBUTTON      "Stop",SCAN_CODE_125,343,3,15,15
+    PUSHBUTTON      "Attn",SCAN_CODE_126,363,3,15,15
+    PUSHBUTTON      "ˇ",SCAN_CODE_1,3,22,15,15
+    PUSHBUTTON      "1",SCAN_CODE_2,23,22,15,15
+    PUSHBUTTON      "2",SCAN_CODE_3,43,22,15,15
+    PUSHBUTTON      "3",SCAN_CODE_4,63,22,15,15
+    PUSHBUTTON      "4",SCAN_CODE_5,83,22,15,15
+    PUSHBUTTON      "5",SCAN_CODE_6,103,22,15,15
+    PUSHBUTTON      "6",SCAN_CODE_7,123,22,15,15
+    PUSHBUTTON      "7",SCAN_CODE_8,143,22,15,15
+    PUSHBUTTON      "8",SCAN_CODE_9,163,22,15,15
+    PUSHBUTTON      "9",SCAN_CODE_10,183,22,15,15
+    PUSHBUTTON      "0",SCAN_CODE_11,203,22,15,15
+    PUSHBUTTON      "+",SCAN_CODE_12,223,22,15,15
+    PUSHBUTTON      "´",SCAN_CODE_13,243,22,15,15
+    PUSHBUTTON      "<--",SCAN_CODE_15,263,22,55,15,BS_ICON
+    PUSHBUTTON      "Tab",SCAN_CODE_16,3,41,35,15,BS_ICON
+    PUSHBUTTON      "q",SCAN_CODE_17,42,41,15,15
+    PUSHBUTTON      "w",SCAN_CODE_18,61,41,15,15
+    PUSHBUTTON      "e",SCAN_CODE_19,80,41,15,15
+    PUSHBUTTON      "r",SCAN_CODE_20,99,41,15,15
+    PUSHBUTTON      "t",SCAN_CODE_21,118,41,15,15
+    PUSHBUTTON      "y",SCAN_CODE_22,137,41,15,15
+    PUSHBUTTON      "u",SCAN_CODE_23,156,41,15,15
+    PUSHBUTTON      "i",SCAN_CODE_24,175,41,15,15
+    PUSHBUTTON      "o",SCAN_CODE_25,194,41,15,15
+    PUSHBUTTON      "p",SCAN_CODE_26,213,41,15,15
+    PUSHBUTTON      "ü",SCAN_CODE_27,232,41,15,15
+    PUSHBUTTON      "õ",SCAN_CODE_28,251,41,15,15
+    PUSHBUTTON      "lock",SCAN_CODE_30,3,60,46,15,BS_ICON
+    PUSHBUTTON      "a",SCAN_CODE_31,53,60,15,15
+    PUSHBUTTON      "s",SCAN_CODE_32,72,60,15,15
+    PUSHBUTTON      "d",SCAN_CODE_33,91,60,15,15
+    PUSHBUTTON      "f",SCAN_CODE_34,110,60,15,15
+    PUSHBUTTON      "g",SCAN_CODE_35,129,60,15,15
+    PUSHBUTTON      "h",SCAN_CODE_36,148,60,15,15
+    PUSHBUTTON      "j",SCAN_CODE_37,167,60,15,15
+    PUSHBUTTON      "k",SCAN_CODE_38,186,60,15,15
+    PUSHBUTTON      "l",SCAN_CODE_39,205,60,15,15
+    PUSHBUTTON      "ö",SCAN_CODE_40,224,60,15,15
+    PUSHBUTTON      "ä",SCAN_CODE_41,243,60,15,15
+    PUSHBUTTON      "'",SCAN_CODE_29,270,41,48,15
+    PUSHBUTTON      "ret",SCAN_CODE_43,262,60,56,15,BS_ICON
+    PUSHBUTTON      "shift",SCAN_CODE_44,3,79,57,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "z",SCAN_CODE_46,64,79,15,15
+    PUSHBUTTON      "x",SCAN_CODE_47,83,79,15,15
+    PUSHBUTTON      "c",SCAN_CODE_48,102,79,15,15
+    PUSHBUTTON      "v",SCAN_CODE_49,121,79,15,15
+    PUSHBUTTON      "b",SCAN_CODE_50,140,79,15,15
+    PUSHBUTTON      "n",SCAN_CODE_51,159,79,15,15
+    PUSHBUTTON      "m",SCAN_CODE_52,178,79,15,15
+    PUSHBUTTON      ",",SCAN_CODE_53,197,79,15,15
+    PUSHBUTTON      ".",SCAN_CODE_54,216,79,15,15
+    PUSHBUTTON      "-",SCAN_CODE_55,235,79,15,15
+    PUSHBUTTON      "shift",SCAN_CODE_57,254,79,64,15,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ctrl",SCAN_CODE_58,3,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "v",SCAN_CODE_84,343,98,15,15,BS_ICON
+    PUSHBUTTON      "ROS",SCAN_CODE_127,30,98,24,15,BS_ICON
+    PUSHBUTTON      "alt",SCAN_CODE_60,57,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "",SCAN_CODE_61,84,98,125,15 //space
+    PUSHBUTTON      "alt",SCAN_CODE_62,213,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ROS",SCAN_CODE_128,240,98,24,15,BS_ICON
+    PUSHBUTTON      "menu",SCAN_CODE_129,267,98,24,15,BS_ICON
+    PUSHBUTTON      "ctrl",SCAN_CODE_64,294,98,24,15,BS_PUSHLIKE|BS_AUTOCHECKBOX
+    PUSHBUTTON      "ins",SCAN_CODE_75,323,22,15,15
+    PUSHBUTTON      "del",SCAN_CODE_76,323,41,15,15
+    PUSHBUTTON      "hm",SCAN_CODE_80,343,22,15,15
+    PUSHBUTTON      "end",SCAN_CODE_81,343,41,15,15
+    PUSHBUTTON      "pup",SCAN_CODE_85,363,22,15,15
+    PUSHBUTTON      "pdn",SCAN_CODE_86,363,41,15,15
+    PUSHBUTTON      "<-",SCAN_CODE_79,323,98,15,15,BS_ICON
+    PUSHBUTTON      "^",SCAN_CODE_83,343,79,15,15,BS_ICON
+    PUSHBUTTON      "->",SCAN_CODE_89,363,98,15,15,BS_ICON
+    PUSHBUTTON      "nlk",SCAN_CODE_90,383,22,15,15
+    PUSHBUTTON      "7",SCAN_CODE_91,383,41,15,15
+    PUSHBUTTON      "4",SCAN_CODE_92,383,60,15,15
+    PUSHBUTTON      "1",SCAN_CODE_93,383,79,15,15
+    PUSHBUTTON      "/",SCAN_CODE_95,403,22,15,15
+    PUSHBUTTON      "8",SCAN_CODE_96,403,41,15,15
+    PUSHBUTTON      "5",SCAN_CODE_97,403,60,15,15
+    PUSHBUTTON      "2",SCAN_CODE_98,403,79,15,15
+    PUSHBUTTON      "0",SCAN_CODE_99,383,98,34,15
+    PUSHBUTTON      "*",SCAN_CODE_100,423,22,15,15
+    PUSHBUTTON      "9",SCAN_CODE_101,423,41,15,15
+    PUSHBUTTON      "6",SCAN_CODE_102,423,60,15,15
+    PUSHBUTTON      "3",SCAN_CODE_103,423,79,15,15
+    PUSHBUTTON      ".",SCAN_CODE_104,423,98,15,15
+    PUSHBUTTON      "-",SCAN_CODE_105,443,22,15,15
+    PUSHBUTTON      "+",SCAN_CODE_106,443,41,15,35
+    PUSHBUTTON      "ent",SCAN_CODE_108,443,78,15,35
+    CTEXT           "Num",IDC_STATIC,383,3,21,8
+    CONTROL         "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,391,15,4,3
+    CTEXT           "Caps",IDC_STATIC,408,3,21,8
+    CONTROL         "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,417,15,4,3
+    CTEXT           "Scroll",IDC_STATIC,433,3,21,8
+    CONTROL         "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,443,15,4,3
+END
+
+/* EOF */
diff --git a/base/applications/osk/rsrc.rc b/base/applications/osk/rsrc.rc
index cdbf119f567..44bcd0d34c9 100644
--- a/base/applications/osk/rsrc.rc
+++ b/base/applications/osk/rsrc.rc
@@ -61,6 +61,9 @@ IDI_BOTTOM    ICON "res/bottom.ico"
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_FR_CA
     #include "lang/fr-CA.rc"
 #endif
diff --git a/base/applications/screensavers/3dtext/lang/et-EE.rc b/base/applications/screensavers/3dtext/lang/et-EE.rc
new file mode 100644
index 00000000000..ee64afca1d8
--- /dev/null
+++ b/base/applications/screensavers/3dtext/lang/et-EE.rc
@@ -0,0 +1,17 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "3D teksti ekraanisäästja sätted"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14
+    PUSHBUTTON "Loobu", IDCANCEL, 216, 24, 50, 14
+    EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL
+    LTEXT "Kohandatud tekst", IDC_STATIC, 18, 17, 65, 8
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DESCRIPTION "3D teksti ekraanisäästja"
+END
diff --git a/base/applications/screensavers/3dtext/rsrc.rc b/base/applications/screensavers/3dtext/rsrc.rc
index ef18d2a7354..4e0f6c9a179 100644
--- a/base/applications/screensavers/3dtext/rsrc.rc
+++ b/base/applications/screensavers/3dtext/rsrc.rc
@@ -37,6 +37,9 @@ IDI_ICON  ICON  DISCARDABLE  "res/icon_3dtext.ico"
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_EU_ES
     #include "lang/eu-ES.rc"
 #endif
diff --git a/base/applications/screensavers/logon/lang/et-EE.rc b/base/applications/screensavers/logon/lang/et-EE.rc
new file mode 100644
index 00000000000..55be25489ca
--- /dev/null
+++ b/base/applications/screensavers/logon/lang/et-EE.rc
@@ -0,0 +1,7 @@
+LANGUAGE LANG_ESTONIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_DESCRIPTION "Sisselogimise ekraanisäästja"
+    IDS_TEXT "Suvandeid pole vaja sättida."
+END
diff --git a/base/applications/screensavers/logon/logon.rc b/base/applications/screensavers/logon/logon.rc
index 2942008df9f..5881fd93698 100644
--- a/base/applications/screensavers/logon/logon.rc
+++ b/base/applications/screensavers/logon/logon.rc
@@ -41,6 +41,9 @@ IDB_SERVER BITMAP "res/1.bmp"
 #ifdef LANGUAGE_ES_ES
     #include "lang/es-ES.rc"
 #endif
+#ifdef LANGUAGE_ET_EE
+    #include "lang/et-EE.rc"
+#endif
 #ifdef LANGUAGE_EU_ES
     #include "lang/eu-ES.rc"
 #endif