diff --git a/public/language/et/category.json b/public/language/et/category.json
index cdb197eb48..6ff291b297 100644
--- a/public/language/et/category.json
+++ b/public/language/et/category.json
@@ -10,10 +10,10 @@
     "share_this_category": "Jaga seda kategooriat",
     "watch": "Vaata",
     "ignore": "Ignoreeri",
-    "watching": "Watching",
-    "ignoring": "Ignoring",
-    "watching.description": "Show topics in unread",
-    "ignoring.description": "Do not show topics in unread",
+    "watching": "Vaatab",
+    "ignoring": "Ignoreerib",
+    "watching.description": "Näita teemasid lugemata teemade hulgas",
+    "ignoring.description": "Ära näita teemasid lugemata teemade hulgas",
     "watch.message": "Jälgid nüüdsest teateid sellest kategooriast",
     "ignore.message": "Ignoreerid nüüdsest teateid sellest kategooriast",
     "watched-categories": "Jälgitavad kategooriad"
diff --git a/public/language/et/error.json b/public/language/et/error.json
index 3aed5d7967..20a047ab3c 100644
--- a/public/language/et/error.json
+++ b/public/language/et/error.json
@@ -20,7 +20,7 @@
     "email-taken": "Email on võetud",
     "email-not-confirmed": "Su emaili aadress ei ole kinnitatud, vajuta siia et kinnitada.",
     "email-not-confirmed-chat": "Sõnumeid ei ole võimalik enne saata kui sinu email on kinnitatud. Kinnitamiseks vajuta siia.",
-    "email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email.",
+    "email-not-confirmed-email-sent": "Su email ei ole veel kinnitatud, palun kontrolli oma e-posti ning kinnita email.",
     "no-email-to-confirm": "See foorum nõuab emaili kinnitust, palun vajuta siia, et sisestada email",
     "email-confirm-failed": "Meil ei õnnestunud sinu emaili kinnitada, proovi hiljem uuesti.",
     "confirm-email-already-sent": "Kinnituskiri on juba saadetud, palun oota %1 minut(it) uue kirja saatmiseks.",
@@ -31,7 +31,7 @@
     "user-banned": "Kasutaja bannitud",
     "user-too-new": "Vabandust, te peate ootama %1 sekund(it) enne esimese postituse loomist.",
     "blacklisted-ip": "Vabandust! Sinu IP-aadress on siin kogukonnas keelatud. Kui arvad, et see on eksitus, palun leia kontakti administraatoriga.",
-    "ban-expiry-missing": "Please provide an end date for this ban",
+    "ban-expiry-missing": "Palun sisesta keelu lõpukuupäev",
     "no-category": "Kategooriat ei eksisteeri",
     "no-topic": "Teemat ei eksisteeri",
     "no-post": "Postitust ei eksisteeri",
@@ -48,15 +48,15 @@
     "post-edit-duration-expired-hours-minutes": "Teil on lubatud muuta oma postitusi vaid %1 tunni %2 minuti jooksul peale postitamist",
     "post-edit-duration-expired-days": "Teil on lubatud muuta oma postitusi vaid %1 päeva jooksul peale postitamist",
     "post-edit-duration-expired-days-hours": "Teil on lubatud muuta oma postitusi vaid %1 päeva %2 tunni jooksul peale postitamist",
