diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-09-21 19:39:22 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-09-21 19:39:22 +0200 |
| commit | c6bab40722735490d4687c8ade8081f389913249 (patch) | |
| tree | 61090c1dfeafe80fd11a5035f6be38a68c2d62ed /lib/plugins/acl/lang/eo/lang.php | |
| parent | 32bb4dd2402ee999e6bc7be7e6fa1dd5c58049b1 (diff) | |
| parent | bc314c5832351325feac48564dae39a93321d99a (diff) | |
| download | rpg-c6bab40722735490d4687c8ade8081f389913249.tar.gz rpg-c6bab40722735490d4687c8ade8081f389913249.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
lib/tpl/default/mediamanager.css
Diffstat (limited to 'lib/plugins/acl/lang/eo/lang.php')
| -rw-r--r-- | lib/plugins/acl/lang/eo/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php index 85b262e8c..239578f57 100644 --- a/lib/plugins/acl/lang/eo/lang.php +++ b/lib/plugins/acl/lang/eo/lang.php @@ -10,6 +10,7 @@ * @author Erik Pedersen <erik.pedersen@shaw.ca> * @author Robert Bogenschneider <robog@GMX.de> * @author Robert BOGENSCHNEIDER <robog@gmx.de> + * @author Robert BOGENSCHNEIDER <bogi@UEA.org> */ $lang['admin_acl'] = 'Administrado de Alirkontrola Listo (ACL)'; $lang['acl_group'] = 'Grupo'; |