diff options
author | Klap-in <klapinklapin@gmail.com> | 2013-07-21 23:10:32 +0200 |
---|---|---|
committer | Klap-in <klapinklapin@gmail.com> | 2013-07-21 23:10:32 +0200 |
commit | b1ffadaa6963bbf83e61917c31e04c04c421ce9e (patch) | |
tree | f9a1391d2ee6536473b1672e249c1b11a67a5b0e /lib/plugins/acl | |
parent | fa3ed26bfbafa4d05ec77a799259d4a46baadd9a (diff) | |
parent | fbd8067eeeb9f424981aad8b283e17f734c738c3 (diff) | |
download | rpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.gz rpg-b1ffadaa6963bbf83e61917c31e04c04c421ce9e.tar.bz2 |
Merge remote-tracking branch 'origin/master' into fetchimagetokexternal
Diffstat (limited to 'lib/plugins/acl')
-rw-r--r-- | lib/plugins/acl/lang/de-informal/lang.php | 1 | ||||
-rw-r--r-- | lib/plugins/acl/lang/sv/lang.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php index 8b1416137..45a993982 100644 --- a/lib/plugins/acl/lang/de-informal/lang.php +++ b/lib/plugins/acl/lang/de-informal/lang.php @@ -9,6 +9,7 @@ * @author Christian Wichmann <nospam@zone0.de> * @author Pierre Corell <info@joomla-praxis.de> * @author Frank Loizzi <contact@software.bacal.de> + * @author Volker Bödker <volker@boedker.de> */ $lang['admin_acl'] = 'Zugangsverwaltung'; $lang['acl_group'] = 'Gruppe'; diff --git a/lib/plugins/acl/lang/sv/lang.php b/lib/plugins/acl/lang/sv/lang.php index 7f963d5e1..388672fc0 100644 --- a/lib/plugins/acl/lang/sv/lang.php +++ b/lib/plugins/acl/lang/sv/lang.php @@ -16,6 +16,7 @@ * @author Peter Åström <eaustreum@gmail.com> * @author Håkan Sandell <hakan.sandell@home.se> * @author mikael@mallander.net + * @author Smorkster Andersson smorkster@gmail.com */ $lang['admin_acl'] = 'Hantera behörighetslistan (ACL)'; $lang['acl_group'] = 'Grupp'; |