diff options
| author | Kate Arzamastseva <pshns@ukr.net> | 2011-06-04 18:59:05 +0300 |
|---|---|---|
| committer | Kate Arzamastseva <pshns@ukr.net> | 2011-06-04 18:59:05 +0300 |
| commit | 8d56551e75f273694893a29a06d8164d3d60ae17 (patch) | |
| tree | 80c181cbb7b4df28fe7691a2dd48fd6761dbe785 /lib/plugins/acl | |
| parent | e4f389ef1728a0f86164a0e4b88626be9860dabb (diff) | |
| parent | 0f80b0bcd4ca247f7bc4c3830946741546ad6e88 (diff) | |
| download | rpg-8d56551e75f273694893a29a06d8164d3d60ae17.tar.gz rpg-8d56551e75f273694893a29a06d8164d3d60ae17.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into media-revisions
Diffstat (limited to 'lib/plugins/acl')
| -rw-r--r-- | lib/plugins/acl/lang/hu/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/no/lang.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php index 30401b315..255d838b6 100644 --- a/lib/plugins/acl/lang/hu/lang.php +++ b/lib/plugins/acl/lang/hu/lang.php @@ -7,6 +7,7 @@ * @author schilling.janos@gmail.com * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu> * @author Sándor TIHANYI <stihanyi+dw@gmail.com> + * @author David Szabo <szabo.david@gyumolcstarhely.hu> */ $lang['admin_acl'] = 'Hozzáférési lista (ACL) kezelő'; $lang['acl_group'] = 'Csoport:'; diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index cd9e2edfb..71df0b382 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -15,6 +15,7 @@ * @author Lisa Ditlefsen <lisa@vervesearch.com> * @author Erik Pedersen <erik.pedersen@shaw.ca> * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca> + * @author Rune Rasmussen syntaxerror.no@gmail.com */ $lang['admin_acl'] = 'Administrasjon av lister for adgangskontroll (ACL)'; $lang['acl_group'] = 'Gruppe'; |