diff options
| author | lupo49 <post@lupo49.de> | 2011-08-29 18:37:02 +0200 |
|---|---|---|
| committer | lupo49 <post@lupo49.de> | 2011-08-29 18:37:02 +0200 |
| commit | e2b5ad84f88d0bd1fe510fa74673cc7557c6e630 (patch) | |
| tree | 805e0a26114836e52fcf9b49a7636b34836332cb /lib/plugins/acl | |
| parent | d8f231b5162801fe333f899552b5808a83282634 (diff) | |
| parent | ab8fecc6efc832771505467be33a88e0cafec04e (diff) | |
| download | rpg-e2b5ad84f88d0bd1fe510fa74673cc7557c6e630.tar.gz rpg-e2b5ad84f88d0bd1fe510fa74673cc7557c6e630.tar.bz2 | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'lib/plugins/acl')
| -rw-r--r-- | lib/plugins/acl/lang/es/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/pl/lang.php | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php index 096320af9..91a4ca1a1 100644 --- a/lib/plugins/acl/lang/es/lang.php +++ b/lib/plugins/acl/lang/es/lang.php @@ -20,6 +20,7 @@ * @author Victor Castelan <victorcastelan@gmail.com> * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com> * @author emezeta <emezeta@infoprimo.com> + * @author Oscar Ciudad <oscar@jacho.net> */ $lang['admin_acl'] = 'Administración de lista de control de acceso'; $lang['acl_group'] = 'Grupo'; diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php index c954abe2a..a72b6af11 100644 --- a/lib/plugins/acl/lang/pl/lang.php +++ b/lib/plugins/acl/lang/pl/lang.php @@ -11,6 +11,7 @@ * @author Leszek Stachowski <shazarre@gmail.com> * @author maros <dobrimaros@yahoo.pl> * @author Grzegorz Widła <dzesdzes@gmail.com> + * @author Łukasz Chmaj <teachmeter@gmail.com> */ $lang['admin_acl'] = 'Zarządzanie uprawnieniami'; $lang['acl_group'] = 'Grupa'; |