diff --git a/HISTORY b/HISTORY
index 8e37aefb..d22cd59e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5493,3 +5493,4 @@ Video Disk Recorder Revision History
 - Fixed checking compatibility mode for old subtitles plugin (thanks to Marco
   Schlüßler).
 - Updated the French OSD texts (thanks to Michael Nival).
+- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
diff --git a/po/et_EE.po b/po/et_EE.po
index fd63f1e2..3223de69 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -166,7 +166,7 @@ msgid "Key$Audio"
 msgstr "Audio"
 
 msgid "Key$Subtitles"
-msgstr ""
+msgstr "Subtiitrid"
 
 msgid "Key$Schedule"
 msgstr "Kava"
@@ -187,31 +187,31 @@ msgid "Key$Commands"
 msgstr "Käsud"
 
 msgid "Key$User1"
-msgstr ""
+msgstr "Lisaklahv1"
 
 msgid "Key$User2"
-msgstr ""
+msgstr "Lisaklahv2"
 
 msgid "Key$User3"
-msgstr ""
+msgstr "Lisaklahv3"
 
 msgid "Key$User4"
-msgstr ""
+msgstr "Lisaklahv4"
 
 msgid "Key$User5"
-msgstr ""
+msgstr "Lisaklahv5"
 
 msgid "Key$User6"
-msgstr ""
+msgstr "Lisaklahv6"
 
 msgid "Key$User7"
-msgstr ""
+msgstr "Lisaklahv7"
 
 msgid "Key$User8"
-msgstr ""
+msgstr "Lisaklahv8"
 
 msgid "Key$User9"
-msgstr ""
+msgstr "Lisaklahv9"
 
 msgid "Free To Air"
 msgstr "FTA"
@@ -253,10 +253,10 @@ msgid "Dpid2"
 msgstr "Dpid2"
 
 msgid "Spid1"
-msgstr ""
+msgstr "Spid1"
 
 msgid "Spid2"
-msgstr ""
+msgstr "Spid2"
 
 msgid "Tpid"
 msgstr "Tpid"
@@ -283,7 +283,7 @@ msgid "CoderateH"
 msgstr "CoderateH"
 
 msgid "none"
-msgstr "tühi"
+msgstr "puudu"
 
 msgid "CoderateL"
 msgstr "CoderateL"
@@ -397,7 +397,7 @@ msgid "Button$Next"
 msgstr "Tulekul"
 
 msgid "Button$Now"
-msgstr "Nüüd"
+msgstr "Hetkel"
 
 msgid "Button$Schedule"
 msgstr "Ajakava"
@@ -457,7 +457,7 @@ msgid "Recording commands"
 msgstr "Salvestuse käsud"
 
 msgid "never"
-msgstr "mitte kunagi"
+msgstr "ei"
 
 msgid "skin dependent"
 msgstr "kestast sõltuv"
@@ -529,10 +529,10 @@ msgid "Setup.OSD$Channel info time (s)"
 msgstr "Kanaliinfo esitusaeg (s)"
 
 msgid "Setup.OSD$Info on channel switch"
-msgstr "Kanaliinfo näitamine"
+msgstr "Kanaliinfo kuvamine"
 
 msgid "Setup.OSD$Timeout requested channel info"
-msgstr "Kanaliinfo kuvamise ajapiirang"
+msgstr "Kanaliinfo ajapiirang"
 
 msgid "Setup.OSD$Scroll pages"
 msgstr "Lehekülje kerimine"
@@ -556,7 +556,7 @@ msgid "Setup.EPG$EPG scan timeout (h)"
 msgstr "EPG skaneerimise viide (h)"
 
 msgid "Setup.EPG$EPG bugfix level"
-msgstr "EPG veaparanduse tase"
+msgstr "EPG veaparandustase"
 
 msgid "Setup.EPG$EPG linger time (min)"
 msgstr "Vana EPG viide (min)"
@@ -565,7 +565,7 @@ msgid "Setup.EPG$Set system time"
 msgstr "Kella sünkroniseerimine"
 
 msgid "Setup.EPG$Use time from transponder"
-msgstr "Kella sünkroniseerimise transponder"
+msgstr "Sünkroniseerimise transponder"
 
 #. TRANSLATORS: note the plural!
 msgid "Setup.EPG$Preferred languages"
@@ -588,19 +588,19 @@ msgid "no"
 msgstr "ei"
 
 msgid "names only"
-msgstr "ainult nimed"
+msgstr "nimed"
 
 msgid "PIDs only"
-msgstr "ainult PID-id"
+msgstr "PID-id"
 
 msgid "names and PIDs"
-msgstr "nimi ja PID-id"
+msgstr "nimed ja PID-id"
 
 msgid "add new channels"
-msgstr "uute kanalite lisamine"
+msgstr "kanalite lisamine"
 
 msgid "add new transponders"
-msgstr "uute transponderite lisamine"
+msgstr "transponderite lisamine"
 
 msgid "DVB"
 msgstr "DVB"
@@ -627,22 +627,22 @@ msgid "Setup.DVB$Audio language"
 msgstr "Audio keel"
 
 msgid "Setup.DVB$Display subtitles"
-msgstr ""
+msgstr "Subtiitrite kuvamine"
 
 msgid "Setup.DVB$Subtitle languages"
-msgstr ""
+msgstr "Subtiitrite keeli"
 
 msgid "Setup.DVB$Subtitle language"
-msgstr ""
+msgstr "Subtiitri keel"
 
 msgid "Setup.DVB$Subtitle offset"
-msgstr ""
+msgstr "Subtiitrite nihe"
 
 msgid "Setup.DVB$Subtitle foreground transparency"
-msgstr ""
+msgstr "Subtiitri läbipaistvus"
 
 msgid "Setup.DVB$Subtitle background transparency"
-msgstr ""
+msgstr "Subtiitri tausta läbipaistvus"
 
 msgid "LNB"
 msgstr "LNB"
@@ -837,13 +837,13 @@ msgid "No audio available!"
 msgstr "Audio kättesaamatu!"
 
 msgid "No subtitles"
-msgstr ""
+msgstr "Subtiitrid väljas"
 
 msgid "Button$Subtitles"
-msgstr ""
+msgstr "Subtiitrid"
 
 msgid "No subtitles available!"
-msgstr ""
+msgstr "Subtiitrid puuduvad"
 
 msgid "Not enough disk space to start recording!"
 msgstr "Ebapiisavalt kettaruumi salvestamise alustamiseks!"
@@ -904,7 +904,7 @@ msgid "Can't shutdown - option '-s' not given!"
 msgstr "Väljalülitamine ebaõnnestus - '-s' parameeter puudub!"
 
 msgid "Editing - shut down anyway?"
-msgstr "Redigeerimine aktiive - lülitan välja?"
+msgstr "Redigeerimine aktiive - lülitada välja?"
 
 msgid "Recording - shut down anyway?"
 msgstr "Salvestamine aktiivne - lülitada välja?"
@@ -921,7 +921,7 @@ msgid "Plugin %s wakes up in %ld min, continue?"
 msgstr "Laiendusmoodul %s ärkab %ld minuti pärast, jätkata?"
 
 msgid "Editing - restart anyway?"
-msgstr "Redigeerimine aktiivne - taaskäivitada?"
+msgstr "Redigeerimine aktiivne - restart?"
 
 msgid "Recording - restart anyway?"
 msgstr "Salvestamine aktiivne - restart?"