-    "post-delete-duration-expired": "You are only allowed to delete posts for %1 second(s) after posting",
-    "post-delete-duration-expired-minutes": "You are only allowed to delete posts for %1 minute(s) after posting",
-    "post-delete-duration-expired-minutes-seconds": "You are only allowed to delete posts for %1 minute(s) %2 second(s) after posting",
-    "post-delete-duration-expired-hours": "You are only allowed to delete posts for %1 hour(s) after posting",
-    "post-delete-duration-expired-hours-minutes": "You are only allowed to delete posts for %1 hour(s) %2 minute(s) after posting",
-    "post-delete-duration-expired-days": "You are only allowed to delete posts for %1 day(s) after posting",
-    "post-delete-duration-expired-days-hours": "You are only allowed to delete posts for %1 day(s) %2 hour(s) after posting",
-    "cant-delete-topic-has-reply": "You can't delete your topic after it has a reply",
-    "cant-delete-topic-has-replies": "You can't delete your topic after it has %1 replies",
+    "post-delete-duration-expired": "Teil on lubatud kustutada oma postitusi vaid %1 sekundi jooksul peale postitamist",
+    "post-delete-duration-expired-minutes": "Teil on lubatud kustutada oma postitusi vaid %1 minuti jooksul peale postitamist",
+    "post-delete-duration-expired-minutes-seconds": "Teil on lubatud kustutada oma postitusi vaid %1 minuti %2 sekundi jooksul peale postitamist",
+    "post-delete-duration-expired-hours": "Teil on lubatud kustutada oma postitusi vaid %1 tunni jooksul peale postitamist",
+    "post-delete-duration-expired-hours-minutes": "Teil on lubatud kustutada oma postitusi vaid %1 tunni %2 minuti jooksul peale postitamist",
+    "post-delete-duration-expired-days": "Teil on lubatud kustutada oma postitusi vaid %1 päeva jooksul peale postitamist",
+    "post-delete-duration-expired-days-hours": "Teil on lubatud kustutada oma postitusi vaid %1 päeva %2 tunni jooksul peale postitamist",
+    "cant-delete-topic-has-reply": "Sa ei saa oma postitust kustutada, kui sellele on vastatud",
+    "cant-delete-topic-has-replies": "Sa ei saa oma postitust kustutada pärast seda, kui sellel on %1 vastust",
     "content-too-short": "Palun tehke pikem postitus. Postituse pikkus peab olema vähemalt %1 tähemärk(i).",
     "content-too-long": "Palun tehke lühem postitus. Postituse pikkus peab olema vähem kui %1 tähemärk(i).",
     "title-too-short": "Palun sisesta pikem pealkiri. Pealkirjad ei saa olla lühemad kui %1 tähemärk(i).",
@@ -74,12 +74,12 @@
     "already-unfavourited": "Sa oled juba selle postituse järjehoidjatest ära võtnud.",
     "cant-ban-other-admins": "Sa ei saa bannida teisi administraatoreid!",
     "cant-remove-last-admin": "Te olete ainus administraator. Lisage keegi teine administraatoriks, enne kui eemaldate endalt administraatori.",
-    "cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",
+    "cant-delete-admin": "Eemalda sellelt kasutajalt administraatori õigused enne selle kustutamist",
     "invalid-image-type": "Vigane pildi formaat. Lubatud formaadid on: %1",
     "invalid-image-extension": "Vigane pildi formaat",
     "invalid-file-type": "Vigane faili formaat. Lubatud formaadid on: %1",
     "group-name-too-short": "Grupi nimi liiga lühike",
-    "group-name-too-long": "Group name too long",
+    "group-name-too-long": "Grupi nimi liiga pikk",
     "group-already-exists": "Grupp juba eksisteerib",
     "group-name-change-not-allowed": "Grupi nimevahetus ei ole lubatud",
     "group-already-member": "Oled juba selles grupis",
@@ -122,6 +122,6 @@
     "not-in-room": "Kasutaja pole ruumis",
     "no-users-in-room": "Ühtegi kasutajat ei leidu siit ruumist",
     "cant-kick-self": "Sa ei saa ennast ära visata gruppist",
-    "no-users-selected": "No user(s) selected",
-    "invalid-home-page-route": "Invalid home page route"
+    "no-users-selected": "Ühtki kasutajat pole valitud",
+    "invalid-home-page-route": "Vigane avalehe suunamine"
 }
\ No newline at end of file
diff --git a/public/language/et/global.json b/public/language/et/global.json
index ba6bb6c304..339239f4bb 100644
--- a/public/language/et/global.json
+++ b/public/language/et/global.json
@@ -7,10 +7,10 @@
     "403.login": "Äkki peaksid <a href='%1/login'>sisse logima</a>?",
     "404.title": "Ei leitud",
     "404.message": "Tundub, et lehte mida otsid, ei eksisteeri. Mine tagasi <a href='%1/'>avalehele</a>.",
-    "500.title": "Internal Error.",
+    "500.title": "Süsteemne error.",
     "500.message": "Oih! Midagi läks valesti!",
-    "400.title": "Bad Request.",
-    "400.message": "It looks like this link is malformed, please double-check and try again. Otherwise, return to the <a href='%1/'>home page</a>.",
+    "400.title": "Vigane päring.",
+    "400.message": "Tundub, et see link on vigane, palun kontrolli see üle ja proovi uuesti. Võid ka minna tagasi <a href='%1/'>avalehele</a>.",
     "register": "Registreeri",
     "login": "Logi sisse",
     "please_log_in": "Palun logi sisse",
