From c654938d56942c3166921564392e7d087ce06311 Mon Sep 17 00:00:00 2001
From: ben <ben@livetom.com>
Date: Tue, 5 Jan 2010 20:19:09 +0100
Subject: Chinese language update

---
 lib/plugins/acl/lang/zh/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/zh/lang.php b/lib/plugins/acl/lang/zh/lang.php
index 6ae32b01c..f9f924089 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/lang/zh/lang.php
@@ -8,6 +8,7 @@
  * @author George Sheraton guxd@163.com
  * @author Simon zhan <simonzhan@21cn.com>
  * @author mr.jinyi@gmail.com
+ * @author ben <ben@livetom.com>
  */
 $lang['admin_acl']             = '访问控制列表（ACL）管理器';
 $lang['acl_group']             = '组';
-- 
cgit v1.2.3


From 45c73e39a116986b7d3a6328a72ac18a054ddf9c Mon Sep 17 00:00:00 2001
From: Stefan Riemer <ste-re@web.de>
Date: Mon, 11 Jan 2010 18:19:48 +0100
Subject: German (informal) language update

---
 lib/plugins/acl/lang/de-informal/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index 56dedfc61..cd42fdedc 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -4,6 +4,7 @@
  *
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
+ * @author ste-re@web.de
  */
 $lang['admin_acl']             = 'Zugriffskontrollsystem Management';
 $lang['acl_group']             = 'Gruppe';
-- 
cgit v1.2.3


From 96a47e5d480e6c5b3aab1884a8536ec4b8ca2fab Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 13 Jan 2010 09:20:36 +0100
Subject: fixed information leakage in ACL plugin FS#1847

---
 lib/plugins/acl/ajax.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index 54eaa8dc7..97fae2ad1 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -16,9 +16,11 @@ require_once(DOKU_INC.'inc/init.php');
 require_once(DOKU_INC.'inc/common.php');
 require_once(DOKU_INC.'inc/pageutils.php');
 require_once(DOKU_INC.'inc/auth.php');
-//close sesseion
+//close session
 session_write_close();
 
+if(!auth_ismanager()) die('forbidden');
+
 $ID    = getID();
 
 if(!auth_isadmin) die('for admins only');
