summaryrefslogtreecommitdiff
path: root/lib/plugins/usermanager
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2012-01-25 20:24:15 +0100
committerAndreas Gohr <andi@splitbrain.org>2012-01-25 20:24:15 +0100
commit8ffcd8ae653b6e080efb01adcc96482315496bab (patch)
tree0d3ef49407be7b821f2b25f02305ad8bd7a9d6df /lib/plugins/usermanager
parent61d7a0b7204a0a21c3fdcd65c7d2661403c0a443 (diff)
parent5371328c2ade9ee2c2e09db62992fe4cfaadbbf1 (diff)
downloadrpg-8ffcd8ae653b6e080efb01adcc96482315496bab.tar.gz
rpg-8ffcd8ae653b6e080efb01adcc96482315496bab.tar.bz2
Merge branch 'master' into stable
* master: (75 commits) release preparations Romanian language update removed 'view original' button from new media manager again (was added in b8a84c03) and made a link around the image instead, as that is a more minor change (as it should be during the RC phase) and is what was originally planned corrected old mediaupload introduction text Removed obsolete Opera fix that now causes harm FS#2429 don't limit download sizes in plugin manager Disable E_STRICT error reporting Make Sitemapper functions static as they were used as static functions Make this dummy file empty like all others Update copyright year Remove testing md5 hash from installer Slovak language update localization: removed strings from old flashuploader Polish language update readded missing "view original" button to the new media manager always show full filename as tooltip in mediamanager Fix sorting in media manager search (FS#2423) make the installer check for new media dirs do not rely on tmpfile() in the AJAX uploader backend FS#2417 Galician language update ...
Diffstat (limited to 'lib/plugins/usermanager')
-rw-r--r--lib/plugins/usermanager/lang/cs/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/de-informal/lang.php4
-rw-r--r--lib/plugins/usermanager/lang/de/lang.php4
-rw-r--r--lib/plugins/usermanager/lang/eo/lang.php2
-rw-r--r--lib/plugins/usermanager/lang/es/lang.php2
-rw-r--r--lib/plugins/usermanager/lang/fr/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/gl/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/ms/lang.php6
-rw-r--r--lib/plugins/usermanager/lang/nl/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/no/lang.php3
-rw-r--r--lib/plugins/usermanager/lang/pl/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/ro/lang.php1
-rw-r--r--lib/plugins/usermanager/lang/zh/lang.php1
13 files changed, 21 insertions, 7 deletions
diff --git a/lib/plugins/usermanager/lang/cs/lang.php b/lib/plugins/usermanager/lang/cs/lang.php
index c805011d7..fe54d4cce 100644
--- a/lib/plugins/usermanager/lang/cs/lang.php
+++ b/lib/plugins/usermanager/lang/cs/lang.php
@@ -9,6 +9,7 @@
* @author Marek Sacha <sachamar@fel.cvut.cz>
* @author Lefty <lefty@multihost.cz>
* @author Vojta Beran <xmamut@email.cz>
+ * @author zbynek.krivka@seznam.cz
*/
$lang['menu'] = 'Správa uživatelů';
$lang['noauth'] = '(autentizace uživatelů není k dispozici)';
diff --git a/lib/plugins/usermanager/lang/de-informal/lang.php b/lib/plugins/usermanager/lang/de-informal/lang.php
index 63ccdd6e4..dbdce1fbf 100644
--- a/lib/plugins/usermanager/lang/de-informal/lang.php
+++ b/lib/plugins/usermanager/lang/de-informal/lang.php
@@ -48,5 +48,5 @@ $lang['note_group'] = 'Neue Benutzer werden zur Standardgruppe (%s) h
$lang['note_pass'] = 'Das Passwort wird automatisch erzeugt, wenn das Feld freigelassen wird und der Benutzer Benachrichtigungen aktiviert hat.';
$lang['add_ok'] = 'Benutzer erfolgreich hinzugefügt';
$lang['add_fail'] = 'Hinzufügen des Benutzers fehlgeschlagen';
-$lang['notify_ok'] = 'Benachrichtigungsemail wurde versendet';
-$lang['notify_fail'] = 'Benachrichtigungsemail konnte nicht gesendet werden';
+$lang['notify_ok'] = 'Benachrichtigungs-Mail wurde versendet';
+$lang['notify_fail'] = 'Benachrichtigungse-Mail konnte nicht gesendet werden';
diff --git a/lib/plugins/usermanager/lang/de/lang.php b/lib/plugins/usermanager/lang/de/lang.php
index 585c70a76..507fe1f7c 100644
--- a/lib/plugins/usermanager/lang/de/lang.php
+++ b/lib/plugins/usermanager/lang/de/lang.php
@@ -57,5 +57,5 @@ $lang['note_group'] = 'Neue Nutzer werden der Standard-Gruppe (%s) hi
$lang['note_pass'] = 'Das Passwort wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Nutzers aktiviert ist.';
$lang['add_ok'] = 'Nutzer erfolgreich angelegt';
$lang['add_fail'] = 'Nutzer konnte nicht angelegt werden';
-$lang['notify_ok'] = 'Benachrichtigungsmail wurde versandt';
-$lang['notify_fail'] = 'Benachrichtigungsmail konnte nicht versandt werden';
+$lang['notify_ok'] = 'Benachrichtigungs-Mail wurde versandt';
+$lang['notify_fail'] = 'Benachrichtigungs-Mail konnte nicht versandt werden';
diff --git a/lib/plugins/usermanager/lang/eo/lang.php b/lib/plugins/usermanager/lang/eo/lang.php
index 9a515dc9c..b5f1abc0e 100644
--- a/lib/plugins/usermanager/lang/eo/lang.php
+++ b/lib/plugins/usermanager/lang/eo/lang.php
@@ -13,7 +13,7 @@
* @author Robert BOGENSCHNEIDER <robog@gmx.de>
* @author Robert BOGENSCHNEIDER <bogi@UEA.org>
*/
-$lang['menu'] = 'Administrado de Uzantoj';
+$lang['menu'] = 'Administrado de uzantoj';
$lang['noauth'] = '(identiĝo de uzantoj ne disponeblas)';
$lang['nosupport'] = '(administro de uzantoj ne estas subtenata)';
$lang['badauth'] = 'tiu identiĝa procezo ne validas';
diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index 804df2a4b..c12b77b3d 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -49,7 +49,7 @@ $lang['delete_ok'] = '%d usuarios eliminados';
$lang['delete_fail'] = '%d no se pudieron eliminar.';
$lang['update_ok'] = 'Los datos del usuario se actualizaron exitosamente ';
$lang['update_fail'] = 'Los datos del usuario no se actualizaron';
-$lang['update_exists'] = 'El cambio de nombre de usuario falló, el nombre especificado ($s) ya está en uso (los otros cambios se aplicaron).';
+$lang['update_exists'] = 'El cambio de nombre de usuario falló, el nombre especificado (%s) ya está en uso (los otros cambios se aplicaron).';
$lang['start'] = 'primera';
$lang['prev'] = 'anterior';
$lang['next'] = 'siguiente';
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 875b6d1a6..948262a8f 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -15,6 +15,7 @@
* @author Samuel Dorsaz samuel.dorsaz@novelion.net
* @author Johan Guilbaud <guilbaud.johan@gmail.com>
* @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
*/
$lang['menu'] = 'Gestion des utilisateurs';
$lang['noauth'] = '(authentification utilisateur non disponible)';
diff --git a/lib/plugins/usermanager/lang/gl/lang.php b/lib/plugins/usermanager/lang/gl/lang.php
index 0a01ef750..c9c633b39 100644
--- a/lib/plugins/usermanager/lang/gl/lang.php
+++ b/lib/plugins/usermanager/lang/gl/lang.php
@@ -3,6 +3,7 @@
* Galicianlanguage file
*
* @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
*/
$lang['menu'] = 'Xestor de Usuarios';
$lang['noauth'] = '(autenticación de usuarios non dispoñible)';
diff --git a/lib/plugins/usermanager/lang/ms/lang.php b/lib/plugins/usermanager/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/usermanager/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index cac793386..b00ab22e0 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -12,6 +12,7 @@
* @author Marijn Hofstra <hofstra.m@gmail.com>
* @author Timon Van Overveldt <timonvo@gmail.com>
* @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
*/
$lang['menu'] = 'Gebruikersmanager';
$lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)';
diff --git a/lib/plugins/usermanager/lang/no/lang.php b/lib/plugins/usermanager/lang/no/lang.php
index 668863ec2..7124e4811 100644
--- a/lib/plugins/usermanager/lang/no/lang.php
+++ b/lib/plugins/usermanager/lang/no/lang.php
@@ -14,6 +14,7 @@
* @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
* @author Rune Rasmussen syntaxerror.no@gmail.com
* @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
*/
$lang['menu'] = 'Behandle brukere';
$lang['noauth'] = '(autentisering av brukere ikke tilgjengelig)';
@@ -28,7 +29,7 @@ $lang['field'] = 'Felt';
$lang['value'] = 'Verdi';
$lang['add'] = 'Legg til';
$lang['delete'] = 'Slett';
-$lang['delete_selected'] = 'Slett utvalgte';
+$lang['delete_selected'] = 'Slett valgte';
$lang['edit'] = 'Rediger';
$lang['edit_prompt'] = 'Rediger denne brukeren';
$lang['modify'] = 'Lagre endringer';
diff --git a/lib/plugins/usermanager/lang/pl/lang.php b/lib/plugins/usermanager/lang/pl/lang.php
index 7c79c5d1f..5bbf84370 100644
--- a/lib/plugins/usermanager/lang/pl/lang.php
+++ b/lib/plugins/usermanager/lang/pl/lang.php
@@ -11,6 +11,7 @@
* @author maros <dobrimaros@yahoo.pl>
* @author Grzegorz Widła <dzesdzes@gmail.com>
* @author Łukasz Chmaj <teachmeter@gmail.com>
+ * @author Begina Felicysym <begina.felicysym@wp.eu>
*/
$lang['menu'] = 'Menadżer użytkowników';
$lang['noauth'] = '(uwierzytelnienie użytkownika niemożliwe)';
diff --git a/lib/plugins/usermanager/lang/ro/lang.php b/lib/plugins/usermanager/lang/ro/lang.php
index 4c0afc896..b8c1f24fc 100644
--- a/lib/plugins/usermanager/lang/ro/lang.php
+++ b/lib/plugins/usermanager/lang/ro/lang.php
@@ -9,6 +9,7 @@
* @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
* @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
* @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
*/
$lang['menu'] = 'Manager Utilizatori';
$lang['noauth'] = '(autentificarea utilizatorilor nu este disponibilă)';
diff --git a/lib/plugins/usermanager/lang/zh/lang.php b/lib/plugins/usermanager/lang/zh/lang.php
index c1cb0c91a..e7a228229 100644
--- a/lib/plugins/usermanager/lang/zh/lang.php
+++ b/lib/plugins/usermanager/lang/zh/lang.php
@@ -13,6 +13,7 @@
* @author Hiphen Lee <jacob.b.leung@gmail.com>
* @author caii, patent agent in China <zhoucaiqi@gmail.com>
* @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
*/
$lang['menu'] = '用户管理器';
$lang['noauth'] = '(用户认证不可用)';