Merge branch 'master' into stable

Conflicts:
	doku.php

1 files changed, 24 insertions, 0 deletions

diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php
index 0ffea1244..2161df918 100644
--- a/lib/plugins/usermanager/lang/et/lang.php
+++ b/lib/plugins/usermanager/lang/et/lang.php
@@ -3,4 +3,28 @@
  * Estonian language file
  *
  * @author kristian.kankainen@kuu.la
+ * @author Rivo Zängov <eraser@eraser.ee>
  */
+$lang['menu']                  = 'Kasutajate haldamine';
+$lang['user_id']               = 'Kasutaja';
+$lang['user_pass']             = 'Parool';
+$lang['user_name']             = 'Tegelik nimi';
+$lang['user_mail']             = 'E-post';
+$lang['user_groups']           = 'Grupid';
+$lang['field']                 = 'Väli';
+$lang['value']                 = 'Väärtus';
+$lang['add']                   = 'Lisa';
+$lang['delete']                = 'Kustuta';
+$lang['delete_selected']       = 'Kustuta valitud';
+$lang['edit']                  = 'Muuda';
+$lang['edit_prompt']           = 'Muuda seda kasutajat';
+$lang['modify']                = 'Salvesta muudatused';
+$lang['search']                = 'Otsi';
+$lang['search_prompt']         = 'Soorita otsing';
+$lang['filter']                = 'Filtreeri';
+$lang['update_fail']           = 'Kasutaja uuendamine ebaõnnestus';
+$lang['start']                 = 'esimesed';
+$lang['prev']                  = 'eelmine';
+$lang['next']                  = 'järgmine';
+$lang['last']                  = 'viimased';
+$lang['user_notify']           = 'Teavita kasutajat';