Merge branch 'master' into stable

Conflicts:
	doku.php

1 files changed, 26 insertions, 0 deletions

diff --git a/lib/plugins/config/lang/et/lang.php b/lib/plugins/config/lang/et/lang.php
index 0ffea1244..27f2e87ac 100644
--- a/lib/plugins/config/lang/et/lang.php
+++ b/lib/plugins/config/lang/et/lang.php
@@ -3,4 +3,30 @@
  * Estonian language file
  *
  * @author kristian.kankainen@kuu.la
+ * @author Rivo Zängov <eraser@eraser.ee>
  */
+$lang['menu']                  = 'Seadete haldamine';
+$lang['_configuration_manager'] = 'Seadete haldamine';
+$lang['_basic']                = 'Peamised seaded';
+$lang['_display']              = 'Näitamise seaded';
+$lang['_authentication']       = 'Audentimise seaded';
+$lang['_anti_spam']            = 'Spämmitõrje seaded';
+$lang['_editing']              = 'Muutmise seaded';
+$lang['_links']                = 'Lingi seaded';
+$lang['_media']                = 'Meedia seaded';
+$lang['_advanced']             = 'Laiendatud seaded';
+$lang['_network']              = 'Võrgu seaded';
+$lang['_plugin_sufix']         = 'Plugina seaded';
+$lang['_template_sufix']       = 'Kujunduse seaded';
+$lang['title']                 = 'Wiki pealkiri';
+$lang['template']              = 'Kujundus';
+$lang['recent']                = 'Viimased muudatused';
+$lang['signature']             = 'Allkiri';
+$lang['defaultgroup']          = 'Vaikimisi grupp';
+$lang['disableactions_check']  = 'Kontrolli';
+$lang['compression_o_0']       = 'pole';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ära kasuta';
+$lang['useheading_o_0']        = 'Mitte kunagi';
+$lang['useheading_o_1']        = 'Alati';