@@ -52,9 +52,9 @@
     "topics": "Teemat",
     "posts": "Postitust",
     "best": "Parim",
-    "upvoters": "Upvoters",
+    "upvoters": "Poolt hääletajad",
     "upvoted": "Kiideti heaks",
-    "downvoters": "Downvoters",
+    "downvoters": "Vastu hääletajad",
     "downvoted": "Hääletas vastu",
     "views": "Vaatamist",
     "reputation": "Reputatsioon",
@@ -95,5 +95,5 @@
     "upload_file": "Lae fail üles",
     "upload": "Lae üles",
     "allowed-file-types": "Lubatud faili formaadid on %1",
-    "unsaved-changes": "You have unsaved changes. Are you sure you wish to navigate away?"
+    "unsaved-changes": "Sul on salvestamata muudatusi. Oled kindel, et soovid lahkuda?"
 }
\ No newline at end of file
diff --git a/public/language/et/login.json b/public/language/et/login.json
index 6c488ec5e2..0b3eb840ff 100644
--- a/public/language/et/login.json
+++ b/public/language/et/login.json
@@ -8,5 +8,5 @@
     "failed_login_attempt": "Sisselogimine ebaõnnestus",
     "login_successful": "Edukalt sisse logitud!",
     "dont_have_account": "Pole veel kasutajat?",
-    "logged-out-due-to-inactivity": "You have been logged out of the Admin Control Panel due to inactivity"
+    "logged-out-due-to-inactivity": "Sind on Administraatori Juhtpaneelist ebaaktiivsuse tõttu välja logitud"
 }
\ No newline at end of file
diff --git a/public/language/et/pages.json b/public/language/et/pages.json
index 22015dadab..1b7cd02ef6 100644
--- a/public/language/et/pages.json
+++ b/public/language/et/pages.json
@@ -12,7 +12,7 @@
     "users/sort-posts": "Kasutajad, kel on enim postitusi",
     "users/sort-reputation": "Suurima reputatsiooniga kasutajad",
     "users/banned": "Keelustatud Kasutajad",
-    "users/most-flags": "Most flagged users",
+    "users/most-flags": "Enim raporteeritud kasutajad",
     "users/search": "Kasutajate otsing",
     "notifications": "Teated",
     "tags": "Märksõnad",
@@ -29,7 +29,7 @@
     "account/edit/password": "Redigeerid \"%1\" parooli",
     "account/edit/username": "Redigeerid \"%1\" kasutajanime",
     "account/edit/email": "Redigeerid \"%1\" emaili",
-    "account/info": "Account Info",
+    "account/info": "Kasutaja info",
     "account/following": "Kasutaja %1 jälgib",
     "account/followers": "Kasutajad, kes jälgivad %1",
     "account/posts": "Postitused, mis on tehtud kasutaja %1 poolt",
diff --git a/public/language/et/register.json b/public/language/et/register.json
index c0b7442158..11c8c1e2d0 100644
--- a/public/language/et/register.json
+++ b/public/language/et/register.json
@@ -1,6 +1,6 @@
 {
     "register": "Registreeri",
-    "cancel_registration": "Cancel Registration",
+    "cancel_registration": "Katkesta registreerimine",
     "help.email": "Algsättena peidetakse sinu e-mail avalikuse eest.",
     "help.username_restrictions": "Unikaalne kasutajanimi, mis on  %1 - %2 tähemärki pikk. Teised saavad sind postitustes mainida kasutades @<span id='yourUsername'>kasutajanime</span>.",
     "help.minimum_password_length": "Sinu parooli pikkus peab olema vähemalt %1 tähemärki pikk.",
@@ -16,8 +16,8 @@
     "alternative_registration": "Alternatiivne registreerimismeetod",
     "terms_of_use": "Foorumi reeglid",
     "agree_to_terms_of_use": "Nõustun foorumi reeglitega",
-    "terms_of_use_error": "You must agree to the Terms of Use",
+    "terms_of_use_error": "Sa pead nõustuma Tingimustega",
     "registration-added-to-queue": "Teie registreerimine vaadatakse üle. Te saate e-kirja kui administraator on aktsepteerinud registreermimise.",
-    "interstitial.intro": "We require some additional information before we can create your account.",
-    "interstitial.errors-found": "We could not complete your registration:"
+    "interstitial.intro": "Enne kasutaja loomist on meil vaja lisainfot.",
+    "interstitial.errors-found": "Meil ei õnnestunud registreerimist lõpule viia:"
 }