@@ -42,6 +44,7 @@ if($ajax == 'info'){
     if($ns == '*'){
         $ns ='';
     }
+    $ns  = cleanID($ns);
     $lvl = count(explode(':',$ns));
     $ns  = utf8_encodeFN(str_replace(':','/',$ns));
 
-- 
cgit v1.2.3


From 8c5215b744582107f352aa4ccea4182296674250 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 13 Jan 2010 09:40:30 +0100
Subject: another fix for FS#1847 + msg increased

---
 lib/plugins/acl/ajax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index 97fae2ad1..e383f0d35 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -19,7 +19,7 @@ require_once(DOKU_INC.'inc/auth.php');
 //close session
 session_write_close();
 
-if(!auth_ismanager()) die('forbidden');
+if(!auth_isadmin()) die('forbidden');
 
 $ID    = getID();
 
-- 
cgit v1.2.3


From d7554c0bb25241c1299af28785878d31ad02dbad Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 17 Jan 2010 10:52:59 +0100
Subject: Added CRSF security token checks in ACL plugin

---
 lib/plugins/acl/admin.php | 12 ++++++++----
 lib/plugins/acl/ajax.php  |  4 ++--
 lib/plugins/acl/script.js |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 59671a0cb..a3fb4636d 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -31,7 +31,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         return array(
             'author' => 'Andreas Gohr',
             'email'  => 'andi@splitbrain.org',
-            'date'   => '2009-08-07',
+            'date'   => '2010-01-17',
             'name'   => 'ACL Manager',
             'desc'   => 'Manage Page Access Control Lists',
             'url'    => 'http://dokuwiki.org/plugin:acl',
@@ -67,6 +67,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         // fresh 1:1 copy without replacements
         $AUTH_ACL = file(DOKU_CONF.'acl.auth.php');
 
+
         // namespace given?
         if($_REQUEST['ns'] == '*'){
             $this->ns = '*';
@@ -89,7 +90,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         // handle modifications
-        if(isset($_REQUEST['cmd'])){
+        if(isset($_REQUEST['cmd']) && checkSecurityToken()){
+
             // scope for modifications
             if($this->ns){
                 if($this->ns == '*'){
@@ -310,6 +312,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '<input type="hidden" name="id" value="'.hsc($ID).'" />'.NL;
         echo '<input type="hidden" name="do" value="admin" />'.NL;
         echo '<input type="hidden" name="page" value="acl" />'.NL;
+        echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL;
         echo '</div></form>'.NL;
     }
 
@@ -480,11 +483,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                 $alt   = '+';
             }
             $ret .= '<img src="'.$img.'" alt="'.$alt.'" />';
-            $ret .= '<a href="'.wl('',$this->_get_opts(array('ns'=>$item['id']))).'" class="idx_dir'.$cl.'">';
+            $ret .= '<a href="'.wl('',$this->_get_opts(array('ns'=>$item['id'],'sectok'=>getSecurityToken()))).'" class="idx_dir'.$cl.'">';
             $ret .= $base;
             $ret .= '</a>';
         }else{
-            $ret .= '<a href="'.wl('',$this->_get_opts(array('id'=>$item['id'],'ns'=>''))).'" class="wikilink1'.$cl.'">';
+            $ret .= '<a href="'.wl('',$this->_get_opts(array('id'=>$item['id'],'ns'=>'','sectok'=>getSecurityToken()))).'" class="wikilink1'.$cl.'">';
             $ret .= noNS($item['id']);
             $ret .= '</a>';
         }
@@ -562,6 +565,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '<input type="hidden" name="acl_w" value="'.hsc($this->who).'" />'.NL;
         echo '<input type="hidden" name="do" value="admin" />'.NL;
         echo '<input type="hidden" name="page" value="acl" />'.NL;
+        echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL;
         echo '<table class="inline">';
         echo '<tr>';
         echo '<th>'.$this->getLang('where').'</th>';
diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index e383f0d35..d3e88d932 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -19,11 +19,11 @@ require_once(DOKU_INC.'inc/auth.php');
 //close session
 session_write_close();
 
-if(!auth_isadmin()) die('forbidden');
+if(!auth_isadmin()) die('for admins only');
+if(!checkSecurityToken()) die('CRSF Attack');
 
 $ID    = getID();
 
-if(!auth_isadmin) die('for admins only');
 require_once(DOKU_INC.'inc/pluginutils.php');
 require_once(DOKU_INC.'inc/html.php');
 $acl = plugin_load('admin','acl');
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index 7ab83db58..449a3c16a 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -48,7 +48,8 @@ acl = {
         data[1] = ajax.encVar('id',frm.elements['id'].value);
         data[2] = ajax.encVar('acl_t',frm.elements['acl_t'].value);
         data[3] = ajax.encVar('acl_w',frm.elements['acl_w'].value);
-        data[4] = ajax.encVar('ajax','info');
+        data[4] = ajax.encVar('sectok',frm.elements['sectok'].value);
+        data[5] = ajax.encVar('ajax','info');
 
         ajax.elementObj = $('acl__info');
 
-- 
cgit v1.2.3


From d9c82eb63294032cf16e003122eeeca5a6c8454e Mon Sep 17 00:00:00 2001
From: Yaron Yogev <yarony@jungo.com>
Date: Thu, 21 Jan 2010 21:23:40 +0100
Subject: Hebrew Language Update

---
 lib/plugins/acl/lang/he/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/he/lang.php b/lib/plugins/acl/lang/he/lang.php
index 7d73c63dd..ac00730dd 100644
--- a/lib/plugins/acl/lang/he/lang.php
+++ b/lib/plugins/acl/lang/he/lang.php
@@ -6,6 +6,7 @@
  * @author DoK <kamberd@yahoo.com>
  * @author Dotan Kamber <kamberd@yahoo.com>
  * @author Moshe Kaplan <mokplan@gmail.com>
+ * @author Yaron Yogev <yaronyogev@gmail.com>
  */
 $lang['admin_acl']             = 'ניהול רשימת בקרת גישות';
 $lang['acl_group']             = 'קבוצה';
-- 
cgit v1.2.3


From 4db7791517d8ffb7c863e0ca5bb455dad32877f8 Mon Sep 17 00:00:00 2001
From: Christian Marg <marg@rz.tu-clausthal.de>
Date: Thu, 21 Jan 2010 22:12:17 +0100
Subject: Apply group/user cleaning on saving ACLs FS#1859

---
 lib/plugins/acl/admin.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a3fb4636d..a7037047a 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -130,6 +130,13 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                 // re-add all rules
                 foreach((array) $_REQUEST['acl'] as $where => $opt){
                     foreach($opt as $who => $perm){
+                        if ($who[0]=='@') {
+                            if ($who!='@ALL') {
+                                $who = '@'.ltrim($auth->cleanGroup($who),'@');
+                            }
+                        } else {
+                            $who = $auth->cleanUser($who);
+                        }
                         $who = auth_nameencode($who,true);
                         $lines[] = "$where\t$who\t$perm\n";
                     }
-- 
cgit v1.2.3


From c2a6d81662045023bdf1617b6b49f71c274d55ca Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 1 Feb 2010 16:10:25 +0100
Subject: plugin related autoloading

This patch moved the place where DOKU_PLUGIN is defined. It no longer
can be set from a normal config (only via preload)
---
 lib/plugins/acl/admin.php | 4 ----
 lib/plugins/acl/ajax.php  | 6 ------
 2 files changed, 10 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a7037047a..b38d2ac6e 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -10,9 +10,6 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
-require_once(DOKU_PLUGIN.'admin.php');
-
 /**
  * All DokuWiki plugins to extend the admin function
  * need to inherit from this class
@@ -216,7 +213,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      * @author Andreas Gohr <andi@splitbrain.org>
      */
     function _html_explorer(){
-        require_once(DOKU_INC.'inc/search.php');
         global $conf;
         global $ID;
         global $lang;
diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index d3e88d932..d91586a5d 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -13,9 +13,6 @@ if(!count($_POST) && $HTTP_RAW_POST_DATA){
 
 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
 require_once(DOKU_INC.'inc/init.php');
-require_once(DOKU_INC.'inc/common.php');
-require_once(DOKU_INC.'inc/pageutils.php');
-require_once(DOKU_INC.'inc/auth.php');
 //close session
 session_write_close();
 
@@ -24,8 +21,6 @@ if(!checkSecurityToken()) die('CRSF Attack');
 
 $ID    = getID();
 
-require_once(DOKU_INC.'inc/pluginutils.php');
-require_once(DOKU_INC.'inc/html.php');
 $acl = plugin_load('admin','acl');
 $acl->handle();
 
@@ -35,7 +30,6 @@ header('Content-Type: text/html; charset=utf-8');
 if($ajax == 'info'){
     $acl->_html_info();
 }elseif($ajax == 'tree'){
-    require_once(DOKU_INC.'inc/search.php');
     global $conf;
     global $ID;
 
-- 
cgit v1.2.3


From c1b2e736c1da490219a060dd52104c4f88e70f7e Mon Sep 17 00:00:00 2001
From: Sergio Motta <sergio@cisne.com.br>
Date: Tue, 2 Feb 2010 21:02:48 +0100
Subject: Portuguese language update

---
 lib/plugins/acl/lang/pt-br/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pt-br/lang.php b/lib/plugins/acl/lang/pt-br/lang.php
index 82a19b290..e199b773c 100644
--- a/lib/plugins/acl/lang/pt-br/lang.php
+++ b/lib/plugins/acl/lang/pt-br/lang.php
@@ -16,6 +16,7 @@
  * @author Frederico Guimarães <frederico@teia.bio.br>
  * @author Jair Henrique <jair.henrique@gmail.com>
  * @author Luis Dantas <luisdantas@gmail.com>
+ * @author Sergio Motta sergio@cisne.com.br
  */
 $lang['admin_acl']             = 'Administração da Lista de Controles de Acesso';
 $lang['acl_group']             = 'Grupo';
-- 
cgit v1.2.3


From 1807fcf5084f3bda9cef9580a624b9afed38b559 Mon Sep 17 00:00:00 2001
From: Didier Raboud <didier.raboud@swisslinux.org>
Date: Wed, 3 Feb 2010 21:28:59 +0100
Subject: French language fix FS#1875

---
 lib/plugins/acl/lang/fr/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index efdc5f074..88a045ffe 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -42,7 +42,7 @@ $lang['acl_perm0']             = 'Aucune';
 $lang['acl_perm1']             = 'Lecture';
 $lang['acl_perm2']             = 'Écriture';
 $lang['acl_perm4']             = 'Création';
-$lang['acl_perm8']             = 'Télécharger';
+$lang['acl_perm8']             = 'Téléverser (Upload)';
 $lang['acl_perm16']            = 'Effacer';
 $lang['acl_new']               = 'Ajouter une nouvelle entrée';
 $lang['acl_mod']               = 'Modifier l\'entrée';
-- 
cgit v1.2.3


From 9bec85f2322b78de408af08a84bf7de4200c8d2c Mon Sep 17 00:00:00 2001
From: LSwp <sleshek@wp.pl>
Date: Sat, 6 Feb 2010 12:25:26 +0100
Subject: Polish language update

---
 lib/plugins/acl/lang/pl/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index 63a870c50..4105bb448 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -7,6 +7,7 @@
  * @author Mariusz Kujawski <marinespl@gmail.com>
  * @author Maciej Kurczewski <pipijajko@gmail.com>
  * @author Sławomir Boczek <slawkens@gmail.com>
+ * @author sleshek@wp.pl
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
@@ -18,7 +19,7 @@ $lang['btn_select']            = 'Wybierz';
 $lang['p_user_id']             = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_user_ns']             = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do katalogów <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns']            = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do strony <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do katalogu <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_choose_id']           = 'Podaj <b>nazwę użytkownika lub grupy</b> w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do strony <b class="aclpage">%s</b>.';
 $lang['p_choose_ns']           = 'Podaj <b>nazwę użytkownika lub grupy</b> w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do katalogu <b class="aclns">%s</b>.';
 $lang['p_inherited']           = 'Uwaga: Uprawnienia nie zostały nadane wprost ale są dziedziczone z grupy lub katalogu.';
-- 
cgit v1.2.3


From 52b35d3ab15e4a042a2e1c5c8c5766fc76c534af Mon Sep 17 00:00:00 2001
From: Marcel Metz <marcel_metz@gmx.de>
Date: Mon, 8 Feb 2010 20:11:06 +0100
Subject: Informal German language update

---
 lib/plugins/acl/lang/de-informal/lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index cd42fdedc..6cabe3f35 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -4,7 +4,7 @@
  *
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
- * @author ste-re@web.de
+ * @author Marcel Metz <marcel_metz@gmx.de>
  */
 $lang['admin_acl']             = 'Zugriffskontrollsystem Management';
 $lang['acl_group']             = 'Gruppe';
@@ -21,14 +21,14 @@ $lang['p_choose_id']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b>
 $lang['p_choose_ns']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen des Namenraumes<b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
 $lang['p_inherited']           = 'Hinweis: Diese Rechte wuredn nicht explizit gesetzt sondern geerbt von anderen Grupen oder übergeordneten Namensräumen.';
 $lang['p_isadmin']             = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.';
-$lang['p_include']             = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Loeschrechte sind nur fuer Namensräume, nicht fuer Seiten.';
+$lang['p_include']             = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Löschrechte sind nur für Namensräume, nicht für Seiten.';
 $lang['current']               = 'Momentane Zugriffsregeln';
 $lang['where']                 = 'Seite/Namensraum';
 $lang['who']                   = 'Benutzer/Gruppe';
 $lang['perm']                  = 'Rechte';
 $lang['acl_perm0']             = 'Keine';
 $lang['acl_perm1']             = 'Lesen';
-$lang['acl_perm2']             = 'Editieren';
+$lang['acl_perm2']             = 'Bearbeiten';
 $lang['acl_perm4']             = 'Erstellen';
 $lang['acl_perm8']             = 'Hochladen';
 $lang['acl_perm16']            = 'Löschen';
-- 
cgit v1.2.3


From c4b04b7f874a6c3f7ab5296aed1c039757183eb7 Mon Sep 17 00:00:00 2001
From: Philippe Bajoit <philippe.bajoit@gmail.com>
Date: Mon, 8 Feb 2010 20:22:17 +0100
Subject: French language update

---
 lib/plugins/acl/lang/fr/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index 88a045ffe..7973ab559 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -17,6 +17,7 @@
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author olivier duperray <duperray.olivier@laposte.net>
  * @author Vincent Feltz <psycho@feltzv.fr>
+ * @author Philippe Bajoit <philippe.bajoit@gmail.com>
  */
 $lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
 $lang['acl_group']             = 'Groupe';
-- 
cgit v1.2.3


From 9ee282d8dedfbb7ac2b6893de250d99f00ff544f Mon Sep 17 00:00:00 2001
From: Dimi T <dimi3.14@gmail.com>
Date: Tue, 9 Feb 2010 21:52:03 +0100
Subject: Macedonian transaltion added

---
 lib/plugins/acl/lang/mk/lang.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 lib/plugins/acl/lang/mk/lang.php

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/mk/lang.php b/lib/plugins/acl/lang/mk/lang.php
new file mode 100644
index 000000000..d576c3d1d
--- /dev/null
+++ b/lib/plugins/acl/lang/mk/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Macedonian language file
+ *
+ * @author Dimitar Talevski <dimi3.14@gmail.com>
+ */
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Корисник';
+$lang['acl_perms']             = 'Пермисии за';
+$lang['page']                  = 'Страница';
+$lang['btn_select']            = 'Избери';
+$lang['current']               = 'Моментални ACL правила';
+$lang['who']                   = 'Корисник/група';
+$lang['perm']                  = 'Пермисии';
+$lang['acl_perm0']             = 'Ништо';
+$lang['acl_perm1']             = 'Читај';
+$lang['acl_perm2']             = 'Уреди';
+$lang['acl_perm4']             = 'Креирај';
+$lang['acl_perm8']             = 'Качи';
+$lang['acl_perm16']            = 'Избриши';
+$lang['acl_new']               = 'Додај нов запис';
+$lang['acl_mod']               = 'Измени запис';
-- 
cgit v1.2.3


From fc5dbe994743ed593e3941015999ca08abc72686 Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Wed, 10 Feb 2010 20:26:47 +0100
Subject: Interlingua Translation added

---
 lib/plugins/acl/lang/ia/lang.php | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/plugins/acl/lang/ia/lang.php

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ia/lang.php b/lib/plugins/acl/lang/ia/lang.php
new file mode 100644
index 000000000..3f0ebb5d8
--- /dev/null
+++ b/lib/plugins/acl/lang/ia/lang.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Interlingua language file
+ *
+ * @author robocap <robocap1@gmail.com>
+ * @author Martijn Dekker <martijn@inlv.org>
+ */
-- 
cgit v1.2.3


From 2eb3414de1a76407ed3eae58fd42c3a5c342039b Mon Sep 17 00:00:00 2001
From: Traduzioni <ita.translations@tiscali.it>
Date: Thu, 11 Feb 2010 18:37:26 +0100
Subject: Italian language update

---
 lib/plugins/acl/lang/it/help.txt |  4 ++--
 lib/plugins/acl/lang/it/lang.php | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/it/help.txt b/lib/plugins/acl/lang/it/help.txt
index 5e4b08dd6..8bf68e8e7 100644
--- a/lib/plugins/acl/lang/it/help.txt
+++ b/lib/plugins/acl/lang/it/help.txt
@@ -6,6 +6,6 @@ Il pannello di sinistra mostra tutte le categorie e le pagine disponibili.
 
 Il campo sopra ti permette di vedere e modificare i permessi di un utente o gruppo selezionato.
 
-Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per cancellare o cambiare al volo varie regole.
+Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per eliminare o cambiare al volo varie regole.
 
-Leggere la [[doku>acl|official documentation on ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki.
+Leggere la [[doku>acl|documentazione ufficale delle ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki.
diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php
index 344987e8b..2f579afae 100644
--- a/lib/plugins/acl/lang/it/lang.php
+++ b/lib/plugins/acl/lang/it/lang.php
@@ -23,11 +23,11 @@ $lang['p_user_id']             = 'L\'utente <b class="acluser">%s</b> attualment
 $lang['p_user_ns']             = 'L\'utente <b class="acluser">%s</b> attualmente ha i seguenti permessi per la categoria <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'I membri del gruppo<b class="aclgroup">%s</b> attualmente hanno i seguenti permessi sulla pagina <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_group_ns']            = 'I membri del gruppo<b class="aclgroup">%s</b> attualmente hanno i seguenti permessi per la categoria <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id']           = 'Per favore <b>inserisci un utente o gruppo</b> nel campo sopra per modificare i permessi impostati per la pagina <b class="aclpage">%s</b>.';
-$lang['p_choose_ns']           = 'Per favore <b>inserisci un utente o un gruppo</b> nel campo sopra per modificare i permessi impostati per la categoria <b class="aclns">%s</b>.';
-$lang['p_inherited']           = 'Nota: Questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.';
-$lang['p_isadmin']             = 'Nota: Il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.';
-$lang['p_include']             = 'I permessi più elevati includono i permessi inferiori. I permessi di Creazione, Upload e Cancellazione si applicano soltanto alle categorie e non alle pagine.';
+$lang['p_choose_id']           = '<b>Inserisci un utente o gruppo</b> nel campo sopra per modificare i permessi impostati per la pagina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = '<b>Inserisci un utente o un gruppo</b> nel campo sopra per modificare i permessi impostati per la categoria <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota: questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.';
+$lang['p_isadmin']             = 'Nota: il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.';
+$lang['p_include']             = 'I permessi più elevati includono i permessi inferiori. I permessi Crea, Carica ed Elimina si applicano soltanto alle categorie e non alle pagine.';
 $lang['current']               = 'Regole ACL attuali';
 $lang['where']                 = 'Pagina/Categoria';
 $lang['who']                   = 'Utente/Gruppo';
@@ -35,8 +35,8 @@ $lang['perm']                  = 'Permessi';
 $lang['acl_perm0']             = 'Nessuno';
 $lang['acl_perm1']             = 'Lettura';
 $lang['acl_perm2']             = 'Modifica';
-$lang['acl_perm4']             = 'Creazione';
-$lang['acl_perm8']             = 'Upload';
-$lang['acl_perm16']            = 'Cancellazione';
-$lang['acl_new']               = 'Aggiungi nuovo record';
-$lang['acl_mod']               = 'Modifica record';
+$lang['acl_perm4']             = 'Crea';
+$lang['acl_perm8']             = 'Carica';
+$lang['acl_perm16']            = 'Elimina';
+$lang['acl_new']               = 'Aggiungi nuovo valore';
+$lang['acl_mod']               = 'Modifica valore';
-- 
cgit v1.2.3


From c04912f6c4e1c1c8bda182a7dc03c86bcb415d90 Mon Sep 17 00:00:00 2001
From: Victor M Castelan <victorcastelan@gmail.com>
Date: Fri, 12 Feb 2010 12:53:49 +0100
Subject: Spanish language update

---
 lib/plugins/acl/lang/es/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index 3a23c71da..c908dc5a9 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -17,6 +17,7 @@
  * @author Marvin Ortega <maty1206@maryanlinux.com>
  * @author Daniel Castro Alvarado <dancas2@gmail.com>
  * @author Fernando J. Gómez <fjgomez@gmail.com>
+ * @author Victor Castelan <victorcastelan@gmail.com>
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';
-- 
cgit v1.2.3


From 8e6d6cfde65cf5e68cf762424dc2a7048e6b2959 Mon Sep 17 00:00:00 2001
From: Martijn Dekker <martijn@inlv.org>
Date: Fri, 12 Feb 2010 23:37:21 +0100
Subject: Interlingua Language Update

---
 lib/plugins/acl/lang/ia/help.txt | 11 +++++++++++
 lib/plugins/acl/lang/ia/lang.php | 28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 lib/plugins/acl/lang/ia/help.txt

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ia/help.txt b/lib/plugins/acl/lang/ia/help.txt
new file mode 100644
index 000000000..59f5764eb
--- /dev/null
+++ b/lib/plugins/acl/lang/ia/help.txt
@@ -0,0 +1,11 @@
+=== Adjuta rapide: ===
+
+In iste pagina tu pote adder e remover permissiones pro spatios de nomines e paginas in tu wiki.
+
+Le columna sinistre presenta tote le spatios de nomines e paginas disponibile.
+
+Le formulario hic supra permitte vider e modificar le permissiones de un usator o gruppo seligite.
+
+In le tabella hic infra se monstra tote le regulas de controlo de accesso actualmente configurate. Tu pote usar lo pro rapidemente deler o modificar plure regulas.
+
+Es recommendate leger le [[doku>acl|documentation official super ACL]] pro comprender completemente como le controlo de accesso functiona in DokuWiki.
diff --git a/lib/plugins/acl/lang/ia/lang.php b/lib/plugins/acl/lang/ia/lang.php
index 3f0ebb5d8..f7d076539 100644
--- a/lib/plugins/acl/lang/ia/lang.php
+++ b/lib/plugins/acl/lang/ia/lang.php
@@ -5,3 +5,31 @@
  * @author robocap <robocap1@gmail.com>
  * @author Martijn Dekker <martijn@inlv.org>
  */
+$lang['admin_acl']             = 'Gestion de listas de controlo de accesso';
+$lang['acl_group']             = 'Gruppo';
+$lang['acl_user']              = 'Usator';
+$lang['acl_perms']             = 'Permissiones pro';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Spatio de nomines';
+$lang['btn_select']            = 'Seliger';
+$lang['p_user_id']             = 'Le usator <b class="acluser">%s</b> ha actualmente le sequente permissiones in le pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Le usator <b class="acluser">%s</b> ha actualmente le sequente permissiones in le spatio de nomines <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Le membros del gruppo <b class="aclgroup">%s</b> a actualmente le sequente permissiones in le pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Le membros del gruppo <b class="aclgroup">%s</b> ha actualmente le sequente permissiones in le spatio de nomines <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Per favor <b>entra un usator o gruppo</b> in le formulario hic supra pro vider o modificar le permissiones configurate pro le pagina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Per favor <b>entra un usator o gruppo</b> in le formulario hic supra pro vider o modificar le permissiones configurate pro le spatio de nomines <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota ben: Iste permissiones non ha essite configurate explicitemente ma ha essite hereditate de altere gruppos o de spatios de nomines superior.';
+$lang['p_isadmin']             = 'Nota ben: Le gruppo o usator seligite ha sempre permissiones integral proque es configurate como superusator.';
+$lang['p_include']             = 'Le permissiones superior include les inferior. Le permissiones de Crear, Incargar e Deler es solmente applicabile a spatios de nomines, non a paginas.';
+$lang['current']               = 'Regulas ACL actual';
+$lang['where']                 = 'Pagina/Spatio de nomines';
+$lang['who']                   = 'Usator/Gruppo';
+$lang['perm']                  = 'Permissiones';
+$lang['acl_perm0']             = 'Nulle';
+$lang['acl_perm1']             = 'Leger';
+$lang['acl_perm2']             = 'Modificar';
+$lang['acl_perm4']             = 'Crear';
+$lang['acl_perm8']             = 'Incargar';
+$lang['acl_perm16']            = 'Deler';
+$lang['acl_new']               = 'Adder nove entrata';
+$lang['acl_mod']               = 'Modificar entrata';
-- 
cgit v1.2.3


From b04e9c2821040ceefeaf1953e47b5871f87a66a9 Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <shazarre@gmail.com>
Date: Sun, 14 Feb 2010 12:59:28 +0100
Subject: Polish language update

---
 lib/plugins/acl/lang/pl/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index 4105bb448..0f88fe477 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -8,6 +8,7 @@
  * @author Maciej Kurczewski <pipijajko@gmail.com>
  * @author Sławomir Boczek <slawkens@gmail.com>
  * @author sleshek@wp.pl
+ * @author Leszek Stachowski <shazarre@gmail.com>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
-- 
cgit v1.2.3


From f77ccdf72d9702956edd4917d261b908636fd690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=ABl=20Schintgen?= <joel@schintgen.net>
Date: Mon, 22 Feb 2010 21:11:55 +0100
Subject: Luxembourgish translation added

---
 lib/plugins/acl/lang/lb/help.txt | 11 +++++++++++
 lib/plugins/acl/lang/lb/lang.php |  6 ++++++
 2 files changed, 17 insertions(+)
 create mode 100644 lib/plugins/acl/lang/lb/help.txt
 create mode 100644 lib/plugins/acl/lang/lb/lang.php

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/lb/help.txt b/lib/plugins/acl/lang/lb/help.txt
new file mode 100644
index 000000000..e36ed373f
--- /dev/null
+++ b/lib/plugins/acl/lang/lb/help.txt
@@ -0,0 +1,11 @@
+=== Séier Hëllef: ===
+
+Op dëser Säit kanns de Rechter fir Namespacen a Säiten an dengem Wiki setzen.
+
+Op der lénkser Säit hues de all d'Namespacen a Säiten.
+
+Am Formulär hei uewendriwwer kanns de d'Rechter vun dem ausgewielte Benotzer oder Grupp änneren
+
+An der Tabell hei ënnendrënner kanns de all d'Reegele gesinn déi de Moment gesat sinn. Du kanns se huelen fir Reegelen ze änneren oder ze läschen.
+
+Déi [[doku>acl|offiziell Dokumentatioun iwwert ACL]] hëlleft der besser ze verstoen wéi déi Reegelen am Dokuwiki funktionéieren.
diff --git a/lib/plugins/acl/lang/lb/lang.php b/lib/plugins/acl/lang/lb/lang.php
new file mode 100644
index 000000000..59acdf7a8
--- /dev/null
+++ b/lib/plugins/acl/lang/lb/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * lb language file
+ *
+ * @author joel@schintgen.net
+ */
-- 
cgit v1.2.3


From 516582b3ae1e8d76bc5dbca074cb8bac4fa9cb48 Mon Sep 17 00:00:00 2001
From: Aleksey Osadchiy <rfc@nm.ru>
Date: Sun, 28 Feb 2010 10:34:24 +0100
Subject: Russian language update

---
 lib/plugins/acl/lang/ru/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index 496e67510..911ae72da 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -11,6 +11,7 @@
  * @author Alexander Sorkin <kibizoid@gmail.com>
  * @author Kirill Krasnov <krasnovforum@gmail.com>
  * @author Vlad Tsybenko <vlad.development@gmail.com>
+ * @author Aleksey Osadchiy <rfc@nm.ru>
  */
 $lang['admin_acl']             = 'Управление списками контроля доступа';
 $lang['acl_group']             = 'Группа';
-- 
cgit v1.2.3


From 7caaf84c91ff684b186dec09e921d319b64ec0e1 Mon Sep 17 00:00:00 2001
From: Leonard Elezi <leonard.elezi@depinfo.info>
Date: Tue, 2 Mar 2010 20:02:00 +0100
Subject: Albanian translation added

---
 lib/plugins/acl/lang/sq/help.txt | 11 +++++++++++
 lib/plugins/acl/lang/sq/lang.php | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 lib/plugins/acl/lang/sq/help.txt
 create mode 100644 lib/plugins/acl/lang/sq/lang.php

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/sq/help.txt b/lib/plugins/acl/lang/sq/help.txt
new file mode 100644
index 000000000..84a567f8b
--- /dev/null
+++ b/lib/plugins/acl/lang/sq/help.txt
@@ -0,0 +1,11 @@
+=== Ndihmë e Shpejtë: ===
+
+Në këtë faqe mund të shtoni ose hiqni të drejta për hapësira emri dhe faqe në wiki-n tuaj.
+
+Paneli i majtë tregon të gjitha faqet dhe hapësirat e emrit të disponueshme.
+
+Forma më sipër ju lejon të shihni dhe ndryshoni lejet për një grup ose përdorues të përzgjedhur.
+
+Në tabelën më poshtë tregohen të gjitha rregullat e vendosjes së aksesit. Mund ta përdorni për të fshirë shpejt ose ndryshuar shumë rregulla njëkohësisht.
+
+Leximi i [[doku>acl|dokumentimit zyrtar mbi ACL]]  mund t'ju ndihmojë për të kuptuar plotësisht sesi funksionin Kontrolli i Aksesit në DokuWiki.
diff --git a/lib/plugins/acl/lang/sq/lang.php b/lib/plugins/acl/lang/sq/lang.php
new file mode 100644
index 000000000..30fc99bb0
--- /dev/null
+++ b/lib/plugins/acl/lang/sq/lang.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Albanian language file
+ *
+ * @author Leonard Elezi leonard.elezi@depinfo.info
+ */
+$lang['admin_acl']             = 'Menaxhimi i Listës së Kontrollit të Aksesit';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'Përdorues';
+$lang['acl_perms']             = 'Të drejta për';
+$lang['page']                  = 'Faqe';
+$lang['namespace']             = 'Hapësira e Emrit';
+$lang['btn_select']            = 'Zgjidh';
+$lang['p_user_id']             = 'Përdoruesi <b class="acluser">%s</b> momentalisht ka të drejtat e mëposhtme mbi faqen <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Përdoruesi <b class="acluser">%s</b> momentalisht ka të drejtat e mëposhtme mbi hapësirën e emrit <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Anëtarët e grupit <b class="aclgroup">%s</b> momentalisht kanë të drejtat e mëposhtme mbi faqen <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Anëtarët e grupit <b class="aclgroup">%s</b> momentalisht kanë të drejtat e mëposhtme mbi hapësirën e emrit <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Ju lutemi <b>futni një përdorues ose grup</b> në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për faqen <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Ju lutemi <b>futni një përdorues ose grup</b> në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për hapësirën e emrit <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Shënim: Ato të drejta nuk janë vendosur specifikisht por janë të trashëguara nga grupe të tjera ose hapësira emri më të larta.';
+$lang['p_isadmin']             = 'Shënim: Grupi ose përdoruesi i përzgjedhur ka gjithmonë të drejta të plota sepse është konfiguruar si superpërdorues.';
+$lang['p_include']             = 'Të drejtat më të larta i përfshijnë edhe ato më të ultat. Të drejtat Krijo, Ngarko dhe Fshi u aplikohen vetëm hapësirave të emrit, jo faqeve.';
+$lang['current']               = 'Rregullat aktuale ACL';
+$lang['where']                 = 'Faqe/Hapësirë Emri';
+$lang['who']                   = 'Përdorues/Grup';
+$lang['perm']                  = 'Të Drejta';
+$lang['acl_perm0']             = 'Asgjë';
+$lang['acl_perm1']             = 'Lexim';
+$lang['acl_perm2']             = 'Redaktim';
+$lang['acl_perm4']             = 'Krijim';
+$lang['acl_perm8']             = 'Ngarkim';
+$lang['acl_perm16']            = 'Fshi';
+$lang['acl_new']               = 'Shto Hyrje të re';
+$lang['acl_mod']               = 'Ndrysho Hyrje';
-- 
cgit v1.2.3


From 620404a5dcfbccb29cd939932ecaead95b6e24cd Mon Sep 17 00:00:00 2001
From: Marek Sacha <sachamar@fel.cvut.cz>
Date: Wed, 3 Mar 2010 22:25:51 +0100
Subject: Czech language update

---
 lib/plugins/acl/lang/cs/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index 899d30ced..aab39098a 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -6,6 +6,7 @@
  * @author Bohumir Zamecnik <bohumir@zamecnik.org>
  * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
  * @author tomas@valenta.cz
+ * @author Marek Sacha <sachamar@fel.cvut.cz>
  */
 $lang['admin_acl']             = 'Správa přístupových práv';
 $lang['acl_group']             = 'Skupina';
-- 
cgit v1.2.3


From c1fe9e9f75eb20bf30cde6e67fe7ef9f664f4cdd Mon Sep 17 00:00:00 2001
From: Florian Gaub <floriang@floriang.net>
Date: Mon, 8 Mar 2010 18:30:08 +0100
Subject: French language update

---
 lib/plugins/acl/lang/fr/help.txt |  8 ++++----
 lib/plugins/acl/lang/fr/lang.php | 17 +++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/fr/help.txt b/lib/plugins/acl/lang/fr/help.txt
index 69661bb9b..f748f6b23 100644
--- a/lib/plugins/acl/lang/fr/help.txt
+++ b/lib/plugins/acl/lang/fr/help.txt
@@ -1,9 +1,9 @@
-=== Aide rapide : ===
+=== Aide rapide ===
 
 Cette page vous permet d'ajouter ou de supprimer des permissions pour les catégories et les pages de votre wiki. Le panneau de gauche liste toutes les catégories et les pages disponibles.
 
-Le formulaire au dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
+Le formulaire au-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
 
-Dans la table ci-dessous toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACLs.
+Dans le tableau ci-dessous, toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACL.
 
-La lecture de [[doku>acl|la documentation officielle des ACLs]] pourra vous permettre de comprendre complètement le fonctionnement du contrôle d'accès dans DokuWiki.
+La lecture de [[doku>acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki.
diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index 7973ab559..64d918360 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -18,6 +18,7 @@
  * @author olivier duperray <duperray.olivier@laposte.net>
  * @author Vincent Feltz <psycho@feltzv.fr>
  * @author Philippe Bajoit <philippe.bajoit@gmail.com>
+ * @author Florian Gaub <floriang@floriang.net>
  */
 $lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
 $lang['acl_group']             = 'Groupe';
@@ -26,15 +27,15 @@ $lang['acl_perms']             = 'Permission pour';
 $lang['page']                  = 'Page';
 $lang['namespace']             = 'Catégorie';
 $lang['btn_select']            = 'Sélectionner';
-$lang['p_user_id']             = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_user_ns']             = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la catégorie <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_group_id']            = 'Permissions actuelles des membres du groupe <b class="aclgroup">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns']            = 'Permissions actuelles des membres du groupe <b class="aclgroup">%s</b> sur la catégorie <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id']           = 'Saisissez un nom <b>d\'utilisateur ou de groupe</b> dans le formulaire ci-dessus pour afficher ou éditer les permissions relatives à la page <b class="aclpage">%s</b>.';
-$lang['p_choose_ns']           = 'Saisissez un nom <b>d\'utilisateur ou de groupe</b> dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie <b class="aclns">%s</b>.';
+$lang['p_user_id']             = 'Permissions actuelles de l\'utilisateur <strong class="acluser">%s</strong> sur la page <strong class="aclpage">%s</strong>: <em>%s</em>.';
+$lang['p_user_ns']             = 'Permissions actuelles de l\'utilisateur <strong class="acluser">%s</strong> sur la catégorie <strong class="aclns">%s</strong>: <em>%s</em>.';
+$lang['p_group_id']            = 'Permissions actuelles des membres du groupe <strong class="aclgroup">%s</strong> sur la page <strong class="aclpage">%s</strong>: <em>%s</em>.';
+$lang['p_group_ns']            = 'Permissions actuelles des membres du groupe <strong class="aclgroup">%s</strong> sur la catégorie <strong class="aclns">%s</strong>: <em>%s</em>.';
+$lang['p_choose_id']           = 'Saisissez un nom <strong>d\'utilisateur ou de groupe</strong> dans le formulaire ci-dessus pour afficher ou éditer les permissions relatives à la page <strong class="aclpage">%s</strong>.';
+$lang['p_choose_ns']           = 'Saisissez un nom <strong>d\'utilisateur ou de groupe</strong> dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie <strong class="aclns">%s</strong>.';
 $lang['p_inherited']           = 'Note : Ces permissions n\'ont pas été explicitement fixées mais sont héritées d\'autres groupes ou catégories supérieures.';
 $lang['p_isadmin']             = 'Note : Le groupe ou l\'utilisateur sélectionné dispose de toutes les permissions car il est paramétré en tant que superutilisateur.';
-$lang['p_include']             = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger, et Effacer, ne s\'appliquent qu\'aux catégories ; pas aux pages.';
+$lang['p_include']             = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger et Effacer ne s\'appliquent qu\'aux catégories, pas aux pages.';
 $lang['current']               = 'ACL actuelles';
 $lang['where']                 = 'Page/Catégorie';
 $lang['who']                   = 'Utilisateur/Groupe';
@@ -43,7 +44,7 @@ $lang['acl_perm0']             = 'Aucune';
 $lang['acl_perm1']             = 'Lecture';
 $lang['acl_perm2']             = 'Écriture';
 $lang['acl_perm4']             = 'Création';
-$lang['acl_perm8']             = 'Téléverser (Upload)';
+$lang['acl_perm8']             = 'Téléverser';
 $lang['acl_perm16']            = 'Effacer';
 $lang['acl_new']               = 'Ajouter une nouvelle entrée';
 $lang['acl_mod']               = 'Modifier l\'entrée';
-- 
cgit v1.2.3


From 90a0f2e151531db5b76c3d1c340f70da35922456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Med=C3=BAlio?= <medulio@ciberirmandade.org>
Date: Mon, 8 Mar 2010 18:32:50 +0100
Subject: Galician language update

---
 lib/plugins/acl/lang/gl/help.txt | 12 ++++++------
 lib/plugins/acl/lang/gl/lang.php | 40 +++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/gl/help.txt b/lib/plugins/acl/lang/gl/help.txt
index c427b182f..593dcef07 100644
--- a/lib/plugins/acl/lang/gl/help.txt
+++ b/lib/plugins/acl/lang/gl/help.txt
@@ -1,11 +1,11 @@
-=== Axuda rápida: ===
+=== Axuda Rápida: ===
 
-Nesta páxina pode engadir e eliminar os permisos para os nomes de espazo e as páxinas do seu wiki.
+Nesta páxina podes engadir e eliminar permisos para os nomes de espazo e as páxinas do teu wiki.
 
-O panel da esquerda mostra todos os nomes de espazo e páxinas dispoñíbeis.
+O panel da esquerda amosa todos os nomes de espazo e páxinas dispoñíbeis.
 
-O formulario de arriba permítelle ver e modificar os permisos da persoa usuaria ou grupo seleccionada.
+O formulario de enriba permíteche ver e modificares os permisos do usuario ou grupo seleccionado.
 
-Na táboa de abaixo móstranse todas as regras de control de accesos estabelecidas. Pode empregala para cambiar ou eliminar varias regras dun xeito rápido.
+Na táboa de embaixo amósanse todas as regras de control de accesos estabelecidas. Podes empregala para mudares ou eliminares varias regras dun xeito rápido.
 
-A lectura da [[doku>acl|documentación oficial da ACL]] pode servirlle de axuda para comprender como funciona o control de accesos no Dokuwiki.
+A lectura da [[doku>acl|documentación oficial da ACL]] pode servirche de axuda para comprenderes como funciona o control de accesos no Dokuwiki.
diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php
index 184cf7e1d..774bf207a 100644
--- a/lib/plugins/acl/lang/gl/lang.php
+++ b/lib/plugins/acl/lang/gl/lang.php
@@ -2,35 +2,33 @@
 /**
  * Galicianlanguage file
  *
- * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
- * @author Tagen Ata <localizacion@tagenata.com>
- * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ * @author Medúlio <medulio@ciberirmandade.org>
  */
-$lang['admin_acl']             = 'Xestión da Lista de control de acceso (ACL)';
+$lang['admin_acl']             = 'Xestión da Lista de Control de Acceso (ACL)';
 $lang['acl_group']             = 'Grupo';
-$lang['acl_user']              = 'Usuaria/o';
+$lang['acl_user']              = 'Usuario';
 $lang['acl_perms']             = 'Permisos para';
 $lang['page']                  = 'Páxina';
 $lang['namespace']             = 'Nome de espazo';
-$lang['btn_select']            = 'Selecciona';
-$lang['p_user_id']             = 'A persoa usuaria <b class="acluser">%s</b> dispón actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_user_ns']             = 'A persoa usuaria <b class="acluser">%s</b> dispón actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_group_id']            = 'As e os integrantes do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
-$lang['p_group_ns']            = 'As e os integrantes do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id']           = '<b>Insira un nome de usuaria/o ou grupo</b> no formulario de arriba para ver ou editar os permisos estabelecidos para a páxina <b class="aclpage">%s</b>.';
-$lang['p_choose_ns']           = '<b>Insira un nome de usuaria/o ou grupo</b> no formulario de arriba para ver ou editar os permisos estabelecidos no nome de espazo <b class="aclns">%s</b>.';
-$lang['p_inherited']           = 'Nota: Estes permisos non foron estabelecidos explicitamente senón que foron herdados doutros grupos ou nomes de espazo maiores.';
-$lang['p_isadmin']             = 'Nota: O grupo ou a persoa usuaria seleccionado terá sempre permisos completos por estar configurado como superusuaria/o.';
-$lang['p_include']             = 'Os permisos máis grandes inclúen os menores. Os permisos de Creación, Subida e Eliminación só se aplican aos nomes de espazo, non ás páxinas.';
-$lang['current']               = 'Regras ACL actuais';
-$lang['where']                 = 'Páxina/Nome de espazo';
-$lang['who']                   = 'Usuaria/o/Grupo';
+$lang['btn_select']            = 'Escolle';
+$lang['p_user_id']             = 'O usuario <b class="acluser">%s</b> dispón actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'O usuario <b class="acluser">%s</b> dispón actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Os membros do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Os membros do grupo <b class="aclgroup">%s</b> cdispoñen actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Por favor, <b>insire un usuario ou grupo</b> no formulario de enriba para ver ou editar os permisos establecidos para a páxina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Por favor <b>insire un usuario ou grupo</b> no formulario de enriba para ver ou editar os permisos establecidos no nome de espazo <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota: Estes permisos non foron establecidos explicitamente senón que foron herdadas de outros grupos ou nomes de espazo meirandes.';
+$lang['p_isadmin']             = 'Nota: O grupo ou usuario seleccionado terá sempre permisos completos por estar configurado como super-usuario.';
+$lang['p_include']             = 'Os permisos meirandes inclúen os menores. Os permisos de Creación, Subida e Eliminado só se aplican aos nomes de espazo, non ás páxinas.';
+$lang['current']               = 'Regras ACL Actuais';
+$lang['where']                 = 'Páxina/Nome de Espazo';
+$lang['who']                   = 'Usuario/Grupo';
 $lang['perm']                  = 'Permisos';
 $lang['acl_perm0']             = 'Ningún';
 $lang['acl_perm1']             = 'Ler';
 $lang['acl_perm2']             = 'Editar';
 $lang['acl_perm4']             = 'Crear';
-$lang['acl_perm8']             = 'Subir ficheiros';
+$lang['acl_perm8']             = 'Subir arquivos';
 $lang['acl_perm16']            = 'Eliminar';
-$lang['acl_new']               = 'Engadir una entrada';
-$lang['acl_mod']               = 'Modificar unha entrada';
+$lang['acl_new']               = 'Engadir nova Entrada';
+$lang['acl_mod']               = 'Modificar Entrada';
-- 
cgit v1.2.3


From 8d557116a19d366c0f00592e4fa6250017295105 Mon Sep 17 00:00:00 2001
From: maros <dobrimaros@yahoo.pl>
Date: Wed, 17 Mar 2010 20:13:22 +0100
Subject: Polish language update

---
 lib/plugins/acl/lang/pl/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index 0f88fe477..300f0ad1c 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -9,6 +9,7 @@
  * @author Sławomir Boczek <slawkens@gmail.com>
  * @author sleshek@wp.pl
  * @author Leszek Stachowski <shazarre@gmail.com>
+ * @author maros <dobrimaros@yahoo.pl>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
-- 
cgit v1.2.3


From 9d706dd2a380574a0f89b771c7b3fd9a77de9dc7 Mon Sep 17 00:00:00 2001
From: Robert Bogenschneider <robog@gmx.de>
Date: Mon, 22 Mar 2010 20:58:43 +0100
Subject: German language update

---
 lib/plugins/acl/lang/de/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php
index 022ea6683..5bac3ac1c 100644
--- a/lib/plugins/acl/lang/de/lang.php
+++ b/lib/plugins/acl/lang/de/lang.php
@@ -16,6 +16,7 @@
  * @author Dirk Einecke <dirk@dirkeinecke.de>
  * @author Blitzi94@gmx.de
  * @author Robert Bogenschneider <robog@GMX.de>
+ * @author Robert Bogenschneider <robog@gmx.de>
  */
 $lang['admin_acl']             = 'Zugangsverwaltung';
 $lang['acl_group']             = 'Gruppe';
-- 
cgit v1.2.3


From c0c4ef9875d90979ed9d31ea1b6f2866aecaf565 Mon Sep 17 00:00:00 2001
From: Rasmus Kinnerup <rasmus@kinnerup.com>
Date: Fri, 2 Apr 2010 11:22:46 +0200
Subject: Danish language update

---
 lib/plugins/acl/lang/da/lang.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php
index c95ff1582..d40da52a0 100644
--- a/lib/plugins/acl/lang/da/lang.php
+++ b/lib/plugins/acl/lang/da/lang.php
@@ -11,6 +11,7 @@
  * @author Harith <haj@berlingske.dk>
  * @author Daniel Ejsing-Duun <dokuwiki@zilvador.dk>
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ * @author rasmus@kinnerup.com
  */
 $lang['admin_acl']             = 'Rettighedsadministration';
 $lang['acl_group']             = 'Gruppe';
@@ -31,7 +32,7 @@ $lang['p_include']             = 'Højere tilladelse inkluderer også lavere. Ti
 $lang['current']               = 'Aktuelle ACL-regler';
 $lang['where']                 = 'Side/navnerum';
 $lang['who']                   = 'Bruger/gruppe';
-$lang['perm']                  = 'Adgangsniveau';
+$lang['perm']                  = 'Rettigheder';
 $lang['acl_perm0']             = 'Ingen';
 $lang['acl_perm1']             = 'Læs';
 $lang['acl_perm2']             = 'Skriv';
-- 
cgit v1.2.3


From 6e00e8beb4aa97f22cafa8757c3e136232a62d7d Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 3 Apr 2010 13:47:37 +0200
Subject: Corrected German translation in the acl plugin

---
 lib/plugins/acl/lang/de-informal/lang.php | 8 ++++----
 lib/plugins/acl/lang/de/lang.php          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index 6cabe3f35..ac4bb30c0 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -14,12 +14,12 @@ $lang['page']                  = 'Seite';
 $lang['namespace']             = 'Namensraum';
 $lang['btn_select']            = 'Auswählen';
 $lang['p_user_id']             = 'Benutzer <b class="acluser">%s</b> hat im Moment folgende Rechte auf der Seite <b class="aclpage">%s</b>: <i>%s</i>';
-$lang['p_user_ns']             = 'Benutzer <b class="acluser">%s</b> hat momentan die folgenden Rechte im Namensraum<b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Benutzer <b class="acluser">%s</b> hat momentan die folgenden Rechte im Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_group_id']            = 'Die Gruppenmitglieder <b class="aclgroup">%s</b> haben momentan die folgenden Rechte auf der Seite <b class="aclpage">%s</b>: <i>%s</i>.';
 $lang['p_group_ns']            = 'Die Mitglieder der Gruppe <b class="aclgroup">%s</b> haben gerade Zugriff in folgenden Namensräumen <b class="aclns">%s</b>: <i>%s</i>.';
-$lang['p_choose_id']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen der Seite<b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
-$lang['p_choose_ns']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen des Namenraumes<b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
-$lang['p_inherited']           = 'Hinweis: Diese Rechte wuredn nicht explizit gesetzt sondern geerbt von anderen Grupen oder übergeordneten Namensräumen.';
+$lang['p_choose_id']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen der Seite <b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
+$lang['p_choose_ns']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen des Namenraumes <b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
+$lang['p_inherited']           = 'Hinweis: Diese Rechte wurden nicht explizit gesetzt, sondern von anderen Gruppen oder übergeordneten Namensräumen geerbt.';
 $lang['p_isadmin']             = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.';
 $lang['p_include']             = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Löschrechte sind nur für Namensräume, nicht für Seiten.';
 $lang['current']               = 'Momentane Zugriffsregeln';
diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php
index 5bac3ac1c..0d30fe7a1 100644
--- a/lib/plugins/acl/lang/de/lang.php
+++ b/lib/plugins/acl/lang/de/lang.php
@@ -31,7 +31,7 @@ $lang['p_group_id']            = 'Mitglieder der Gruppe <b class="aclgroup">%s</
 $lang['p_group_ns']            = 'Mitglieder der Gruppe <b class="aclgroup">%s</b> haben momentan folgende Berechtigungen für den Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_choose_id']           = 'Bitte geben Sie in obigem Formular eine <b>einen Nutzer oder eine Gruppe</b> an, um die Berechtigungen für die Seite <b class="aclpage">%s</b> zu sehen oder zu ändern.';
 $lang['p_choose_ns']           = 'Bitte geben Sie in obigem Formular eine <b>einen Nutzer oder eine Gruppe</b> an, um die Berechtigungen für den Namensraum <b class="aclns">%s</b> zu sehen oder zu ändern.';
-$lang['p_inherited']           = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.';
+$lang['p_inherited']           = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt, sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.';
 $lang['p_isadmin']             = 'Hinweis: Die ausgewählte Gruppe oder Nutzer haben immer alle Berechtigungen das sie als Superuser konfiguriert wurden.';
 $lang['p_include']             = 'Höhere Berechtigungen schließen niedrigere mit ein. Anlegen, Hochladen und Entfernen gilt nur für Namensräume, nicht für einzelne Seiten';
 $lang['current']               = 'Momentane Zugriffsregeln';
-- 
cgit v1.2.3


From d74913c6df41b27eb1ea8388a47d94e66f97c652 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 3 Apr 2010 14:40:32 +0200
Subject: Fixed sorting in the acl manager treeview

Previously the content of expanded namespaces was displayed below
all other pages, now it is placed below it's parent namespace.
The new comparison function is quite complex. Please have a look at it
if it can done easier or if there are cases I haven't considered where
the function produces incorrect results.
---
 lib/plugins/acl/admin.php | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index b38d2ac6e..dcd72b611 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -267,8 +267,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         usort($data,array($this,'_tree_sort'));
         $count = count($data);
         if($count>0) for($i=1; $i<$count; $i++){
-            if($data[$i]['type'] == 'f') break; // namespaces come first, we're done
-            if($data[$i-1]['id'] == $data[$i]['id']) unset($data[$i]);
+            if($data[$i-1]['id'] == $data[$i]['id'] && $data[$i-1]['type'] == $data[$i]['type']) unset($data[$i]);
         }
         return $data;
     }
@@ -279,13 +278,39 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      * Sorts the combined trees of media and page files
      */
     function _tree_sort($a,$b){
-        if($a['type'] == 'd' && $b['type'] == 'f'){
+        // handle the trivial cases first
+        if ($a['id'] == '') return -1;
+        if ($b['id'] == '') return 1;
+        // split up the id into parts
+        $a_ids = explode(':', $a['id']);
+        $b_ids = explode(':', $b['id']);
+        // now loop through the parts
+        while (count($a_ids) && count($b_ids)) {
+            // compare each level from upper to lower
+            // until a non-equal component is found
+            $cur_result = strcmp(array_shift($a_ids), array_shift($b_ids));
+            if ($cur_result) {
+                // if one of the components is the last component and is a file
+                // and the other one is either of a deeper level or a directory,
+                // the file has to come after the deeper level or directory
+                if (empty($a_ids) && $a['type'] == 'f' && (count($b_ids) || $b['type'] == 'd')) return 1;
+                if (empty($b_ids) && $b['type'] == 'f' && (count($a_ids) || $a['type'] == 'd')) return -1;
+                return $cur_result;
+            }
+        }
+        // The two ids seem to be equal. One of them might however refer
+        // to a page, one to a namespace, the namespace needs to be first.
+        if (empty($a_ids) && empty($b_ids)) {
+            if ($a['type'] == $b['type']) return 0;
+            if ($a['type'] == 'f') return 1;
             return -1;
-        }elseif($a['type'] == 'f' && $b['type'] == 'd'){
-            return 1;
-        }else{
-            return strcmp($a['id'],$b['id']);
         }
+        // Now the empty part is either a page in the parent namespace
+        // that obviously needs to be after the namespace
+        // Or it is the namespace that contains the other part and should be
+        // before that other part.
+        if (empty($a_ids)) return ($a['type'] == 'd') ? -1 : 1;
+        if (empty($b_ids)) return ($b['type'] == 'd') ? 1 : -1;
     }
 
     /**
-- 
cgit v1.2.3


From 40307ce67e9cb6cc8f00ddcddf1677f41b42fb83 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 3 Apr 2010 16:57:58 +0200
Subject: Preserve selected item in the acl manager during ajax requests

There are two new parameters submitted that contain the currently
selected namespace and page id so it can be selected again
indenpendently from the opened namespace.
---
 lib/plugins/acl/admin.php | 25 ++++++++++++++++++++++---
 lib/plugins/acl/script.js |  6 +++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index dcd72b611..1f666660c 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -17,6 +17,15 @@ if(!defined('DOKU_INC')) die();
 class admin_plugin_acl extends DokuWiki_Admin_Plugin {
     var $acl = null;
     var $ns  = null;
+    /** 
+     * The currently selected item, associative array with id and type.
+     * Populated from (in this order):
+     * $_REQUEST['current_ns']
+     * $_REQUEST['current_id']
+     * $ns
+     * $ID
+     */
+    var $current_item = null;
     var $who = '';
     var $usersgroups = array();
     var $specials = array();
@@ -72,6 +81,16 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             $this->ns = cleanID($_REQUEST['ns']);
         }
 
+        if ($_REQUEST['current_ns']) {
+            $this->current_item = array('id' => cleanID($_REQUEST['current_ns']), 'type' => 'd');
+        } elseif ($_REQUEST['current_id']) {
+            $this->current_item = array('id' => cleanID($_REQUEST['current_id']), 'type' => 'f');
+        } elseif ($this->ns) {
+            $this->current_item = array('id' => $this->ns, 'type' => 'd');
+        } else {
+            $this->current_item = array('id' => $ID, 'type' => 'f');
+        }
+
         // user or group choosen?
         $who = trim($_REQUEST['acl_w']);
         if($_REQUEST['acl_t'] == '__g__' && $who){
@@ -167,7 +186,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '<div class="level1">'.NL;
 
         echo '<div id="acl__tree">'.NL;
-        $this->_html_explorer($_REQUEST['ns']);
+        $this->_html_explorer();
         echo '</div>'.NL;
 
         echo '<div id="acl__detail">'.NL;
@@ -498,8 +517,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         // highlight?
-        if( ($item['type']=='d' && $item['id'] == $this->ns) ||
-            ($item['type']!='d' && $item['id'] == $ID)) $cl = ' cur';
+        if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id'])) 
+            $cl = ' cur';
 
         // namespace or page?
         if($item['type']=='d'){
diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index 449a3c16a..d5d0371a9 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -118,7 +118,11 @@ acl = {
         var ul = document.createElement('ul');
         listitem.appendChild(ul);
         ajax.elementObj = ul;
-        ajax.runAJAX(link.search.substr(1)+'&ajax=tree');
+        ajax.setVar('ajax', 'tree');
+        var frm = $('acl__detail').getElementsByTagName('form')[0];
+        ajax.setVar('current_ns', encodeURIComponent(frm.elements['ns'].value));
+        ajax.setVar('current_id', encodeURIComponent(frm.elements['id'].value));
+        ajax.runAJAX(link.search.substr(1));
         clicky.src = DOKU_BASE+'lib/images/minus.gif';
         return false;
     },
-- 
cgit v1.2.3


From 94f1f78b9d937c58369e0346233ea8dbf40a0cca Mon Sep 17 00:00:00 2001
From: Usama Akkad <uakkad@gmail.com>
Date: Thu, 8 Apr 2010 11:45:05 +0200
Subject: Arabic language update

---
 lib/plugins/acl/lang/ar/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php
index ced250243..e3e04a6c4 100644
--- a/lib/plugins/acl/lang/ar/lang.php
+++ b/lib/plugins/acl/lang/ar/lang.php
@@ -5,6 +5,7 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author Mostafa Hussein <mostafa@gmail.com>
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
+ * @author Usama Akkad <uahello@gmail.com>
  */
 $lang['admin_acl']             = 'إدارة قوائم التحكم بالدخول';
 $lang['acl_group']             = 'مجموعة';
-- 
cgit v1.2.3


From 28a7a6433920fcafa4c345badb9b4a185932fbe9 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Fri, 9 Apr 2010 08:24:07 +0200
Subject: Slovak language update

---
 lib/plugins/acl/lang/sk/help.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/sk/help.txt b/lib/plugins/acl/lang/sk/help.txt
index 1167bf5e9..103a0341a 100644
--- a/lib/plugins/acl/lang/sk/help.txt
+++ b/lib/plugins/acl/lang/sk/help.txt
@@ -4,8 +4,8 @@ Na tejto stránke môžete pridávať alebo rušiť oprávnenia pre menné pries
 
 Ľavý panel zobrazuje všetky dostupné menné priestory a stránky.
 
-Formulár zobrazený vyššie Vam dovoľuje prehliadať a meniť oprávnenia pre vybraného používateľa alebo skupinu.
+Formulár zobrazený vyššie Vám dovoľuje prehliadať a meniť oprávnenia pre vybraného používateľa alebo skupinu.
 
-V tabuľke nižšie sú zobrazené všetky aktuálne prístupové pravidlá. Môžete v nej rýchlo rušiť alebo meniť viacero pravidiel naraz.
+V tabuľke nižšie sú zobrazené všetky aktuálne prístupové pravidlá. Môžete v nej rýchlo rušiť alebo meniť viacero pravidiel súčasne.
 
 Prečítanie [[doku>acl|oficiálnej dokumentácie ACL]] Vám môže pomôcť plne pochopiť spôsob ako fungujú prístupové pravidlá (oprávnenia) v DokuWiki.
\ No newline at end of file
-- 
cgit v1.2.3


From acca0b77793187b25d85d39e7ed7d6194f8aa55e Mon Sep 17 00:00:00 2001
From: Usama Akkad <uahello@gmail.com>
Date: Thu, 15 Apr 2010 08:36:26 +0200
Subject: Arabic language update

---
 lib/plugins/acl/lang/ar/help.txt | 11 +++++++++++
 lib/plugins/acl/lang/ar/lang.php | 12 ++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 lib/plugins/acl/lang/ar/help.txt

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ar/help.txt b/lib/plugins/acl/lang/ar/help.txt
new file mode 100644
index 000000000..afae13a86
--- /dev/null
+++ b/lib/plugins/acl/lang/ar/help.txt
@@ -0,0 +1,11 @@
+=== مساعدة سريعة: ===
+
+على هذه الصفحة يمكنك إضافة أو إزالة الصلاحيات الخاصة بالنطاقات و الصفحات في ويكيتك.
+
+الشريط الأيسر يظهر كل النطاقات و الصفحات المتاحة.
+
+النموذج في الأسفل يمكنك من رؤية و تعديل الصلاحيات لمستخدم محدد أو مجموعة .
+
+في الجدول في الأسفل تجد قواعد التحكم بالوصول معروضة. يمكنك استخدامها لحذف أو تغيير عدة قواعد بسرعة.
+
+قراءة [[doku>acl|المستندات الرسمية عن ACL]] قد يساعدك على الفهم الكامل لطريقة عمل التحكم بالوصول في دوكي ويكي.
diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php
index e3e04a6c4..552ce90d9 100644
--- a/lib/plugins/acl/lang/ar/lang.php
+++ b/lib/plugins/acl/lang/ar/lang.php
@@ -14,6 +14,17 @@ $lang['acl_perms']             = 'ترخيص لـ';
 $lang['page']                  = 'صفحة';
 $lang['namespace']             = 'فضاء التسمية';
 $lang['btn_select']            = 'اختيار';
+$lang['p_user_id']             = 'المستخدم<b class="acluser">%s</b> عنده حاليا الصلاحيات التالية على الصفحة<b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'المستخدم <b class="acluser">%s</b> عنده حاليا الصلاحيات التالية في النطاق<b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'أعضاء مجموعة<b class="aclgroup">%s</b> عندهم حاليا الصلاحيات التالية على الصفحة page <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'أعضاء مجموعة <b class="aclgroup">%s</b> عندهم حاليا الصلاحيات التالية في النطاق <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'رجاء <b>مستخدما أو مجموعة</b> في النموذج أعلاه لعرض أو تحرير اعداد الصلاحيات للصفحة<b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'رجاء Please <b>أدخل مستخدما أو مجموعة</b> في النموذج أعلاه لعرض أو تحرير اعداد الصلاحيات للنطاق<b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'لاحظ: هذه الصلاحيات لم تنشأ إراديا بل وُرثت من مجموعات أخرى أو نطاقات أعلى.';
+$lang['p_isadmin']             = 'لاحظ: المجموعة أو المستخدم المحدد عندهم دائما صلاحيات كاملة بسبب ضبطهم كمستخدمين متفوقين.';
+$lang['p_include']             = 'الصلاحيات الاعلى تتضمن الأخفض. صلاحيات الإنشاء ، والرفع، والحذف تطبق فقط على النطاقات، وليس على الصفحات.';
+$lang['current']               = 'قواعد ACL الحالية';
+$lang['where']                 = 'الصفحة/النطاق';
 $lang['who']                   = 'اسم المستخدم / المجموعة';
 $lang['perm']                  = 'التصاريح';
 $lang['acl_perm0']             = 'لا يوجد';
@@ -23,3 +34,4 @@ $lang['acl_perm4']             = 'إنشاء';
 $lang['acl_perm8']             = 'تحميل';
 $lang['acl_perm16']            = 'مسح';
 $lang['acl_new']               = 'أضف أضافة جديدة';
+$lang['acl_mod']               = 'عدل المدخلة';
-- 
cgit v1.2.3


From 0d9c4a0b2a392fa4eff32664d37fea6b2d528060 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20Wid=C5=82a?= <dzesdzes@gmail.com>
Date: Sun, 18 Apr 2010 13:10:07 +0200
Subject: Polish language update

---
 lib/plugins/acl/lang/pl/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index 300f0ad1c..c954abe2a 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -10,6 +10,7 @@
  * @author sleshek@wp.pl
  * @author Leszek Stachowski <shazarre@gmail.com>
  * @author maros <dobrimaros@yahoo.pl>
+ * @author Grzegorz Widła <dzesdzes@gmail.com>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
-- 
cgit v1.2.3


From c275533eba3389cf4c186d995947aedfff356177 Mon Sep 17 00:00:00 2001
From: Mauro Javier Giamberardino Fernandez <mgiamberardino@gmail.com>
Date: Wed, 19 May 2010 19:44:29 +0200
Subject: Spanish language update

---
 lib/plugins/acl/lang/es/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index c908dc5a9..e63448a00 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -18,6 +18,7 @@
  * @author Daniel Castro Alvarado <dancas2@gmail.com>
  * @author Fernando J. Gómez <fjgomez@gmail.com>
  * @author Victor Castelan <victorcastelan@gmail.com>
+ * @author Mauro Javier Giamberardino <mgiamberardino@gmail.com>
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';
-- 
cgit v1.2.3


From e53f9e72a48912e662dde20d7dceca74a022dcdf Mon Sep 17 00:00:00 2001
From: Marijn Hofstra <hofstra.m@gmail.com>
Date: Tue, 22 Jun 2010 19:02:33 +0200
Subject: Dutch language update

---
 lib/plugins/acl/lang/nl/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index d45bb5907..86ce933d3 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -14,6 +14,7 @@
  * @author Danny Rotsaert <danny.rotsaert@edpnet.be>
  * @author Marijn Hofstra hofstra.m@gmail.com
  * @author Matthias Carchon webmaster@c-mattic.be
+ * @author Marijn Hofstra <hofstra.m@gmail.com>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
-- 
cgit v1.2.3


From def4baf24186bf30d4ba5ea726fb7c8391d8b43f Mon Sep 17 00:00:00 2001
From: Samuel Dorsaz <samuel.dorsaz@novelion.net>
Date: Tue, 22 Jun 2010 19:03:25 +0200
Subject: French language update

---
 lib/plugins/acl/lang/fr/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index 64d918360..63e529aab 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -19,6 +19,7 @@
  * @author Vincent Feltz <psycho@feltzv.fr>
  * @author Philippe Bajoit <philippe.bajoit@gmail.com>
  * @author Florian Gaub <floriang@floriang.net>
+ * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  */
 $lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
 $lang['acl_group']             = 'Groupe';
-- 
cgit v1.2.3


From 80601d26897c5dced80645aaf904085aa08b7bb9 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 26 Jun 2010 11:20:25 +0200
Subject: fixed wildcard handling in ACL manager FS#1955

This patch also removes legacy support for @USER@. Only %USER% is valid
now.
---
 lib/plugins/acl/admin.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 1f666660c..673ffbc96 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -96,7 +96,10 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         if($_REQUEST['acl_t'] == '__g__' && $who){
             $this->who = '@'.ltrim($auth->cleanGroup($who),'@');
         }elseif($_REQUEST['acl_t'] == '__u__' && $who){
-            $this->who = ltrim($auth->cleanUser($who),'@');
+            $this->who = ltrim($who,'@');
+            if($this->who != '%USER%'){ #keep wildcard as is
+                $this->who = $auth->cleanUser($this->who);
+            }
         }elseif($_REQUEST['acl_t'] &&
                 $_REQUEST['acl_t'] != '__u__' &&
                 $_REQUEST['acl_t'] != '__g__'){
@@ -150,7 +153,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                             if ($who!='@ALL') {
                                 $who = '@'.ltrim($auth->cleanGroup($who),'@');
                             }
-                        } else {
+                        } elseif ($who != '%USER%'){ #keep wildcard as is
                             $who = $auth->cleanUser($who);
                         }
                         $who = auth_nameencode($who,true);
-- 
cgit v1.2.3


From 1a93c67cff4a7b3e30186141cd17f4ba6e113e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20D=C3=A1vid?= <szabo.david@gyumolcstarhely.hu>
Date: Sun, 27 Jun 2010 10:38:10 +0200
Subject: Hungarian language update

---
 lib/plugins/acl/lang/hu/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php
index 4fb1720ae..7de0b87a9 100644
--- a/lib/plugins/acl/lang/hu/lang.php
+++ b/lib/plugins/acl/lang/hu/lang.php
@@ -5,6 +5,7 @@
  * @author Sandor TIHANYI <stihanyi+dw@gmail.com>
  * @author Siaynoq Mage <siaynoqmage@gmail.com>
  * @author schilling.janos@gmail.com
+ * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu)
  */
 $lang['admin_acl']             = 'Hozzáférési lista (ACL) kezelő';
 $lang['acl_group']             = 'Csoport:';
-- 
cgit v1.2.3


From c8f80b4e70ee1b73ecc08cac583d021979af9359 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 27 Jun 2010 14:43:56 +0200
Subject: Use config_cascade for ACLs and plain auth users FS#1677

---
 lib/plugins/acl/admin.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 673ffbc96..84932f7ac 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -69,6 +69,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         global $AUTH_ACL;
         global $ID;
         global $auth;
+        global $config_cascade;
 
         // fresh 1:1 copy without replacements
         $AUTH_ACL = file(DOKU_CONF.'acl.auth.php');
@@ -161,11 +162,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                     }
                 }
                 // save it
-                io_saveFile(DOKU_CONF.'acl.auth.php', join('',$lines));
+                io_saveFile($config_cascade['acl']['default'], join('',$lines));
             }
 
             // reload ACL config
-            $AUTH_ACL = file(DOKU_CONF.'acl.auth.php');
+            $AUTH_ACL = file($config_cascade['acl']['default']);
         }
 
         // initialize ACL array
@@ -696,7 +697,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      * @author  Frank Schubert <frank@schokilade.de>
      */
     function _acl_add($acl_scope, $acl_user, $acl_level){
-        $acl_config = file_get_contents(DOKU_CONF.'acl.auth.php');
+        global $config_cascade;
+        $acl_config = file_get_contents($config_cascade['acl']['default']);
         $acl_user = auth_nameencode($acl_user,true);
 
         // max level for pagenames is edit
@@ -718,7 +720,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      * @author  Frank Schubert <frank@schokilade.de>
      */
     function _acl_del($acl_scope, $acl_user){
-        $acl_config = file(DOKU_CONF.'acl.auth.php');
+        global $config_cascade;
+        $acl_config = file($config_cascade['acl']['default']);
         $acl_user = auth_nameencode($acl_user,true);
 
         $acl_pattern = '^'.preg_quote($acl_scope,'/').'\s+'.$acl_user.'\s+[0-8].*$';
-- 
cgit v1.2.3


From e03f8da34f265d1085e18bec8aa6cd627179cbef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Kj=C3=A6r=20Pedersen?= <subben@gmail.com>
Date: Fri, 2 Jul 2010 21:19:56 +0200
Subject: Danish language update

---
 lib/plugins/acl/lang/da/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php
index d40da52a0..f82098dee 100644
--- a/lib/plugins/acl/lang/da/lang.php
+++ b/lib/plugins/acl/lang/da/lang.php
@@ -12,6 +12,7 @@
  * @author Daniel Ejsing-Duun <dokuwiki@zilvador.dk>
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
  */
 $lang['admin_acl']             = 'Rettighedsadministration';
 $lang['acl_group']             = 'Gruppe';
-- 
cgit v1.2.3


From 0271153bc37bcbf6fca13a371b9f98eda8ee41f0 Mon Sep 17 00:00:00 2001
From: Georgios Petsagourakis <petsagouris@gmail.com>
Date: Mon, 12 Jul 2010 21:23:05 +0200
Subject: Greek language update

---
 lib/plugins/acl/lang/el/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/el/lang.php b/lib/plugins/acl/lang/el/lang.php
index da8a72ab3..e2f6c35dc 100644
--- a/lib/plugins/acl/lang/el/lang.php
+++ b/lib/plugins/acl/lang/el/lang.php
@@ -12,6 +12,7 @@
  * @author Thanos Massias <tm@thriasio.gr>
  * @author Αθανάσιος Νταής <homunculus@wana.gr>
  * @author Konstantinos Koryllos <koryllos@gmail.com>
+ * @author George Petsagourakis <petsagouris@gmail.com>
  */
 $lang['admin_acl']             = 'Διαχείριση Δικαιωμάτων Πρόσβασης';
 $lang['acl_group']             = 'Ομάδα';
-- 
cgit v1.2.3


From 88b4123b3d96037c6d1ffe48386c507a0276cabc Mon Sep 17 00:00:00 2001
From: Ulrikhe Lukoie <lukoie@gmail.com>
Date: Mon, 12 Jul 2010 21:24:46 +0200
Subject: Ukrainian language update

---
 lib/plugins/acl/lang/uk/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/uk/lang.php b/lib/plugins/acl/lang/uk/lang.php
index dc3e6a963..99b4b2623 100644
--- a/lib/plugins/acl/lang/uk/lang.php
+++ b/lib/plugins/acl/lang/uk/lang.php
@@ -8,6 +8,7 @@
  * @author okunia@gmail.com
  * @author Oleksandr Kunytsia <okunia@gmail.com>
  * @author Uko uko@uar.net
+ * @author Ulrikhe Lukoie  <lukoie@gmail>.com
  */
 $lang['admin_acl']             = 'Керування списками контролю доступу';
 $lang['acl_group']             = 'Група';
-- 
cgit v1.2.3


From c0e46ee6bf1e41a839f43dda4bb3746534c55b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Lefty=20=C5=A0koda?= <lefty@multihost.cz>
Date: Mon, 12 Jul 2010 22:14:03 +0200
Subject: Czech language update

---
 lib/plugins/acl/lang/cs/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index aab39098a..311b79ae9 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -7,6 +7,7 @@
  * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
  * @author tomas@valenta.cz
  * @author Marek Sacha <sachamar@fel.cvut.cz>
+ * @author Lefty <lefty@multihost.cz>
  */
 $lang['admin_acl']             = 'Správa přístupových práv';
 $lang['acl_group']             = 'Skupina';
-- 
cgit v1.2.3


From f62100e2e79ba5106f2777c8e9c5f5e35c593d40 Mon Sep 17 00:00:00 2001
From: Aleksandr Selivanov <alexgearbox@gmail.com>
Date: Fri, 16 Jul 2010 08:59:39 +0200
Subject: Russian language update

---
 lib/plugins/acl/lang/ru/help.txt | 2 +-
 lib/plugins/acl/lang/ru/lang.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ru/help.txt b/lib/plugins/acl/lang/ru/help.txt
index f969151fe..4b8013f2b 100644
--- a/lib/plugins/acl/lang/ru/help.txt
+++ b/lib/plugins/acl/lang/ru/help.txt
@@ -1,4 +1,4 @@
-=== Краткая Справка: ===
+=== Краткая справка: ===
 
 На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам вашей вики.
 
diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index 911ae72da..6bfea16bc 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -12,6 +12,7 @@
  * @author Kirill Krasnov <krasnovforum@gmail.com>
  * @author Vlad Tsybenko <vlad.development@gmail.com>
  * @author Aleksey Osadchiy <rfc@nm.ru>
+ * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  */
 $lang['admin_acl']             = 'Управление списками контроля доступа';
 $lang['acl_group']             = 'Группа';
@@ -26,9 +27,9 @@ $lang['p_group_id']            = 'Сейчас члены группы <b class=
 $lang['p_group_ns']            = 'Сейчас члены группы <b class="aclgroup">%s</b> cимеют следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
 $lang['p_choose_id']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к странице <b class="aclpage">%s</b>.';
 $lang['p_choose_ns']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к пространству имён <b class="aclns">%s</b>.';
-$lang['p_inherited']           = 'Замечание: Эти права доступа не были заданы явно, а были унаследованы от других групп или пространств имён более высокого порядка.';
-$lang['p_isadmin']             = 'Замечание: Выбранный пользователь всегда имеет полные права так, как он является суперпользователем.';
-$lang['p_include']             = 'Более высокие права доступа включают в себя более низкие. Права доступа Создание, Загрузка и Удаление относятся только к пространствам имён, а не к страницам.';
+$lang['p_inherited']           = 'Замечание: эти права доступа не были заданы явно, а были унаследованы от других групп или пространств имён более высокого порядка.';
+$lang['p_isadmin']             = 'Замечание: выбранный пользователь всегда имеет полные права так, как он является суперпользователем.';
+$lang['p_include']             = 'Более высокие права доступа включают в себя более низкие. Права доступа «Создание», «Загрузка» и «Удаление» относятся только к пространствам имён, а не к страницам.';
 $lang['current']               = 'Текущие права ACL';
 $lang['where']                 = 'Страница/Пространство имён';
 $lang['who']                   = 'Пользователь/Группа';
-- 
cgit v1.2.3


From 163ad9f2399a52f60868a2454c1113e214c1bfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20D=C3=A1vid?= <szabo.david@gyumolcstarhely.hu>
Date: Fri, 16 Jul 2010 09:01:32 +0200
Subject: Hungarian update

---
 lib/plugins/acl/lang/hu/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/hu/lang.php b/lib/plugins/acl/lang/hu/lang.php
index 7de0b87a9..318287073 100644
--- a/lib/plugins/acl/lang/hu/lang.php
+++ b/lib/plugins/acl/lang/hu/lang.php
@@ -6,6 +6,7 @@
  * @author Siaynoq Mage <siaynoqmage@gmail.com>
  * @author schilling.janos@gmail.com
  * @author Szabó Dávid (szabo.david@gyumolcstarhely.hu)
+ * @author Szabó Dávid <szabo.david@gyumolcstarhely.hu>
  */
 $lang['admin_acl']             = 'Hozzáférési lista (ACL) kezelő';
 $lang['acl_group']             = 'Csoport:';
-- 
cgit v1.2.3


From 45c5ecdccdd251af3e9202f944fa8bf103c5db0f Mon Sep 17 00:00:00 2001
From: osman tekin <osman.tekin93@hotmail.it>
Date: Mon, 9 Aug 2010 22:04:49 +0200
Subject: Italian language update

---
 lib/plugins/acl/lang/it/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php
index 2f579afae..89e421bbb 100644
--- a/lib/plugins/acl/lang/it/lang.php
+++ b/lib/plugins/acl/lang/it/lang.php
@@ -11,6 +11,7 @@
  * @author Lorenzo Breda <lbreda@gmail.com>
  * @author snarchio@alice.it
  * @author robocap <robocap1@gmail.com>
+ * @author Osman Tekin osman.tekin93@hotmail.it
  */
 $lang['admin_acl']             = 'Gestione Lista Controllo Accessi (ACL)';
 $lang['acl_group']             = 'Gruppo';
-- 
cgit v1.2.3


From 237f954610f045f604fe05a60d82df8b375e0cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0olti?= <solti.miroslav@gmail.com>
Date: Fri, 20 Aug 2010 11:44:51 +0200
Subject: Serbian language update

---
 lib/plugins/acl/lang/sr/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/sr/lang.php b/lib/plugins/acl/lang/sr/lang.php
index 6e1649992..20fbb0382 100644
--- a/lib/plugins/acl/lang/sr/lang.php
+++ b/lib/plugins/acl/lang/sr/lang.php
@@ -6,6 +6,7 @@
  * @author Filip Brcic <brcha@users.sourceforge.net>
  * @author Иван Петровић petrovicivan@ubuntusrbija.org
  * @author Ivan Petrovic <petrovicivan@ubuntusrbija.org>
+ * @author Miroslav Šolti <solti.miroslav@gmail.com>
  */
 $lang['admin_acl']             = 'Управљање листом контроле приступа';
 $lang['acl_group']             = 'Група';
-- 
cgit v1.2.3


From 003a37b419108048f084be9c59598a00a7eb8724 Mon Sep 17 00:00:00 2001
From: Timon Van Overveldt <timonvo@gmail.com>
Date: Fri, 20 Aug 2010 11:45:47 +0200
Subject: Dutch language update

---
 lib/plugins/acl/lang/nl/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index 86ce933d3..f9adb5f04 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -15,6 +15,7 @@
  * @author Marijn Hofstra hofstra.m@gmail.com
  * @author Matthias Carchon webmaster@c-mattic.be
  * @author Marijn Hofstra <hofstra.m@gmail.com>
+ * @author Timon Van Overveldt <timonvo@gmail.com>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
-- 
cgit v1.2.3