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 | |
| 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')
| -rw-r--r-- | lib/plugins/acl/lang/el/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/eo/lang.php | 1 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/no/lang.php | 2 | ||||
| -rw-r--r-- | lib/plugins/acl/lang/zh/lang.php | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/lib/plugins/acl/lang/el/lang.php b/lib/plugins/acl/lang/el/lang.php index e2f6c35dc..e1cd26755 100644 --- a/lib/plugins/acl/lang/el/lang.php +++ b/lib/plugins/acl/lang/el/lang.php @@ -13,6 +13,7 @@ * @author Αθανάσιος Νταής <homunculus@wana.gr> * @author Konstantinos Koryllos <koryllos@gmail.com> * @author George Petsagourakis <petsagouris@gmail.com> + * @author Petros Vidalis <pvidalis@gmail.com> */ $lang['admin_acl'] = 'Διαχείριση Δικαιωμάτων Πρόσβασης'; $lang['acl_group'] = 'Ομάδα'; 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'; diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php index 71df0b382..f0c92453c 100644 --- a/lib/plugins/acl/lang/no/lang.php +++ b/lib/plugins/acl/lang/no/lang.php @@ -40,7 +40,7 @@ $lang['perm'] = 'Tillatelser'; $lang['acl_perm0'] = 'Ingen'; $lang['acl_perm1'] = 'Lese'; $lang['acl_perm2'] = 'Redigere'; -$lang['acl_perm4'] = 'Lage'; +$lang['acl_perm4'] = 'Opprette'; $lang['acl_perm8'] = 'Laste opp'; $lang['acl_perm16'] = 'Slette'; $lang['acl_new'] = 'Legg til ny oppføring'; diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php index 581d08539..986fa769a 100644 --- a/lib/plugins/acl/lang/zh/lang.php +++ b/lib/plugins/acl/lang/zh/lang.php @@ -13,6 +13,7 @@ * @author caii <zhoucaiqi@gmail.com> * @author Hiphen Lee <jacob.b.leung@gmail.com> * @author caii, patent agent in China <zhoucaiqi@gmail.com> + * @author lainme993@gmail.com */ $lang['admin_acl'] = '访问控制列表（ACL）管理器'; $lang['acl_group'] = '组'; |