\ No newline at end of file
diff --git a/public/language/et/topic.json b/public/language/et/topic.json
index 0e236f149d..a1012d10a4 100644
--- a/public/language/et/topic.json
+++ b/public/language/et/topic.json
@@ -26,14 +26,14 @@
     "tools": "Tööriistad",
     "flag": "Märgista",
     "locked": "Lukustatud",
-    "pinned": "Pinned",
-    "moved": "Moved",
+    "pinned": "Märgistatud",
+    "moved": "Liigutatud",
     "bookmark_instructions": "Vajuta siia, et tagasi minna viimati loetud postituse juurde siin teemas.",
     "flag_title": "Märgista see postitus modereerimiseks",
     "flag_success": "See postitus on nüüd märgistatud modereerimiseks.",
     "deleted_message": "See teema on kustutatud. Ainult kasutajad kellel on piisavalt õigusi saavad seda näha.",
     "following_topic.message": "Sulle ei edastata enam teateid uutest postitustest kui keegi postitab siia teemasse.",
-    "not_following_topic.message": "You will see this topic in the unread topics list, but you will not receive notifications when somebody posts to this topic.",
+    "not_following_topic.message": "Sa näed seda postitust lugemata postituste nimekirjas, kuid sa ei näe selle kohta teateid, kui keegi sinna postitab.",
     "ignoring_topic.message": "Sa ei näe seda teemat enam lugemata teemade nimekirjas. Sind teavitatakse, kui Sind mainitakse või Sinu postitust kiidetakse heaks.",
     "login_to_subscribe": "Palun registreeru kasutajaks või logi sisse, et tellida teateid selle postituse kohta.",
     "markAsUnreadForAll.success": "Teema märgitud mitte-loetuks kõikidele.",
@@ -86,7 +86,7 @@
     "topic_will_be_moved_to": "See teema liigutatakse antud kategooriasse",
     "fork_topic_instruction": "Vajuta postitustele, mida soovid forkida",
     "fork_no_pids": "Sa ei ole postitusi valinud!",
-    "fork_pid_count": "%1 post(s) selected",
+    "fork_pid_count": "%1 postitus(t) valitud",
     "fork_success": "Edukalt ''forkisid'' teema! Vajuta siia, et vaadata loodud teemat.",
     "delete_posts_instruction": "Klikka postitustel, mida tahad kustutada/puhastada",
     "composer.title_placeholder": "Sisesta teema pealkiri siia...",
diff --git a/public/language/et/user.json b/public/language/et/user.json
index 81b9f5b22b..0e94b3198d 100644
--- a/public/language/et/user.json
+++ b/public/language/et/user.json
@@ -6,7 +6,7 @@
     "postcount": "Postitusi",
     "email": "Email",
     "confirm_email": "Kinnita email",
-    "account_info": "Account Info",
+    "account_info": "Kasutaja info",
     "ban_account": "Bannige kasutaja",
     "ban_account_confirm": "Kas te tõesti soovite antud kasutajat bannida?",
     "unban_account": "Eemaldage kontolt ban",
@@ -96,8 +96,8 @@
     "delay_image_loading": "Viivita pildi laadimisega",
     "image_load_delay_help": "Kui lubatud, pildid teemades ei lae kuni nad on nähtavuses",
     "scroll_to_my_post": "Pärast vastuse postitamist, näita uut postitust",
-    "follow_topics_you_reply_to": "Watch topics that you reply to",
-    "follow_topics_you_create": "Watch topics you create",
+    "follow_topics_you_reply_to": "Jälgi teemasid, millele vastad",
+    "follow_topics_you_create": "Jälgi teemasid, mille lood",
     "grouptitle": "Grupi tiitel",
     "no-group-title": "Grupi tiitel puudub",
     "select-skin": "Vali välimus",
@@ -109,10 +109,10 @@
     "sso.title": "Ühekordse sisselogimisega teenused",
     "sso.associated": "Seotud koos",
     "sso.not-associated": "Kliki siia, et siduda koos",
-    "info.latest-flags": "Latest Flags",
-    "info.no-flags": "No Flagged Posts Found",
-    "info.ban-history": "Recent Ban History",
-    "info.no-ban-history": "This user has never been banned",
-    "info.banned-until": "Banned until %1",
-    "info.banned-permanently": "Banned permanently"
+    "info.latest-flags": "Viimased raporteerimised",
+    "info.no-flags": "Raporteeritud postitusi ei leitud",
+    "info.ban-history": "Hiljutiste keeldude ajalugu",
+    "info.no-ban-history": "Seda kasutajat pole kunagi keelustatud",
+    "info.banned-until": "Keelustatud kuni %1",
+    "info.banned-permanently": "Igavesti keelustatud"
 }
