Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly

Conflicts:
	inc/lang/hr/searchpage.txt
	inc/lang/ko/searchpage.txt

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/plugins/usermanager/lang/et/lang.php b/lib/plugins/usermanager/lang/et/lang.php
index 2161df918..deb1e0be1 100644
--- a/lib/plugins/usermanager/lang/et/lang.php
+++ b/lib/plugins/usermanager/lang/et/lang.php
@@ -1,16 +1,18 @@
 <?php
+
 /**
- * Estonian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author kristian.kankainen@kuu.la
  * @author Rivo Zängov <eraser@eraser.ee>
+ * @author Janar Leas <janar.leas@eesti.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['user_groups']           = 'Rühmad';
 $lang['field']                 = 'Väli';
 $lang['value']                 = 'Väärtus';
 $lang['add']                   = 'Lisa';
@@ -28,3 +30,4 @@ $lang['prev']                  = 'eelmine';
 $lang['next']                  = 'järgmine';
 $lang['last']                  = 'viimased';
 $lang['user_notify']           = 'Teavita kasutajat';
+$lang['note_group']            = 'Kui rühma pole määratletud, siis lisatakse uued kasutajad vaikimisi rühma (%s).';