From 1420e73d5e21de82e3e1a7a88bdaac5cd6827c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbyn=C4=9Bk=20K=C5=99ivka?= <zbynek.krivka@seznam.cz>
Date: Sun, 13 Nov 2011 10:02:35 +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 7c1efbd4c..cc1d97023 100644
--- a/lib/plugins/acl/lang/cs/lang.php
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -9,6 +9,7 @@
  * @author Marek Sacha <sachamar@fel.cvut.cz>
  * @author Lefty <lefty@multihost.cz>
  * @author Vojta Beran <xmamut@email.cz>
+ * @author zbynek.krivka@seznam.cz
  */
 $lang['admin_acl']             = 'Správa přístupových práv';
 $lang['acl_group']             = 'Skupina';
-- 
cgit v1.2.3


From 612db7146659fb98db1eff83d71e668e6f2da9fc Mon Sep 17 00:00:00 2001
From: Shuo Ting Jian <shoting@gmail.com>
Date: Sun, 27 Nov 2011 11:19:12 +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 986fa769a..983882eaf 100644
--- a/lib/plugins/acl/lang/zh/lang.php
+++ b/lib/plugins/acl/lang/zh/lang.php
@@ -14,6 +14,7 @@
  * @author Hiphen Lee <jacob.b.leung@gmail.com>
  * @author caii, patent agent in China <zhoucaiqi@gmail.com>
  * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian <shoting@gmail.com>
  */
 $lang['admin_acl']             = '访问控制列表（ACL）管理器';
 $lang['acl_group']             = '组';
-- 
cgit v1.2.3


From ad9bfc2d35566e0815820de21a664c6fb1c3c60a Mon Sep 17 00:00:00 2001
From: Christophe Martin <Schplurtz@laposte.net>
Date: Sun, 27 Nov 2011 11:21:47 +0100
Subject: French language update

---
 lib/plugins/acl/lang/fr/help.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 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 f748f6b23..158ec92ed 100644
--- a/lib/plugins/acl/lang/fr/help.txt
+++ b/lib/plugins/acl/lang/fr/help.txt
@@ -2,8 +2,8 @@
 
 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 ci-dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
 
 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 ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki.
+La lecture de [[doku>fr:acl|la documentation officielle des ACL]] pourra vous permettre de bien comprendre le fonctionnement du contrôle d'accès dans DokuWiki.
-- 
cgit v1.2.3


From a09383eaa9211bb592151c29e7b85f027c05aaec Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 27 Nov 2011 11:43:37 +0100
Subject: avoid PHP notice in ACL ajax backend FS#2384

---
 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 d704fa8c9..71a2eb03a 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -7,7 +7,7 @@
  */
 
 //fix for Opera XMLHttpRequests
