diff options
author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-19 20:45:57 +0200 |
---|---|---|
committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-19 20:45:57 +0200 |
commit | b66e5840006078112b8da741b2c612e446afd452 (patch) | |
tree | a7067fa152428b3c0b41cae8435a94997167bacb /lib/plugins/usermanager | |
parent | c8d7c9382a31eaccc516f088312894797f4fe4bb (diff) | |
parent | 54b26fbe1e0f9efaba143d88ea8581933f5c8dc8 (diff) | |
download | rpg-b66e5840006078112b8da741b2c612e446afd452.tar.gz rpg-b66e5840006078112b8da741b2c612e446afd452.tar.bz2 |
Merge remote-tracking branch 'origin/master' into trailingcolons
Conflicts:
lib/plugins/usermanager/lang/nl/intro.txt
Diffstat (limited to 'lib/plugins/usermanager')
-rw-r--r-- | lib/plugins/usermanager/lang/nl/intro.txt | 2 | ||||
-rw-r--r-- | lib/plugins/usermanager/lang/nl/lang.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/plugins/usermanager/lang/nl/intro.txt b/lib/plugins/usermanager/lang/nl/intro.txt index 46968ac2d..819e64d7d 100644 --- a/lib/plugins/usermanager/lang/nl/intro.txt +++ b/lib/plugins/usermanager/lang/nl/intro.txt @@ -1 +1 @@ -====== Gebruikersmanager ====== +====== Gebruikersbeheer ====== diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php index 5cebede89..3f9902e14 100644 --- a/lib/plugins/usermanager/lang/nl/lang.php +++ b/lib/plugins/usermanager/lang/nl/lang.php @@ -15,8 +15,9 @@ * @author Jeroen * @author Ricardo Guijt <ricardoguijt@gmail.com> * @author Gerrit Uitslag <klapinklapin@gmail.com> + * @author Rene <wllywlnt@yahoo.com> */ -$lang['menu'] = 'Gebruikersmanager'; +$lang['menu'] = 'Gebruikersbeheer'; $lang['noauth'] = '(gebruikersauthenticatie niet beschikbaar)'; $lang['nosupport'] = '(gebruikersbeheer niet ondersteund)'; $lang['badauth'] = 'ongeldige authenticatiemethode'; |