Merge branch 'master' into stable

28 files changed, 206 insertions, 145 deletions

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a6b0624bc..1197892f2 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -56,22 +56,23 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         global $ID;
         global $auth;
         global $config_cascade;
+        global $INPUT;
 
         // fresh 1:1 copy without replacements
         $AUTH_ACL = file($config_cascade['acl']['default']);
 
 
         // namespace given?
-        if($_REQUEST['ns'] == '*'){
+        if($INPUT->str('ns') == '*'){
             $this->ns = '*';
         }else{
-            $this->ns = cleanID($_REQUEST['ns']);
+            $this->ns = cleanID($INPUT->str('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');
+        if ($INPUT->str('current_ns')) {
+            $this->current_item = array('id' => cleanID($INPUT->str('current_ns')), 'type' => 'd');
+        } elseif ($INPUT->str('current_id')) {
+            $this->current_item = array('id' => cleanID($INPUT->str('current_id')), 'type' => 'f');
         } elseif ($this->ns) {
             $this->current_item = array('id' => $this->ns, 'type' => 'd');
         } else {
@@ -79,24 +80,25 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         // user or group choosen?
-        $who = trim($_REQUEST['acl_w']);
-        if($_REQUEST['acl_t'] == '__g__' && $who){
+        $who = trim($INPUT->str('acl_w'));
+        if($INPUT->str('acl_t') == '__g__' && $who){
             $this->who = '@'.ltrim($auth->cleanGroup($who),'@');
-        }elseif($_REQUEST['acl_t'] == '__u__' && $who){
+        }elseif($INPUT->str('acl_t') == '__u__' && $who){
             $this->who = ltrim($who,'@');
-            if($this->who != '%USER%'){ #keep wildcard as is
+            if($this->who != '%USER%' && $this->who != '%GROUP%'){ #keep wildcard as is
                 $this->who = $auth->cleanUser($this->who);
             }
-        }elseif($_REQUEST['acl_t'] &&
-                $_REQUEST['acl_t'] != '__u__' &&
-                $_REQUEST['acl_t'] != '__g__'){
-            $this->who = $_REQUEST['acl_t'];
+        }elseif($INPUT->str('acl_t') &&
+                $INPUT->str('acl_t') != '__u__' &&
+                $INPUT->str('acl_t') != '__g__'){
+            $this->who = $INPUT->str('acl_t');
         }elseif($who){
             $this->who = $who;
         }
 
         // handle modifications
-        if(isset($_REQUEST['cmd']) && checkSecurityToken()){
+        if($INPUT->has('cmd') && checkSecurityToken()){
+            $cmd = $INPUT->extract('cmd')->str('cmd');
 
             // scope for modifications
             if($this->ns){
@@ -109,19 +111,21 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                 $scope = $ID;
             }
 
-            if(isset($_REQUEST['cmd']['save']) && $scope && $this->who && isset($_REQUEST['acl'])){
+            if($cmd == 'save' && $scope && $this->who && $INPUT->has('acl')){
                 // handle additions or single modifications
                 $this->_acl_del($scope, $this->who);
-                $this->_acl_add($scope, $this->who, (int) $_REQUEST['acl']);
-            }elseif(isset($_REQUEST['cmd']['del']) && $scope && $this->who){
+                $this->_acl_add($scope, $this->who, $INPUT->int('acl'));
+            }elseif($cmd == 'del' && $scope && $this->who){
                 // handle single deletions
                 $this->_acl_del($scope, $this->who);
-            }elseif(isset($_REQUEST['cmd']['update'])){
+            }elseif($cmd == 'update'){
+                $acl = $INPUT->arr('acl');
+
                 // handle update of the whole file
-                foreach((array) $_REQUEST['del'] as $where => $names){
+                foreach($INPUT->arr('del') as $where => $names){
                     // remove all rules marked for deletion
                     foreach($names as $who)
-                        unset($_REQUEST['acl'][$where][$who]);
+                        unset($acl[$where][$who]);
                 }
                 // prepare lines
                 $lines = array();
@@ -134,13 +138,13 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                     }
                 }
                 // re-add all rules
-                foreach((array) $_REQUEST['acl'] as $where => $opt){
+                foreach($acl as $where => $opt){
                     foreach($opt as $who => $perm){
                         if ($who[0]=='@') {
                             if ($who!='@ALL') {
                                 $who = '@'.ltrim($auth->cleanGroup($who),'@');
                             }
-                        } elseif ($who != '%USER%'){ #keep wildcard as is
+                        } elseif ($who != '%USER%' && $who != '%GROUP%'){ #keep wildcard as is
                             $who = $auth->cleanUser($who);
                         }
                         $who = auth_nameencode($who,true);
@@ -191,7 +195,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '</div>'.NL;
 
         echo '<div class="footnotes"><div class="fn">'.NL;
-        echo '<sup><a id="fn__1" class="fn_bot" name="fn__1" href="#fnt__1">1)</a></sup>'.NL;
+        echo '<sup><a id="fn__1" class="fn_bot" href="#fnt__1">1)</a></sup>'.NL;
         echo $this->getLang('p_include');
         echo '</div></div>';
 
@@ -507,7 +511,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         if($item['type']=='d'){
             if($item['open']){
                 $img   = DOKU_BASE.'lib/images/minus.gif';
-                $alt   = '&minus;';
+                $alt   = '−';
             }else{
                 $img   = DOKU_BASE.'lib/images/plus.gif';
                 $alt   = '+';
@@ -597,11 +601,12 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         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 class="table">';
         echo '<table class="inline">';
         echo '<tr>';
         echo '<th>'.$this->getLang('where').'</th>';
         echo '<th>'.$this->getLang('who').'</th>';
-        echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" name="fnt__1" href="#fn__1">1)</a></sup></th>';
+        echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" href="#fn__1">1)</a></sup></th>';
         echo '<th>'.$lang['btn_delete'].'</th>';
         echo '</tr>';
         foreach($this->acl as $where => $set){
@@ -629,7 +634,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                 echo $this->_html_checkboxes($perm,$ispage,'acl['.$where.']['.$who.']');
                 echo '</td>';
 
-                echo '<td align="center">';
+                echo '<td class="check">';
                 echo '<input type="checkbox" name="del['.hsc($where).'][]" value="'.hsc($who).'" />';
                 echo '</td>';
                 echo '</tr>';
@@ -637,11 +642,12 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         echo '<tr>';
-        echo '<th align="right" colspan="4">';
+        echo '<th class="action" colspan="4">';
         echo '<input type="submit" value="'.$lang['btn_update'].'" name="cmd[update]" class="button" />';
         echo '</th>';
         echo '</tr>';
         echo '</table>';
+        echo '</div>';
         echo '</div></form>'.NL;
     }
 
@@ -744,8 +750,8 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             }
 
             //build code
-            $ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
-            $ret .= '<input '.buildAttributes($atts).' />&nbsp;';
+            $ret .= '<label for="pbox'.$label.'"'.$class.'>';
+            $ret .= '<input '.buildAttributes($atts).' />&#160;';
             $ret .= $this->getLang('acl_perm'.$perm);
             $ret .= '</label>'.NL;
         }
@@ -781,7 +787,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '  <option value="__g__" class="aclgroup"'.$gsel.'>'.$this->getLang('acl_group').':</option>'.NL;
         echo '  <option value="__u__"  class="acluser"'.$usel.'>'.$this->getLang('acl_user').':</option>'.NL;
         if (!empty($this->specials)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->specials as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
@@ -799,7 +805,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             echo '  </optgroup>'.NL;
         }
         if (!empty($this->usersgroups)) {
-            echo '  <optgroup label="&nbsp;">'.NL;
+            echo '  <optgroup label="&#160;">'.NL;
             foreach($this->usersgroups as $ug){
                 if($ug == $this->who){
                     $sel    = ' selected="selected"';
diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index 71a2eb03a..10e18af97 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -6,35 +6,39 @@
  * @author     Andreas Gohr <andi@splitbrain.org>
  */
 
-//fix for Opera XMLHttpRequests
-if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){
-  parse_str($HTTP_RAW_POST_DATA, $_POST);
-}
-
 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
 require_once(DOKU_INC.'inc/init.php');
 //close session
 session_write_close();
 
+global $conf;
+global $ID;
+global $INPUT;
+
+//fix for Opera XMLHttpRequests
+$postData = http_get_raw_post_data();
+if(!count($_POST) && !empty($postData)){
+    parse_str($postData, $_POST);
+}
+
 if(!auth_isadmin()) die('for admins only');
 if(!checkSecurityToken()) die('CRSF Attack');
 
 $ID    = getID();
 
+/** @var $acl admin_plugin_acl */
 $acl = plugin_load('admin','acl');
 $acl->handle();
 
-$ajax = $_REQUEST['ajax'];
+$ajax = $INPUT->str('ajax');
 header('Content-Type: text/html; charset=utf-8');
 
 if($ajax == 'info'){
     $acl->_html_info();
 }elseif($ajax == 'tree'){
-    global $conf;
-    global $ID;
 
     $dir = $conf['datadir'];
-    $ns  = $_REQUEST['ns'];
+    $ns  = $INPUT->str('ns');
     if($ns == '*'){
         $ns ='';
     }
diff --git a/lib/plugins/acl/lang/bg/lang.php b/lib/plugins/acl/lang/bg/lang.php
index e260be918..95201750e 100644
--- a/lib/plugins/acl/lang/bg/lang.php
+++ b/lib/plugins/acl/lang/bg/lang.php
@@ -20,9 +20,9 @@ $lang['p_group_id']            = 'Членовете на групата <b clas
 $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']           = 'Моля, <b>въведете потребител или група</b> в полето отгоре, за да видите или промените правата за именното пространство <b class="aclns">%s</b>.';
-$lang['p_inherited']           = 'Бележка: Тези разрешения не са зададени директно, а са наследени от други групи или именни пространства.';
+$lang['p_inherited']           = 'Бележка: Тези права не са зададени директно, а са наследени от други групи или именни пространства.';
 $lang['p_isadmin']             = 'Бележка: Избраната група или потребител има всички права, защото е определен за супер потребител.';
-$lang['p_include']             = 'Висши права включват по-нисшите такива. Правата за създаване, качване и изтриване са приложими само за именни пространства, но не  за страници.';
+$lang['p_include']             = 'Висшите права включват по-нисши такива. Правата за създаване, качване и изтриване са приложими само за именни пространства, но не  за страници.';
 $lang['current']               = 'Текущи ACL права';
 $lang['where']                 = 'Страница/Именно пространство';
 $lang['who']                   = 'Потребител/Група';
@@ -34,4 +34,4 @@ $lang['acl_perm4']             = 'Създаване';
 $lang['acl_perm8']             = 'Качване';
 $lang['acl_perm16']            = 'Изтриване';
 $lang['acl_new']               = 'Добавяне на право';
-$lang['acl_mod']               = 'Промяна на записа';
+$lang['acl_mod']               = 'Промяна на правата';
diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
index cc1d97023..a1dce0369 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -10,6 +10,7 @@
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
  * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik <bohumir.zamecnik@gmail.com>
  */
 $lang['admin_acl']             = 'Správa přístupových práv';
 $lang['acl_group']             = 'Skupina';
diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php
index f82098dee..4a9d11448 100644
--- a/lib/plugins/acl/lang/da/lang.php
+++ b/lib/plugins/acl/lang/da/lang.php
@@ -13,6 +13,7 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author rasmus@kinnerup.com
  * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig <mikael@lyngvig.org>
  */
 $lang['admin_acl']             = 'Rettighedsadministration';
 $lang['acl_group']             = 'Gruppe';
diff --git a/lib/plugins/acl/lang/de-informal/lang.php b/lib/plugins/acl/lang/de-informal/lang.php
index 3f4b08c2a..05f7df037 100644
--- a/lib/plugins/acl/lang/de-informal/lang.php
+++ b/lib/plugins/acl/lang/de-informal/lang.php
@@ -5,11 +5,11 @@
  * @author Alexander Fischer <tbanus@os-forge.net>
  * @author Juergen Schwarzer <jschwarzer@freenet.de>
  * @author Marcel Metz <marcel_metz@gmx.de>
- * @author Matthias Schulte <post@lupo49.de>
+ * @author Matthias Schulte <dokuwiki@lupo49.de>
  * @author Christian Wichmann <nospam@zone0.de>
  * @author Pierre Corell <info@joomla-praxis.de>
  */
-$lang['admin_acl']             = 'Zugriffskontrollsystem Management';
+$lang['admin_acl']             = 'Zugangsverwaltung';
 $lang['acl_group']             = 'Gruppe';
 $lang['acl_user']              = 'Benutzer';
 $lang['acl_perms']             = 'Rechte für';
diff --git a/lib/plugins/acl/lang/eo/help.txt b/lib/plugins/acl/lang/eo/help.txt
index cc3f63e5a..488e84a1b 100644
--- a/lib/plugins/acl/lang/eo/help.txt
+++ b/lib/plugins/acl/lang/eo/help.txt
@@ -6,6 +6,6 @@ La maldekstra panelo montras ĉiujn disponeblajn nomspacojn kaj paĝojn.
 
 La suba agordilo permesas al vi rigardi kaj modifi la rajtojn de elektita uzanto aŭ grupo.
 
-En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montritaj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn.
+En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montrataj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn.
 
-Legado de la [[doku&gt;acl|oficiala dokumentaro pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki.
\ No newline at end of file
+Legi la [[doku>acl|oficialan dokumentaron pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki.
diff --git a/lib/plugins/acl/lang/eo/lang.php b/lib/plugins/acl/lang/eo/lang.php
index 72ce576ee..de75c2dd7 100644
--- a/lib/plugins/acl/lang/eo/lang.php
+++ b/lib/plugins/acl/lang/eo/lang.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Esperantolanguage file
+ * Esperanto language file
  *
  * @author Felipe Castro <fefcas@uol.com.br>
  * @author Felipo Kastro <fefcas@gmail.com>
@@ -8,9 +8,7 @@
  * @author Robert Bogenschneider <robog@gmx.de>
  * @author Erik Pedersen <erik pedersen@shaw.ca>
  * @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>
+ * @author Robert Bogenschneider <bogi@uea.org>
  */
 $lang['admin_acl']             = 'Administrado de Alirkontrola Listo (ACL)';
 $lang['acl_group']             = 'Grupo';
@@ -19,13 +17,13 @@ $lang['acl_perms']             = 'Rajtoj por';
 $lang['page']                  = 'Paĝo';
 $lang['namespace']             = 'Nomspaco';
 $lang['btn_select']            = 'Elekti';
-$lang['p_user_id']             = 'Uzanto &lt;b class=&quot;acluser&quot;&gt;%s&lt;/b&gt; aktuale havas la jenajn rajtojn en la paĝo &lt;b class=&quot;aclpage&quot;&gt;%s&lt;/b&gt;: &lt;i&gt;%s&lt;/i&gt;.';
-$lang['p_user_ns']             = 'Uzanto &lt;b class=&quot;acluser&quot;&gt;%s&lt;/b&gt; aktuale havas la jenajn rajtojn en la nomspaco &lt;b class=&quot;aclns&quot;&gt;%s&lt;/b&gt;: &lt;i&gt;%s&lt;/i&gt;.';
-$lang['p_group_id']            = 'Anoj de la grupo &lt;b class=&quot;aclgroup&quot;&gt;%s&lt;/b&gt; aktuale havas la jenajn rajtojn en la paĝo &lt;b class=&quot;aclpage&quot;&gt;%s&lt;/b&gt;: &lt;i&gt;%s&lt;/i&gt;.';
-$lang['p_group_ns']            = 'Anoj de la grupo &lt;b class=&quot;aclgroup&quot;&gt;%s&lt;/b&gt; aktuale havas la jenajn rajtojn en la nomspaco &lt;b class=&quot;aclns&quot;&gt;%s&lt;/b&gt;: &lt;i&gt;%s&lt;/i&gt;.';
-$lang['p_choose_id']           = 'Bonvolu &lt;b&gt;enmeti uzanton aŭ grupon&lt;/b&gt; en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la paĝo &lt;b class=&quot;aclpage&quot;&gt;%s&lt;/b&gt;.';
-$lang['p_choose_ns']           = 'Bonvolu &lt;b&gt;enmeti uzanton aŭ grupon&lt;/b&gt; en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la nomspaco &lt;b class=&quot;aclns&quot;&gt;%s&lt;/b&gt;.';
-$lang['p_inherited']           = 'Rimarko: tiuj rajtoj ne estis rekte difinitaj, sed ili estis hereditaj el aliaj pli superaj grupoj aŭ nomspacoj.';
+$lang['p_user_id']             = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la paĝo <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Bonvolu <b>enmeti uzanton aŭ grupon</b> en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la nomspaco <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Rimarko: tiuj rajtoj ne estas rekte difinitaj, sed ili herediĝas el aliaj pli supraj grupoj aŭ nomspacoj.';
 $lang['p_isadmin']             = 'Rimarko: la elektita grupo aŭ uzanto ĉiam havas plenan rajtaron ĉar ĝi estas difinita kiel superuzanto.';
 $lang['p_include']             = 'Plialtaj permesoj inkluzivas malpli altajn. La permesoj por Krei, Alŝuti kaj Forigi nur aplikeblas al nomspacoj, ne al paĝoj.';
 $lang['current']               = 'Aktuala regularo ACL';
@@ -38,5 +36,5 @@ $lang['acl_perm2']             = 'Redakti';
 $lang['acl_perm4']             = 'Krei';
 $lang['acl_perm8']             = 'Alŝuti';
 $lang['acl_perm16']            = 'Forigi';
-$lang['acl_new']               = 'Aldoni novan Enmetaĵon';
-$lang['acl_mod']               = 'Modifi Enmetaĵon';
+$lang['acl_new']               = 'Aldoni novan enmetaĵon';
+$lang['acl_mod']               = 'Modifi enmetaĵon';
diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index ee50a7530..8aed3c504 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -22,6 +22,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/acl/lang/fa/lang.php b/lib/plugins/acl/lang/fa/lang.php
index ed576c271..8b7d72f51 100644
--- a/lib/plugins/acl/lang/fa/lang.php
+++ b/lib/plugins/acl/lang/fa/lang.php
@@ -7,6 +7,7 @@
  * @author omidmr@gmail.com
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
+ * @author Milad DZand <M.DastanZand@gmail.com>
  */
 $lang['admin_acl']             = 'مدیریت کنترل دسترسی‌ها';
 $lang['acl_group']             = 'گروه';
diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index a33a52bf0..b1b3188be 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -22,6 +22,8 @@
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
+ * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
 $lang['acl_group']             = 'Groupe';
diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php
index f789b979f..a55a2c0f3 100644
--- a/lib/plugins/acl/lang/it/lang.php
+++ b/lib/plugins/acl/lang/it/lang.php
@@ -13,6 +13,7 @@
  * @author robocap <robocap1@gmail.com>
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
+ * @author Matteo Pasotti <matteo@xquiet.eu>
  */
 $lang['admin_acl']             = 'Gestione Lista Controllo Accessi (ACL)';
 $lang['acl_group']             = 'Gruppo';
diff --git a/lib/plugins/acl/lang/ja/lang.php b/lib/plugins/acl/lang/ja/lang.php
index 831fd2d5c..5bebb58a9 100644
--- a/lib/plugins/acl/lang/ja/lang.php
+++ b/lib/plugins/acl/lang/ja/lang.php
@@ -8,6 +8,7 @@
  * @author Ikuo Obataya <i.obataya@gmail.com>
  * @author Daniel Dupriest <kououken@gmail.com>
  * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ * @author Taisuke Shimamoto <dentostar@gmail.com>
  */
 $lang['admin_acl']             = 'アクセスコントロール管理';
 $lang['acl_group']             = 'グループ';
diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index 516198ee5..377636682 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -1,11 +1,11 @@
 === 도움말: ===
 
-현재 페이지에서 위키 네임스페이스와 페이지에 대한 접근 권한을 추가하거나 삭제할 수 있습니다.
+현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다.
 
-왼쪽 영역을 선택가능한 네임스페이스들과 페이지 목록을 보여줍니다.
+왼쪽 영역에는 선택 가능한 이름공간과 문서 목록을 보여줍니다.
 
-위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 변경할 수 있습니다.
+위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 바꿀 수 있습니다.
 
-아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나  변경할 수 있습니다.
+아래 테이블에서 현재 설정된 모든 접근 제어 규칙을 볼 수 있으며, 즉시 여러 규칙을 삭제하거나 바꿀 수 있습니다.
 
-DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면  [[doku>acl|official documentation on ACL]] 읽기 바랍니다.
\ No newline at end of file
+DokuWiki에서 접근 제어가 어떻게 동작되는지 알아보려면  [[doku>acl|ACL 공식 문서]]를 읽어보기 바랍니다.
\ No newline at end of file
diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 6f4e991cb..c8e1ce5cc 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -11,32 +11,34 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
+ * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['admin_acl']             = '접근 제어 목록 관리';
 $lang['acl_group']             = '그룹';
 $lang['acl_user']              = '사용자';
 $lang['acl_perms']             = '권한';
-$lang['page']                  = '페이지';
-$lang['namespace']             = '네임스페이스';
+$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> 사용자는 현재 <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 class="aclpage">%s</b> 페이지 접근 권한을 보거나 변경하려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
-$lang['p_choose_ns']           = '<b class="aclns">%s</b> 네임스페이스 접근 권한을 보거나 변경하려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
-$lang['p_inherited']           = '주의: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 네임스페이스로 부터 가져왔습니다.';
-$lang['p_isadmin']             = '주의: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.';
-$lang['p_include']             = '더 높은 접근권한은 하위를 포함합니다. 페이지가 아닌 네임스페이스에는 생성, 업로드, 삭제 권한만 적용됩니다.';
-$lang['current']               = '현 ACL 규칙';
-$lang['where']                 = '페이지/네임스페이스';
+$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> 그룹 구성원은 현재 <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 class="aclpage">%s</b> 문서 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
+$lang['p_choose_ns']           = '<b class="aclns">%s</b> 이름공간 접근 권한을 보거나 바꾸려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
+$lang['p_inherited']           = '참고: 권한이 명시적으로 설정되지 않았으므로 다른 그룹이나 상위 이름공간으로부터 가져왔습니다.';
+$lang['p_isadmin']             = '참고: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.';
+$lang['p_include']             = '더 높은 접근 권한은 하위를 포함합니다. 문서가 아닌 이름공간에는 만들기, 올리기, 삭제 권한만 적용됩니다.';
+$lang['current']               = '현재 ACL 규칙';
+$lang['where']                 = '문서/이름공간';
 $lang['who']                   = '사용자/그룹';
 $lang['perm']                  = '접근 권한';
 $lang['acl_perm0']             = '없음';
 $lang['acl_perm1']             = '읽기';
-$lang['acl_perm2']             = '수정';
-$lang['acl_perm4']             = '생성';
-$lang['acl_perm8']             = '업로드';
+$lang['acl_perm2']             = '편집';
+$lang['acl_perm4']             = '만들기';
+$lang['acl_perm8']             = '올리기';
 $lang['acl_perm16']            = '삭제';
 $lang['acl_new']               = '새 항목 추가';
 $lang['acl_mod']               = '선택 항목 변경';
diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index cb0765505..567eb46dc 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -18,6 +18,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
index 1b10b5232..bef2d2615 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -13,6 +13,7 @@
  * @author Grzegorz Widła <dzesdzes@gmail.com>
  * @author Łukasz Chmaj <teachmeter@gmail.com>
  * @author Begina Felicysym <begina.felicysym@wp.eu>
+ * @author Aoi Karasu <aoikarasu@gmail.com>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index 6d63ad024..4d093216b 100644
--- a/lib/plugins/acl/lang/ro/lang.php
+++ b/lib/plugins/acl/lang/ro/lang.php
@@ -9,6 +9,7 @@
  * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
  * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
  * @author Marius OLAR <olarmariusalex@gmail.com>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  * @author Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
diff --git a/lib/plugins/acl/lang/ru/lang.php b/lib/plugins/acl/lang/ru/lang.php
index 6d04dde21..15ba78ef6 100644
--- a/lib/plugins/acl/lang/ru/lang.php
+++ b/lib/plugins/acl/lang/ru/lang.php
@@ -15,6 +15,7 @@
  * @author Aleksandr Selivanov <alexgearbox@gmail.com>
  * @author Ladyko Andrey <fylh@succexy.spb.ru>
  * @author Eugene <windy.wanderer@gmail.com>
+ * @author Johnny Utah <pcpa@cyberpunk.su>
  */
 $lang['admin_acl']             = 'Управление списками контроля доступа';
 $lang['acl_group']             = 'Группа';
diff --git a/lib/plugins/acl/lang/sl/help.txt b/lib/plugins/acl/lang/sl/help.txt
index eada41c29..ff096ae0e 100644
--- a/lib/plugins/acl/lang/sl/help.txt
+++ b/lib/plugins/acl/lang/sl/help.txt
@@ -1,11 +1,11 @@
-=== Hitra pomo� ===
+=== Hitra pomoč ===
 
-Na tej strani je mogo�e dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori.
+Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori.
 
 Na veli strani so izpisani vsi imenski prostori in strani.
 
-Na obrazcu zgoraj je mogo�e pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino.
+Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino.
 
-V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogo�e hitro spreminjati ali brisati.
+V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati.
 
-Ve� podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogo�e najti v [[doku>acl|uradni dokumentaciji ACL]].
+Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]].
diff --git a/lib/plugins/acl/lang/sl/lang.php b/lib/plugins/acl/lang/sl/lang.php
index 3fb391570..44e45e491 100644
--- a/lib/plugins/acl/lang/sl/lang.php
+++ b/lib/plugins/acl/lang/sl/lang.php
@@ -5,7 +5,7 @@
  * @author Dejan Levec <webphp@gmail.com>
  * @author Boštjan Seničar <senicar@gmail.com>
  * @author Gregor Skumavc (grega.skumavc@gmail.com)
-  * @author Matej Urbančič (mateju@svn.gnome.org)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
  */
 $lang['admin_acl']             = 'Upravljanje dostopa';
 $lang['acl_group']             = 'Skupina';
diff --git a/lib/plugins/acl/lang/vi/help.txt b/lib/plugins/acl/lang/vi/help.txt
new file mode 100644
index 000000000..23e258678
--- /dev/null
+++ b/lib/plugins/acl/lang/vi/help.txt
@@ -0,0 +1,12 @@
+=== Trợ giúp nhanh: ===

+

+Trang này giúp bạn thêm hoặc xóa quyền được cấp cho 1 thư mục hoặc trang wiki của bạn.

+

+Của sổ bên trái hiển thị tất cả các thư mục và trang văn bản.

+

+Khung trên đây cho phép bạn xem và sửa quyền của một nhóm hoặc thành viên đã chọn.

+

+Bảng bên dưới hiển thị tất cả các quyền được cấp. Bạn có thể sửa hoặc hóa các quyền đó một cách nhanh chóng.

+

+Đọc [[doku>acl|tài liệu chính thức về ACL]] sẽ giúp bạn hiểu hơn về cách phân quyền ở DokuWiki.

+

diff --git a/lib/plugins/acl/lang/vi/lang.php b/lib/plugins/acl/lang/vi/lang.php
index 6237f79ba..ddf764dca 100644
--- a/lib/plugins/acl/lang/vi/lang.php
+++ b/lib/plugins/acl/lang/vi/lang.php
@@ -3,19 +3,42 @@
  * vietnamese language file
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * @author     James Do <jdo@myrealbox.com>
+ * @author     NukeViet <admin@nukeviet.vn>
  */
 
-$lang['admin_acl']  = 'Quản lý phép truy nhật {Access Control List}';
+$lang['admin_acl']  = 'Quản lý danh sách quyền truy cập';
 $lang['acl_group']  = 'Nhóm';
-$lang['acl_user']   = 'Người';
-$lang['acl_perms']  = 'Phép truy nhập cho';
+$lang['acl_user']   = 'Thành viên';
+$lang['acl_perms']  = 'Cấp phép cho';
 $lang['page']       = 'Trang';
-$lang['namespace']  = 'Không gian tên';
+$lang['namespace']  = 'Thư mục';
 
+$lang['btn_select']  = 'Chọn';
+
+$lang['p_user_id']    = 'Thành viên <b class="acluser">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']    = 'Thành viên <b class="acluser">%s</b>  hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']   = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho trang <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']   = 'Thành viên trong nhóm <b class="aclgroup">%s</b> hiện tại được cấp phép cho thư mục <b class="aclns">%s</b>: <i>%s</i>.';
+
+$lang['p_choose_id']  = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho trang <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']  = 'Hãy <b>nhập tên thành viên hoặc nhóm</b> vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho thư mục <b class="aclns">%s</b>.';
+
+
+$lang['p_inherited']  = 'Ghi chú: Có những quyền không được thể hiện ở đây nhưng nó được cấp phép từ những nhóm hoặc thư mục cấp cao.';
+$lang['p_isadmin']    = 'Ghi chú: Nhóm hoặc thành viên này luôn được cấp đủ quyền vì họ là Quản trị tối cao';
+$lang['p_include']    = 'Một số quyền thấp được thể hiện ở mức cao hơn. Quyền tạo, tải lên và xóa chỉ dành cho thư mục, không dành cho trang.';
+
+$lang['current'] = 'Danh sách quyền truy cập hiện tại';
+$lang['where'] = 'Trang/Thư mục';
+$lang['who']   = 'Thành viên/Nhóm';
+$lang['perm']  = 'Quyền';
+
+$lang['acl_perm0']  = 'Không';
 $lang['acl_perm1']  = 'Đọc';
-$lang['acl_perm2']  = 'Biên soạn';
+$lang['acl_perm2']  = 'Sửa';
 $lang['acl_perm4']  = 'Tạo';
 $lang['acl_perm8']  = 'Tải lên';
+$lang['acl_perm16'] = 'Xóa';
 $lang['acl_new']    = 'Thêm mục mới';
+$lang['acl_mod']    = 'Sửa';
 //Setup VIM: ex: et ts=2 :
diff --git a/lib/plugins/acl/lang/zh-tw/help.txt b/lib/plugins/acl/lang/zh-tw/help.txt
index bc1bddb00..d5d031059 100644
--- a/lib/plugins/acl/lang/zh-tw/help.txt
+++ b/lib/plugins/acl/lang/zh-tw/help.txt
@@ -1,12 +1,11 @@
 === 快速指南: ===
 
-你可以用這個頁面為維基中的命名空間或頁面增加或移除權限。
+你可以用這個頁面為維基中的分類空間或頁面增加或移除權限。
 
-左方面板顯示了所有命名空間和頁面。
+左方面板顯示了所有分類空間和頁面。
 
 上方表格允許你觀看及修改選取的使用者或群組的權限。
 
 下方表格顯示了目前所有的存取控制表 (ACL)，你可以用它快速刪除或更改多項規則。
 
 閱讀 [[doku>acl|official documentation on ACL]] 可以幫助你完整地了解 DokuWiki 存取控制的運作。
-
diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php
index 085537864..ff115df18 100644
--- a/lib/plugins/acl/lang/zh-tw/lang.php
+++ b/lib/plugins/acl/lang/zh-tw/lang.php
@@ -11,25 +11,26 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
 $lang['admin_acl']             = '管理存取控制表 (ACL)';
 $lang['acl_group']             = '群組';
 $lang['acl_user']              = '使用者';
 $lang['acl_perms']             = '設定權限於';
 $lang['page']                  = '頁面';
-$lang['namespace']             = '命名空間';
+$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_user_ns']             = '使用者 <b class=\"acluser\">%s</b> 目前在分類空間 <b class=\"aclns\">%s</b> 擁有以下權限：<i>%s</i>。';
 $lang['p_group_id']            = '群組 <b class="aclgroup">%s</b> 的成員目前在頁面 <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_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']           = '請在上方表格<b>輸入使用者或群組</b>以檢視或編輯命名空間 <b class=\"aclns\">%s</b> 的權限設定。';
-$lang['p_inherited']           = '注意：這些權限並未明確指定，而是從群組或上層的命名空間繼承而來。';
+$lang['p_choose_ns']           = '請在上方表格<b>輸入使用者或群組</b>以檢視或編輯分類空間 <b class=\"aclns\">%s</b> 的權限設定。';
+$lang['p_inherited']           = '注意：這些權限並未明確指定，而是從群組或上層的分類空間繼承而來。';
 $lang['p_isadmin']             = '注意：選取的群組或使用者擁有完整權限，因為它被設定為超級使用者。';
-$lang['p_include']             = '較高的權限亦包含了較低的權限。新增、上傳與刪除權限只能設定在命名空間，不能設定在頁面。';
+$lang['p_include']             = '較高的權限亦包含了較低的權限。新增、上傳與刪除權限只能設定在分類空間，不能設定在頁面。';
 $lang['current']               = '目前的存取控制規則';
-$lang['where']                 = '頁面/命名空間';
+$lang['where']                 = '頁面/分類空間';
 $lang['who']                   = '使用者/群組';
 $lang['perm']                  = '權限';
 $lang['acl_perm0']             = '無';
diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt
index f108a2390..42babd71c 100644
--- a/lib/plugins/acl/plugin.info.txt
+++ b/lib/plugins/acl/plugin.info.txt
@@ -1,6 +1,7 @@
+base   acl
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2011-04-16
+date   2012-09-06
 name   ACL Manager
 desc   Manage Page Access Control Lists
 url    http://dokuwiki.org/plugin:acl
diff --git a/lib/plugins/acl/rtl.css b/lib/plugins/acl/rtl.css
deleted file mode 100644
index e79abe596..000000000
--- a/lib/plugins/acl/rtl.css
+++ /dev/null
@@ -1,40 +0,0 @@
-div#acl_manager div#acl__tree {
-    float: right;
-    text-align: right;
-}
-
-div#acl_manager div#acl__tree li {
-    padding-left: 0em;
-    padding-right: 1em;
-}
-
-div#acl_manager div#acl__tree ul img {
-    margin-left: 0.25em;
-    margin-right: 0em;
-}
-
-
-div#acl_manager div#acl__detail {
-    float: left;
-}
-
-div#acl_manager .aclgroup {
-    background: transparent url(pix/group.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
-div#acl_manager .acluser {
-    background: transparent url(pix/user.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
-div#acl_manager .aclpage {
-    background: transparent url(pix/page.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
-div#acl_manager .aclns {
-    background: transparent url(pix/ns.png) right 1px no-repeat;
-    padding: 1px 18px 1px 0px;
-}
-
diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index b7154aa78..f4277c341 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -8,6 +8,10 @@ div#acl_manager div#acl__tree {
     border: 1px solid __border__;
     text-align: left;
 }
+[dir=rtl] div#acl_manager div#acl__tree {
+    float: right;
+    text-align: right;
+}
 
 div#acl_manager div#acl__tree a.cur {
     background-color: __highlight__;
@@ -24,11 +28,19 @@ div#acl_manager div#acl__tree li {
     padding-left: 1em;
     list-style-image: none;
 }
+[dir=rtl] div#acl_manager div#acl__tree li {
+    padding-left: 0em;
+    padding-right: 1em;
+}
 
 div#acl_manager div#acl__tree ul img {
     margin-right: 0.25em;
     cursor: pointer;
 }
+[dir=rtl] div#acl_manager div#acl__tree ul img {
+    margin-left: 0.25em;
+    margin-right: 0em;
+}
 
 div#acl_manager div#acl__detail {
     width: 73%;
@@ -36,6 +48,9 @@ div#acl_manager div#acl__detail {
     float: right;
     overflow: auto;
 }
+[dir=rtl] div#acl_manager div#acl__detail {
+    float: left;
+}
 
 div#acl_manager div#acl__detail fieldset {
     width: 90%;
@@ -52,25 +67,53 @@ div#acl_manager table.inline {
     margin: 0;
 }
 
+#acl_manager table .check {
+    text-align: center;
+}
+
+#acl_manager table .action {
+    text-align: right;
+}
+
 div#acl_manager .aclgroup {
     background: transparent url(pix/group.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .aclgroup {
+    background: transparent url(pix/group.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
 
 div#acl_manager .acluser {
     background: transparent url(pix/user.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .acluser {
+    background: transparent url(pix/user.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
 
 div#acl_manager .aclpage {
     background: transparent url(pix/page.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .aclpage {
+    background: transparent url(pix/page.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
 
 div#acl_manager .aclns {
     background: transparent url(pix/ns.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
 }
+[dir=rtl] div#acl_manager .aclns {
+    background: transparent url(pix/ns.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
 
 div#acl_manager label.disabled {
   color: __text_neu__!important;