-if(!count($_POST) && $HTTP_RAW_POST_DATA){
+if(!count($_POST) && !empty($HTTP_RAW_POST_DATA)){
   parse_str($HTTP_RAW_POST_DATA, $_POST);
 }
 
-- 
cgit v1.2.3


From 9df43a68bac022beef078c9d02df6364edea8596 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 27 Nov 2011 14:46:05 +0100
Subject: use throbber in ACL ajax interface

To avoid problems when an AJAX request takes a bit longer in the ACL
manager, a throbber is shown while loading the info.
---
 lib/plugins/acl/script.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/script.js b/lib/plugins/acl/script.js
index d912a2407..0ba91cdc9 100644
--- a/lib/plugins/acl/script.js
+++ b/lib/plugins/acl/script.js
@@ -60,10 +60,12 @@ var dw_acl = {
      * Load the current permission info and edit form
      */
     loadinfo: function () {
-        jQuery('#acl__info').load(
-            DOKU_BASE + 'lib/plugins/acl/ajax.php',
-            jQuery('#acl__detail form').serialize() + '&ajax=info'
-        );
+        jQuery('#acl__info')
+            .html('<img src="'+DOKU_BASE+'lib/images/throbber.gif" alt="..." />')
+            .load(
+                DOKU_BASE + 'lib/plugins/acl/ajax.php',
+                jQuery('#acl__detail form').serialize() + '&ajax=info'
+            );
         return false;
     },
 
-- 
cgit v1.2.3


From f18f20c04b2a0a93e9744a0b1ce4d39d26332360 Mon Sep 17 00:00:00 2001
From: Egil Hansen <egil@rosetta.no>
Date: Tue, 6 Dec 2011 09:46:39 +0100
Subject: Norwegian language update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/no/help.txt b/lib/plugins/acl/lang/no/help.txt
index f02b6bdbd..c3d3688a9 100644
--- a/lib/plugins/acl/lang/no/help.txt
+++ b/lib/plugins/acl/lang/no/help.txt
@@ -1,4 +1,4 @@
-===Lynhjelp===
+=== Hurtighjelp: ===
 
 På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki.
 
diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php
index 587f9c2fc..09d71937a 100644
--- a/lib/plugins/acl/lang/no/lang.php
+++ b/lib/plugins/acl/lang/no/lang.php
@@ -17,6 +17,7 @@
  * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
  * @author Rune Rasmussen syntaxerror.no@gmail.com
  * @author Jon Bøe <jonmagneboe@hotmail.com>
+ * @author Egil Hansen <egil@rosetta.no>
  */
 $lang['admin_acl']             = 'Administrasjon av lister for adgangskontroll (ACL)';
 $lang['acl_group']             = 'Gruppe';
@@ -34,10 +35,10 @@ $lang['p_choose_ns']           = '<b>Før inn en bruker eller gruppe</b> i skjem
 $lang['p_inherited']           = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.';
 $lang['p_isadmin']             = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.';
 $lang['p_include']             = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for å opprette, laste opp og slette gjelder bare  for navnerom, ikke enkeltsider.';
-$lang['current']               = 'Någjeldende ACL-regler';
+$lang['current']               = 'Gjeldende ACL-regler';
 $lang['where']                 = 'Side/Navnerom';
 $lang['who']                   = 'Bruker/Gruppe';
-$lang['perm']                  = 'Tillatelser';
+$lang['perm']                  = 'Rettigheter';
 $lang['acl_perm0']             = 'Ingen';
 $lang['acl_perm1']             = 'Lese';
 $lang['acl_perm2']             = 'Redigere';
@@ -45,4 +46,4 @@ $lang['acl_perm4']             = 'Opprette';
 $lang['acl_perm8']             = 'Laste opp';
 $lang['acl_perm16']            = 'Slette';
 $lang['acl_new']               = 'Legg til ny oppføring';
-$lang['acl_mod']               = 'Modifiser oppføring';
+$lang['acl_mod']               = 'Endre oppføring';
-- 
cgit v1.2.3


From 77b9cb8455942e8998e88f6977e3486959ed1b1a Mon Sep 17 00:00:00 2001
From: Ricardo Guijt <ricardoguijt@gmail.com>
Date: Thu, 8 Dec 2011 12:23:53 +0100
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 686909644..cb0765505 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -17,6 +17,7 @@
  * @author Marijn Hofstra <hofstra.m@gmail.com>
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
+ * @author Ricardo Guijt <ricardoguijt@gmail.com>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
-- 
cgit v1.2.3


From 965d96926bd3b834e7814174763a94560f8bc2f0 Mon Sep 17 00:00:00 2001
From: Begina Felicysym <begina.felicysym@wp.eu>
Date: Wed, 14 Dec 2011 21:47: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 a72b6af11..1b10b5232 100644
--- a/lib/plugins/acl/lang/pl/lang.php
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -12,6 +12,7 @@
  * @author maros <dobrimaros@yahoo.pl>
  * @author Grzegorz Widła <dzesdzes@gmail.com>
  * @author Łukasz Chmaj <teachmeter@gmail.com>
+ * @author Begina Felicysym <begina.felicysym@wp.eu>
  */
 $lang['admin_acl']             = 'Zarządzanie uprawnieniami';
 $lang['acl_group']             = 'Grupa';
-- 
cgit v1.2.3


From d0674b61febbf2449c8a5fdddff35d4ed55147af Mon Sep 17 00:00:00 2001
From: Jian Wei Tay <marc_t84@hotmail.com>
Date: Thu, 15 Dec 2011 22:09:28 +0100
Subject: Malay language update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ms/lang.php b/lib/plugins/acl/lang/ms/lang.php
new file mode 100644
index 000000000..77ad2a1c1
--- /dev/null
+++ b/lib/plugins/acl/lang/ms/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Malay language file
+ *
+ * @author Markos
+ */
-- 
cgit v1.2.3


From c999630672a7a3ff116388f556e895a2cc6dbc01 Mon Sep 17 00:00:00 2001
From: skimpax <skimpax@gmail.com>
Date: Thu, 22 Dec 2011 20:22:47 +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 86f493b52..a33a52bf0 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -21,6 +21,7 @@
  * @author Samuel Dorsaz samuel.dorsaz@novelion.net
  * @author Johan Guilbaud <guilbaud.johan@gmail.com>
  * @author schplurtz@laposte.net
+ * @author skimpax@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 d5d19f6f45af17260583d7f7a8e753343afbaaad Mon Sep 17 00:00:00 2001
From: "Oscar M. Lage" <r0sk10@gmail.com>
Date: Mon, 9 Jan 2012 19:02:36 +0100
Subject: Galician language update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/gl/lang.php b/lib/plugins/acl/lang/gl/lang.php
index 774bf207a..db57598e6 100644
--- a/lib/plugins/acl/lang/gl/lang.php
+++ b/lib/plugins/acl/lang/gl/lang.php
@@ -3,6 +3,7 @@
  * Galicianlanguage file
  *
  * @author Medúlio <medulio@ciberirmandade.org>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
  */
 $lang['admin_acl']             = 'Xestión da Lista de Control de Acceso (ACL)';
 $lang['acl_group']             = 'Grupo';
-- 
cgit v1.2.3


From c2790ba28b0df3773b54f78e37ac8ce0ada61cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel-Emeric=20Andra=C8=99i?=
 <em.andrasi@mandrivausers.ro>
Date: Wed, 25 Jan 2012 20:03:56 +0100
Subject: Romanian language update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index 0c13d7223..6d63ad024 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 Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
  */
 $lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
 $lang['acl_group']             = 'Grup';
-- 
cgit v1.2.3


From ae6cce187876439c77b53ebd2ae61976274f4a11 Mon Sep 17 00:00:00 2001
From: Matej Urban <matej.urban@gmail.com>
Date: Thu, 2 Feb 2012 20:49:20 +0100
Subject: Slovak language update

---
 lib/plugins/acl/lang/sl/help.txt | 10 +++++-----
 lib/plugins/acl/lang/sl/lang.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/plugins/acl')

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';
-- 
cgit v1.2.3


From c7b28ffda48d3e6e225940a74b00ee5011f45b4b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 4 Feb 2012 13:26:50 +0000
Subject: added div.table around non-editable content as well (FS#1980)

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a6b0624bc..c3461b78b 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -597,6 +597,7 @@ 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>';
@@ -642,6 +643,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '</th>';
         echo '</tr>';
         echo '</table>';
+        echo '</div>';
         echo '</div></form>'.NL;
     }
 
-- 
cgit v1.2.3


From 5c0c6845e9d948437a54eb986c9f339dfc4b2c62 Mon Sep 17 00:00:00 2001
From: PCPA <pcpa@cyberpunk.su>
Date: Mon, 6 Feb 2012 23:39:40 +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 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']             = 'Группа';
-- 
cgit v1.2.3


From b2a1a44c2b1170a6fdbec637fa077c1469631511 Mon Sep 17 00:00:00 2001
From: Marius Olar <olarmariusalex@yahoo.com>
Date: Tue, 7 Feb 2012 19:46:28 +0100
Subject: Romanian language update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index 6d63ad024..c278c918e 100644
--- a/lib/plugins/acl/lang/ro/lang.php
+++ b/lib/plugins/acl/lang/ro/lang.php
@@ -9,7 +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 Emanuel-Emeric Andrași <em.andrasi@mandrivausers.ro>
+ * @author Marius Olar <olarmariusalex@yahoo.com>
  */
 $lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
 $lang['acl_group']             = 'Grup';
-- 
cgit v1.2.3


From a699035c4f7aa040cc4170401b2f9c48966eba5b Mon Sep 17 00:00:00 2001
From: Erial Krale <erial2@gmail.com>
Date: Wed, 15 Feb 2012 23:30:22 +0100
Subject: Korean language update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index 6f4e991cb..6b1e77cf8 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -11,6 +11,7 @@
  * @author Song Younghwan <purluno@gmail.com>
  * @author SONG Younghwan <purluno@gmail.com>
  * @author Seung-Chul Yoo  <dryoo@live.com>
+ * @author erial2@gmail.com
  */
 $lang['admin_acl']             = '접근 제어 목록 관리';
 $lang['acl_group']             = '그룹';
-- 
cgit v1.2.3


From 44dae8a743d9c3d83f22e6f38a1685c8326a3b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bohum=C3=ADr=20Z=C3=A1me=C4=8Dn=C3=ADk?=
 <bohumir.zamecnik@gmail.com>
Date: Sun, 4 Mar 2012 17:49:09 +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 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';
-- 
cgit v1.2.3


From 96946cc94d3ecb3832e2a1ce35c49743e25329e1 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann <deckelmann@gmail.com>
Date: Wed, 21 Mar 2012 11:25:00 +0100
Subject: replaced $HTTP_RAW_POST_DATA with http_get_raw_post_data function

---
 lib/plugins/acl/ajax.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index 71a2eb03a..3a5d89c08 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -6,16 +6,17 @@
  * @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();
 
+//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');
 
-- 
cgit v1.2.3


From ee9b1ae4b3919f79050bb3c4478203d648810645 Mon Sep 17 00:00:00 2001
From: Taisuke Shimamoto <dentostar@gmail.com>
Date: Fri, 23 Mar 2012 11:07:23 +0100
Subject: Japanese language update

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

(limited to 'lib/plugins/acl')

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']             = 'グループ';
-- 
cgit v1.2.3


From 79504989f948613597d5516c9b31ba7e1529a303 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 9 Apr 2012 19:49:03 +0100
Subject: moved plugins' rtl.css to their style.css counterpart (part of
 FS#2185)

---
 lib/plugins/acl/rtl.css   | 40 ----------------------------------------
 lib/plugins/acl/style.css | 31 +++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 40 deletions(-)
 delete mode 100644 lib/plugins/acl/rtl.css

(limited to 'lib/plugins/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..2eee4f41c 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%;
@@ -56,21 +71,37 @@ 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;
+}
 
 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;
+}
 
 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;
+}
 
 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;
+}
 
 div#acl_manager label.disabled {
   color: __text_neu__!important;
-- 
cgit v1.2.3


From 026b314868ee80aca644bf4107f78d8e8052b43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel-Emeric=20Andra=C5=9Fi?=
 <em.andrasi@mandrivausers.ro>
Date: Sun, 15 Apr 2012 12:47:43 +0200
Subject: Romanian language update

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

(limited to 'lib/plugins/acl')

diff --git a/lib/plugins/acl/lang/ro/lang.php b/lib/plugins/acl/lang/ro/lang.php
index c278c918e..4d093216b 100644
--- a/lib/plugins/acl/lang/ro/lang.php
+++ b/lib/plugins/acl/lang/ro/lang.php
@@ -10,6 +10,7 @@
  * @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';
 $lang['acl_group']             = 'Grup';
-- 
cgit v1.2.3