Merge branch 'master' into stable

Conflicts:
	conf/msg
	lib/plugins/acl/ajax.php

6 files changed, 54 insertions, 0 deletions

diff --git a/lib/plugins/usermanager/lang/ia/add.txt b/lib/plugins/usermanager/lang/ia/add.txt
new file mode 100644
index 000000000..4695834f4
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/add.txt
@@ -0,0 +1 @@
+===== Adder usator =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/delete.txt b/lib/plugins/usermanager/lang/ia/delete.txt
new file mode 100644
index 000000000..db1b4c077
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/delete.txt
@@ -0,0 +1 @@
+===== Deler usator =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/edit.txt b/lib/plugins/usermanager/lang/ia/edit.txt
new file mode 100644
index 000000000..2fcf02378
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/edit.txt
@@ -0,0 +1 @@
+===== Modificar usator =====
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/intro.txt b/lib/plugins/usermanager/lang/ia/intro.txt
new file mode 100644
index 000000000..f4fafcb9b
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/intro.txt
@@ -0,0 +1 @@
+====== Gestion de usatores ======
\ No newline at end of file
diff --git a/lib/plugins/usermanager/lang/ia/lang.php b/lib/plugins/usermanager/lang/ia/lang.php
new file mode 100644
index 000000000..a8b8f45c0
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/lang.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
+$lang['menu']                  = 'Gestion de usatores';
+$lang['noauth']                = '(authentication de usatores non disponibile)';
+$lang['nosupport']             = '(gestion de usatores non supportate)';
+$lang['badauth']               = 'mechanismo de authentication invalide';
+$lang['user_id']               = 'Usator';
+$lang['user_pass']             = 'Contrasigno';
+$lang['user_name']             = 'Nomine real';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Gruppos';
+$lang['field']                 = 'Campo';
+$lang['value']                 = 'Valor';
+$lang['add']                   = 'Adder';
+$lang['delete']                = 'Deler';
+$lang['delete_selected']       = 'Deler seligite';
+$lang['edit']                  = 'Modificar';
+$lang['edit_prompt']           = 'Modificar iste usator';
+$lang['modify']                = 'Salveguardar cambios';
+$lang['search']                = 'Cercar';
+$lang['search_prompt']         = 'Executar recerca';
+$lang['clear']                 = 'Reinitialisar filtro de recerca';
+$lang['filter']                = 'Filtro';
+$lang['summary']               = 'Presentation del usatores %1$d-%2$d de %3$d trovate. %4$d usatores in total.';
+$lang['nonefound']             = 'Nulle usator trovate. %d usatores in total.';
+$lang['delete_ok']             = '%d usatores delite';
+$lang['delete_fail']           = 'Deletion de %d usatores fallite.';
+$lang['update_ok']             = 'Actualisation del usator succedite';
+$lang['update_fail']           = 'Actualisation del usator fallite';
+$lang['update_exists']         = 'Le modification del nomine del usator ha fallite; le usator specificate (%s) ja existe. (Omne altere modificationes essera applicate.)
+';
+$lang['start']                 = 'initio';
+$lang['prev']                  = 'precedente';
+$lang['next']                  = 'sequente';
+$lang['last']                  = 'fin';
+$lang['edit_usermissing']      = 'Le usator seligite non ha essite trovate. Es possibile que le nomine de usator specificate ha essite delite o cambiate alterubi.';
+$lang['user_notify']           = 'Notificar usator';
+$lang['note_notify']           = 'Le messages de notification es solmente inviate un nove contrasigno es date al usator.';
+$lang['note_group']            = 'Nove usatores essera addite al gruppo predefinite (%s) si nulle gruppo es specificate.';
+$lang['note_pass']             = 'Le contrasigno essera automaticamente generate si le campo es lassate vacue e le notification del usator es activate.';
+$lang['add_ok']                = 'Addition del usator succedite';
+$lang['add_fail']              = 'Addition del usator fallite';
+$lang['notify_ok']             = 'Message de notification inviate';
+$lang['notify_fail']           = 'Le message de notification non poteva esser inviate';
diff --git a/lib/plugins/usermanager/lang/ia/list.txt b/lib/plugins/usermanager/lang/ia/list.txt
new file mode 100644
index 000000000..f545f06df
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ia/list.txt
@@ -0,0 +1 @@
+===== Lista de usatores =====
\ No newline at end of file