\ No newline at end of file
diff --git a/public/language/et/users.json b/public/language/et/users.json
index a9b23a1b38..7c5da97116 100644
--- a/public/language/et/users.json
+++ b/public/language/et/users.json
@@ -2,7 +2,7 @@
     "latest_users": "Hilised kasutajad",
     "top_posters": "Top postitajad",
     "most_reputation": "Kõige rohkem reputatsiooni",
-    "most_flags": "Most Flags",
+    "most_flags": "Enim raporteerimisi",
     "search": "Otsi",
     "enter_username": "Sisesta kasutajanimi, keda soovid otsida",
     "load_more": "Lae veel",
diff --git a/public/language/it/email.json b/public/language/it/email.json
index 8eddb0539d..bd1ddb45d7 100644
--- a/public/language/it/email.json
+++ b/public/language/it/email.json
@@ -5,8 +5,8 @@
     "greeting_no_name": "Ciao",
     "greeting_with_name": "Ciao %1",
     "welcome.text1": "Grazie per esserti registrato su %1!",
-    "welcome.text2": "Per attivare completamente il tuo account dobbiamo verificare che sei il proprietario dell'indiritto email con cui ti sei registrato.",
-    "welcome.text3": "Un Amministratora ha accettato la tua registrazione. Puoi adesso collegarti con il tuo nome utente e la tua password.",
+    "welcome.text2": "Per attivare completamente il tuo account dobbiamo verificare che sei il proprietario dell'indirizzo email con cui ti sei registrato.",
+    "welcome.text3": "Un Amministratora ha accettato la tua registrazione. Adesso puoi collegarti con il tuo nome utente/ password.",
     "welcome.cta": "Clicca qui per confermare il tuo indirizzo email",
     "invitation.text1": "%1 ti ha invitato a entrare in %2",
     "invitation.ctr": "Clicca qui per creare il tuo account.",
diff --git a/public/language/it/global.json b/public/language/it/global.json
index a9b0e569b7..28da5ad9c8 100644
--- a/public/language/it/global.json
+++ b/public/language/it/global.json
@@ -7,7 +7,7 @@
     "403.login": "Forse dovresti <a href='%1/login'>effettuare l'accesso</a>?",
     "404.title": "Non trovato",
     "404.message": "Sembra tu sia arrivato ad una pagina che non esiste. Torna alla <a href='%1/'>home page</a>.",
-    "500.title": "Internal Error.",
+    "500.title": "Errore interno.",
     "500.message": "Oops! Qualcosa non funziona come si deve!",
     "400.title": "Bad Request.",
     "400.message": "It looks like this link is malformed, please double-check and try again. Otherwise, return to the <a href='%1/'>home page</a>.",
diff --git a/public/language/it/user.json b/public/language/it/user.json
index 355e6e84be..c2f3fe9995 100644
--- a/public/language/it/user.json
+++ b/public/language/it/user.json
@@ -64,7 +64,7 @@
     "upload_cover_picture": "Carica immagine di copertina",
     "settings": "Impostazioni",
     "show_email": "Mostra la mia Email",
-    "show_fullname": "Vedi il Mio Nome Completo",
+    "show_fullname": "Mostra il mio nome completo",
     "restrict_chats": "Abilita messaggi in chat soltanto dagli utenti che seguo",
     "digest_label": "Iscriviti al Sommario",
     "digest_description": "Abbonati agli aggiornamenti via email di questo forum (nuove notifiche e discussioni) secondo una pianificazione impostata",
@@ -73,7 +73,7 @@
     "digest_weekly": "Settimanale",
     "digest_monthly": "Mensile",
     "send_chat_notifications": "Invia una email se arriva un nuovo messaggio di chat e non sono online",
-    "send_post_notifications": "Invia una email quando le risposte sono fatte a discussioni a cui sono sottoscritto",
+    "send_post_notifications": "Invia una email quando ci sono nuove risposte a discussioni a cui sono sottoscritto",
     "settings-require-reload": "Alcuni cambiamenti di impostazioni richiedono un ricaricamento. Clicca qui per ricaricare la pagina.",
     "has_no_follower": "Questo utente non è seguito da nessuno :(",
     "follows_no_one": "Questo utente non segue nessuno :(",