diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 2cbcf48b356cca9813d6cfadc3aeefe4a2b54138..8655bd32d8f4c01fe39f05c416d9573648d4fd75 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -15,6 +15,7 @@ $conf['lang']        = 'en';              //your language
 $conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
 $conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
 $conf['savedir']     = './data';          //where to store all the files
+$conf['allowdebug']  = 1;                 //make debug possible, disable after install! 0|1
 
 /* Display Options */
 
@@ -37,7 +38,6 @@ $conf['deaccent']    = 1;                 //convert accented chars to unaccented
 $conf['useheading']  = 0;                 //use the first heading in a page as its name
 $conf['refcheck']    = 1;                 //check for references before deleting media files
 $conf['refshow']     = 0;                 //how many references should be shown, 5 is a good value
-$conf['allowdebug']  = 1;                 //make debug possible, disable after install! 0|1
 
 /* Antispam Features */
 
diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index 6a8a0dc9eb87bf3871622906800bab7374574f89..8c649f8f12f4f30bf25357f68f69b423c8fa194c 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -123,22 +123,7 @@ $lang['qb_media']   = 'أضف صور و ملفات أخرى';
 $lang['qb_sig']     = 'أضف توقيعك';
 
 $lang['del_confirm']= 'مسح؟';
-
-$lang['admin_acl']  = 'إدارة قوائم التحكم بالدخول...';
-$lang['admin_register']= 'أضف مستخدم جديد...';
-
-$lang['acl_group']  = 'مجموعة';
-$lang['acl_user']   = 'مستخدم';
-$lang['acl_perms']  = 'ترخيص لـ';
-$lang['page']       = 'صفحة';
-$lang['namespace']  = 'فضاء التسمية';
-
-$lang['acl_perm1']  = 'قراءة';
-$lang['acl_perm2']  = 'تحرير';
-$lang['acl_perm4']  = 'إنشاء';
-$lang['acl_perm8']  = 'تحميل';
-$lang['acl_perm16'] = 'مسح';
-$lang['acl_new']    = 'أضف أضافة جديدة';
+$lang['admin_register']= 'أضف مستخدم جديد';
 
 $lang['spell_start'] = 'تدقيق إملائى';
 $lang['spell_stop']  = 'أكمل التحرير';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index dfc57d55d8888de55c774daac055e591ce2295f2..a835d82950b05a759c4bd718a4065cf60fbff059 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -120,22 +120,7 @@ $lang['qb_media']   = 'Afegeix imatges o altres fitxers';
 $lang['qb_sig']     = 'Insereix signatura';
 
 $lang['del_confirm']= 'Suprimiu aquesta entrada?';
-
-$lang['admin_acl']  = 'Gestió de la Llista de Control d\'Accés...';
-$lang['admin_register']= 'Afegeix nou usuari...';
-
-$lang['acl_group']  = 'Grup';
-$lang['acl_user']   = 'Usuari';
-$lang['acl_perms']  = 'Permisos per a';
-$lang['page']       = 'Pàgina';
-$lang['namespace']  = 'Espai';
-
-$lang['acl_perm1']  = 'Llegir';
-$lang['acl_perm2']  = 'Editar';
-$lang['acl_perm4']  = 'Crear';
-$lang['acl_perm8']  = 'Penjar fitxers';
-$lang['acl_perm16'] = 'Suprimir';
-$lang['acl_new']    = 'Afegeix nova entrada';
+$lang['admin_register']= 'Afegeix nou usuari';
 
 $lang['spell_start'] = 'Revisa l\'ortografia';
 $lang['spell_stop']  = 'Torna a edició';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index b324aa95a6d0db487b2978f7e2be54946706e05a..b77ec5e829e88c1d4477a1f3af34c11044644d3a 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -123,22 +123,7 @@ $lang['qb_media']   = 'Vložit obrázky nebo jiné soubory';
 $lang['qb_sig']     = 'Vložit podpis';
 
 $lang['del_confirm']= 'Vymazat tuto položku?';
-
-$lang['admin_acl']  = 'Správa přístupových práv...';
-$lang['admin_register']= 'Přidat nového uživatele...';
-
-$lang['acl_group']  = 'Skupina';
-$lang['acl_user']   = 'Uživatel';
-$lang['acl_perms']  = 'Práva pro';
-$lang['page']       = 'Stránka';
-$lang['namespace']  = 'Jmenný prostor';
-
-$lang['acl_perm1']  = 'Čtení';
-$lang['acl_perm2']  = 'Úpravy';
-$lang['acl_perm4']  = 'Vytvoření';
-$lang['acl_perm8']  = 'Upload';
-$lang['acl_perm16'] = 'Mazání';
-$lang['acl_new']    = 'Přidat novou položku';
+$lang['admin_register']= 'Přidat nového uživatele';
 
 $lang['spell_start'] = 'Zkontrolovat pravopis';
 $lang['spell_stop']  = 'Pokračovat v úpravách';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 3538b7f7eb5b08ca2718dfe372284069a94ae34b..050bae54541702c989d1ee19b092fffbe10276de 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -124,22 +124,7 @@ $lang['qb_media']   = 'Tilføj billeder eller andre filer';
 $lang['qb_sig']     = 'Insæt signatur';
 
 $lang['del_confirm']= 'Slet denne post?';
-
-$lang['admin_acl']  = 'Rettigheds Administration...';
-$lang['admin_register']= 'Tilføj ny bruger...';
-
-$lang['acl_group']  = 'Gruppe';
-$lang['acl_user']   = 'Bruger';
-$lang['acl_perms']  = 'Rettigheder for';
-$lang['page']       = 'Dokument';
-$lang['namespace']  = 'Navnerum';
-
-$lang['acl_perm1']  = 'Læs';
-$lang['acl_perm2']  = 'Skriv';
-$lang['acl_perm4']  = 'Opret';
-$lang['acl_perm8']  = 'Upload';
-$lang['acl_perm16'] = 'Slet';
-$lang['acl_new']    = 'Tilføj ny post';
+$lang['admin_register']= 'Tilføj ny bruger';
 
 $lang['spell_start']= 'Stavekontrol';
 $lang['spell_stop'] = 'Forsæt redigering';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index a3b43e3506808c49ea23cc25811b38d66d3bad2c..78a3492195f9ded8ad174660ac31d0a9fcc020a9 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -147,23 +147,8 @@ $lang['qb_smileys'] = 'Smileys';
 $lang['qb_chars']   = 'Sonderzeichen';
 
 $lang['del_confirm']= 'Eintrag wirklich löschen?';
-
-$lang['admin_acl']  = 'Zugangsverwaltung';
 $lang['admin_register']= 'Neuen Benutzer anmelden';
 
-$lang['acl_group']  = 'Gruppe';
-$lang['acl_user']   = 'Benutzer';
-$lang['acl_perms']  = 'Berechtigungen für';
-$lang['page']       = 'Seite';
-$lang['namespace']  = 'Namensraum';
-
-$lang['acl_perm1']  = 'Lesen';
-$lang['acl_perm2']  = 'Bearbeiten';
-$lang['acl_perm4']  = 'Anlegen';
-$lang['acl_perm8']  = 'Hochladen';
-$lang['acl_perm16'] = 'Entfernen';
-$lang['acl_new']    = 'Eintrag hinzufügen';
-
 $lang['spell_start'] = 'Rechtschreibung prüfen';
 $lang['spell_stop']  = 'Bearbeiten fortsetzen';
 $lang['spell_wait']  = 'Bitte warten...';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index f83ce12290b7b48595ffe9cba51f640dec32dda2..45591e55ca13d72e649a8d36c248f1ded3ff96ea 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -145,23 +145,8 @@ $lang['qb_smileys'] = 'Smileys';
 $lang['qb_chars']   = 'Special Chars';
 
 $lang['del_confirm']= 'Really delete selected item(s)?';
-
-$lang['admin_acl']  = 'Access Control List Management';
 $lang['admin_register']= 'Add new user';
 
-$lang['acl_group']  = 'Group';
-$lang['acl_user']   = 'User';
-$lang['acl_perms']  = 'Permissions for';
-$lang['page']       = 'Page';
-$lang['namespace']  = 'Namespace';
-
-$lang['acl_perm1']  = 'Read';
-$lang['acl_perm2']  = 'Edit';
-$lang['acl_perm4']  = 'Create';
-$lang['acl_perm8']  = 'Upload';
-$lang['acl_perm16'] = 'Delete';
-$lang['acl_new']    = 'Add new Entry';
-
 $lang['spell_start'] = 'Check Spelling';
 $lang['spell_stop']  = 'Resume Editing';
 $lang['spell_wait']  = 'Please wait...';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index 34e95cd06c17c7946f2f8a0b93deb5770e379656..9e6779f003ae33fdd3ed655eb1d92ede7fd0ab70 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -103,7 +103,7 @@ $lang['qb_ol']      = 'Item de Lista Ordenada';
 $lang['qb_ul']      = 'Item de Lista Desordenada';
 $lang['qb_media']   = 'Añadir Imágenes u otros ficheros';
 
-$lang['admin_acl']  = 'Mantenimiento del contol de accesos...';
+$lang['admin_acl']  = 'Mantenimiento del contol de accesos';
 $lang['admin_register']= 'Añadir nuevo usuario...';
 
 $lang['acl_group']  = 'Grupo';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 68e5a13b66e9bc7bfac12060b237d8b8a393767c..f4074a68814fe4277bb43f59ba92fe10a8ba3dc5 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -106,20 +106,8 @@ $lang['qb_ul']      = 'Mummuga nimekiri';
 $lang['qb_media']   = 'Lisa pilte ja muid faile';
 $lang['qb_sig']     = 'Lisa allkiri!';
 
-$lang['acl_group']  = 'Grupp';
-$lang['acl_user']   = 'Kasutaja';
-$lang['acl_perms']  = 'Lubatud';
-$lang['page']       = 'leht';
-$lang['namespace']  = 'alajaotus';
-
-$lang['acl_perm1']  = 'Lugemine';
-$lang['acl_perm2']  = 'Toimetamine';
-$lang['acl_perm4']  = 'Tekitamine';
-$lang['acl_perm8']  = 'Ãœles laadimine';
-$lang['acl_new']    = 'Uue kirje lisamine';
 
 $lang['del_confirm']= 'Kas kustutame selle kirje?';
 
-$lang['admin_acl']  = 'Ligipääsukontrolli nimekirja haldamine...';
 
 //Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 207638eafa74bc055f968f74647ab079b81d4c78..f53db8daca27faac29e333f294ac9bee82a38769 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -131,22 +131,7 @@ $lang['qb_media']   = 'Ajouter des images et autres fichiers';
 $lang['qb_sig']     = 'Insérer une signature';
 
 $lang['del_confirm']= 'Effacer cette entrée?';
-
-$lang['admin_acl']  = 'Gestion de la liste des contrôles d\'accès';
-$lang['admin_register']= 'Ajouter un nouvel utilisateur...';
-
-$lang['acl_group']  = 'Groupe';
-$lang['acl_user']   = 'Utilisateur';
-$lang['acl_perms']  = 'Permission pour';
-$lang['page']       = 'Page';
-$lang['namespace']  = 'Catégorie';
-
-$lang['acl_perm1']  = 'Lecture';
-$lang['acl_perm2']  = 'Écriture';
-$lang['acl_perm4']  = 'Création';
-$lang['acl_perm8']  = 'Télécharger';
-$lang['acl_perm16'] = 'Effacer';
-$lang['acl_new']    = 'Ajouter une nouvelle entrée';
+$lang['admin_register']= 'Ajouter un nouvel utilisateur';
 
 $lang['spell_start'] = 'Vérifier l\'orthographe';
 $lang['spell_stop']  = 'Reprendre l\'édition';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index ffcdacbd96502a8325538d4aa100c2fe0ddf1aec..eda3ef1ec2f4fa39c65879e28cf0bbda2a0f0628 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -4,7 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Giorgio Vecchiocattivi <giorgio@vecchio.it>
- * @mod by     Roberto Bolli <http://www.rbnet.it/>
+ * @author     Roberto Bolli <http://www.rbnet.it/>
  */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
@@ -124,22 +124,7 @@ $lang['qb_media']   = 'Inserisci immagino o altri file';
 $lang['qb_sig']     = 'Inserisci la firma';
 
 $lang['del_confirm']= 'Cancellare questa voce?';
-
-$lang['admin_acl']  = 'Gestione Access Control List...';
-$lang['admin_register']= 'Aggiungi un nuovo utente...';
-
-$lang['acl_group']  = 'Gruppo';
-$lang['acl_user']   = 'Utente';
-$lang['acl_perms']  = 'Permessi per';
-$lang['page']       = 'Pagina';
-$lang['namespace']  = 'Categoria';
-
-$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['admin_register']= 'Aggiungi un nuovo utente';
 
 $lang['spell_start'] = 'Dizionario';
 $lang['spell_stop']  = 'Resume Editing';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index 6aef6ab2b8deb0bc7e39e544dfa82014ecadc8e6..afcbe189fe830117545a5200c54ba97deadf4ca0 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -123,22 +123,7 @@ $lang['qb_media']   = 'イメージやファイルの追加';
 $lang['qb_sig']     = '署名の挿入';
 
 $lang['del_confirm']= 'エントリを削除しますか？';
-
-$lang['admin_acl']  = 'アクセスコントロール管理...';
-$lang['admin_register']= '新規ユーザー登録...';
-
-$lang['acl_group']  = 'グループ';
-$lang['acl_user']   = 'ユーザー';
-$lang['acl_perms']  = '権限を追加';
-$lang['page']       = '文書';
-$lang['namespace']  = '名前空間';
-
-$lang['acl_perm1']  = '読取';
-$lang['acl_perm2']  = '編集';
-$lang['acl_perm4']  = '作成';
-$lang['acl_perm8']  = 'アップロード';
-$lang['acl_perm16'] = '削除';
-$lang['acl_new']    = '新規エントリ';
+$lang['admin_register']= '新規ユーザー登録';
 
 $lang['spell_start'] = 'スペルチェック';
 $lang['spell_stop']  = '再開';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index dda55bf366754b8bf1c808cd3033d23a777912b5..785f7765ad75dffafc517074e772fcba635b1560 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -123,22 +123,7 @@ $lang['qb_media']   = 'PaveikslÄ—liai ir kitos bylos';
 $lang['qb_sig']     = 'Įterpti parašą';
 
 $lang['del_confirm']= 'Ištrinti šį įrašą?';
-
-$lang['admin_acl']  = 'Priėjimo Kontrolės Sąrašų valdymas...';
-$lang['admin_register']= 'Sukurti naujÄ… vartotojÄ…...';
-
-$lang['acl_group']  = 'GrupÄ—';
-$lang['acl_user']   = 'Vartotojas';
-$lang['acl_perms']  = 'Leidimai';
-$lang['page']       = 'Puslapis';
-$lang['namespace']  = 'Pavadinimas';
-
-$lang['acl_perm1']  = 'Skaityti';
-$lang['acl_perm2']  = 'Redaguoti';
-$lang['acl_perm4']  = 'Sukurti';
-$lang['acl_perm8']  = 'Atsiųsti';
-$lang['acl_perm16'] = 'IÅ¡trinti';
-$lang['acl_new']    = 'Pridėti naują įrašą';
+$lang['admin_register']= 'Sukurti naujÄ… vartotojÄ…';
 
 $lang['spell_start'] = 'Patikrinti rašybą';
 $lang['spell_stop']  = 'Tęsti redagavimą';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index ce0f117004b4bae5e3fbdc6ca6f30db0605d2767..4d2a2e7196aacca1e15589b584e5e81b923d94eb 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -4,7 +4,7 @@
  *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Aivars Miška <allefm@gmail.com>
-*/
+ */
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
 
@@ -103,18 +103,4 @@ $lang['qb_sig']     = 'Ievietot parakstu';
 
 $lang['del_confirm']= 'Dzēst šo šķirkli?';
 
-$lang['admin_acl']  = 'Piekļuves tiesību vadība...';
-
-$lang['acl_group']  = 'Grupa';
-$lang['acl_user']   = 'Lietotājs';
-$lang['acl_perms']  = 'Tiesības';
-$lang['page']       = 'Lapa';
-$lang['namespace']  = 'Nodaļa';
-
-$lang['acl_perm1']  = 'Lasīt';
-$lang['acl_perm2']  = 'Labot';
-$lang['acl_perm4']  = 'Izveidot';
-$lang['acl_perm8']  = 'augšupielādēt';
-$lang['acl_new']    = 'Pievienot jaunu';
-
 //Setup VIM: ex: et ts=2 enc=utf-8 :
\ No newline at end of file
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index cc1b16603b1f7962e5b7b7e0d94563a499f15298..223d9a1e793c828bfa8e0f8a79533225702c4f9c 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -126,23 +126,8 @@ $lang['qb_media']   = 'Voeg plaatjes en andere bestanden toe';
 $lang['qb_sig']     = 'Handtekening invoegen';
 
 $lang['del_confirm']= 'Dit item verwijderen?';
+$lang['admin_register']= 'Nieuwe gebruiker toevoegen';
  
-$lang['admin_acl']  = 'Toegangsrechten...';
-$lang['admin_register']= 'Nieuwe gebruiker toevoegen...';
- 
-$lang['acl_group']  = 'Groep';
-$lang['acl_user']   = 'Gebruiker';
-$lang['acl_perms']  = 'Permissies voor';
-$lang['page']       = 'Pagina';
-$lang['namespace']  = 'Namespace';
- 
-$lang['acl_perm1']  = 'Lezen';
-$lang['acl_perm2']  = 'Bewerken';
-$lang['acl_perm4']  = 'Aanmaken';
-$lang['acl_perm8']  = 'Upload';
-$lang['acl_perm16'] = 'Verwijder';
-$lang['acl_new']    = 'Nieuwe regel toevoegen';
-
 $lang['spell_start'] = 'Controleer spelling';
 $lang['spell_stop']  = 'Doorgaan met aanpassen';
 $lang['spell_wait']  = 'Even wachten a.u.b...';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index 3a955f566741d07c95fbf9059662d792a1f2359a..6bcf65402b87f189b9579a838cd14a0629ad826a 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -124,23 +124,8 @@ $lang['qb_media']   = 'Legg til bilder og andre filer';
 $lang['qb_sig']     = 'Føy til signatur';
  
 $lang['del_confirm']= 'Slett denne oppføringen?';
- 
-$lang['admin_acl']  = 'Administrasjon av Access Control List...';
-$lang['admin_register']= 'Legg til ny bruker...';
- 
-$lang['acl_group']  = 'Gruppe';
-$lang['acl_user']   = 'Bruker';
-$lang['acl_perms']  = 'Rettigheter for';
-$lang['page']       = 'Side';
-$lang['namespace']  = 'Wikinavn';
- 
-$lang['acl_perm1']  = 'Lese';
-$lang['acl_perm2']  = 'Redigere';
-$lang['acl_perm4']  = 'Lage';
-$lang['acl_perm8']  = 'Laste opp';
-$lang['acl_perm16'] = 'Slette';
-$lang['acl_new']    = 'Legg til ny oppføring';
- 
+$lang['admin_register']= 'Legg til ny bruker';
+
 $lang['spell_start'] = 'Sjekk stavelse';
 $lang['spell_stop']  = 'Tilbake til redigering';
 $lang['spell_wait']  = 'Vennligst vent...';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index 9c434ead0759a54521fc74fb3d78c172ad944f23..e0937477cda7a93c3e1e0025ad92dc675c4a8bd0 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -5,8 +5,6 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Grzegorz Żur <grzegorz.zur@gmail.com>
  */
-
-
 $lang['encoding']   = 'utf-8';
 $lang['direction']  = 'ltr';
 
@@ -145,23 +143,8 @@ $lang['qb_smileys'] = 'Emotikony';
 $lang['qb_chars']   = 'Znaki specjalne';
 
 $lang['del_confirm']= 'Czy napewno usunąć?';
-
-$lang['admin_acl']  = 'ZarzÄ…dzanie uprawnieniami';
 $lang['admin_register']= 'Dodawanie użytkownika';
 
-$lang['acl_group']  = 'Grupa';
-$lang['acl_user']   = 'Użytkownik';
-$lang['acl_perms']  = 'Uprawnienia użytkownika';
-$lang['page']       = 'Strona';
-$lang['namespace']  = 'Katalog';
-
-$lang['acl_perm1']  = 'Czytanie';
-$lang['acl_perm2']  = 'Zmiana';
-$lang['acl_perm4']  = 'Tworzenie';
-$lang['acl_perm8']  = 'Przesyłanie plików';
-$lang['acl_perm16'] = 'Usuwanie';
-$lang['acl_new']    = 'Dodaj nowy wpis';
-
 $lang['spell_start'] = 'Sprawdź pisownię';
 $lang['spell_stop']  = 'Zakończ sprawdzanie';
 $lang['spell_wait']  = 'Proszę czekać...';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index 04c6ea9b9cdc6f0f88c8aaa8dc80ce4fc9de6cf1..b1b2b42881d91b4934da14967f5a4b1623332954 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -112,22 +112,7 @@ $lang['qb_media']     = 'Incluir imagens e/ou outros arquivos';
 $lang['qb_sig']       = 'Inserir Assinatura';
 
 $lang['del_confirm']= 'Deletar esta entrada?';
-
-$lang['admin_acl']  = 'Administrar a Lista de Controles de Acesso...';
-$lang['admin_register']= 'Adicionar novo usuário...';
-
-$lang['acl_group']  = 'Grupo';
-$lang['acl_user']   = 'Usuário';
-$lang['acl_perms']  = 'Permissões para';
-$lang['page']       = 'Página';
-$lang['namespace']  = 'Prefixo';
-
-$lang['acl_perm1']  = 'Ler';
-$lang['acl_perm2']  = 'Editar';
-$lang['acl_perm4']  = 'Criar';
-$lang['acl_perm8']  = 'Upload';
-$lang['acl_perm16'] = 'Deletar';
-$lang['acl_new']    = 'Adicionar nova entrada';
+$lang['admin_register']= 'Adicionar novo usuário';
 
 $lang['spell_start'] = 'Verificar erros de digitação';
 $lang['spell_stop']  = 'Continuar editando';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 7df5f5be4f65962f44aca8a9aa63a62d83684742..81990073a3e1ac472de12073ffb922630de5f473 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -119,22 +119,7 @@ $lang['qb_media']     = 'Incluir imagens e outros ficheiros';
 $lang['qb_sig']       = 'Inserir Assinatura';
 
 $lang['del_confirm']  = 'Remover esta entrada?';
-
-$lang['admin_acl']      = 'Gestão de ACLs...';
-$lang['admin_register'] = 'Inscrever Novo Utilizador...';
-
-$lang['acl_group']    = 'Grupo';
-$lang['acl_user']     = 'Utilizador';
-$lang['acl_perms']    = 'Permissão para';
-$lang['page']         = 'Documento';
-$lang['namespace']    = 'Namespace';
-
-$lang['acl_perm1']    = 'Ler';
-$lang['acl_perm2']    = 'Editar';
-$lang['acl_perm4']    = 'Criar';
-$lang['acl_perm8']    = 'Carregar';
-$lang['acl_perm16']   = 'Remover';
-$lang['acl_new']      = 'Adicionar nova entrada';
+$lang['admin_register'] = 'Inscrever Novo Utilizador';
 
 $lang['spell_start']  = 'Verificar Ortografia';
 $lang['spell_stop']   = 'Retomar a Edição';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index 908088e91cb663a209c4f3691d5ed9a328ab70af..72ed1a02b90473ec6bd8d4b053ef9cecabfbb0a5 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -144,22 +144,7 @@ $lang['qb_smileys'] = 'Smajlíky';
 $lang['qb_chars']   = 'Špeciálne znaky';
 
 $lang['del_confirm']= 'Zmazať túto položku?';
-
-$lang['admin_acl']  = 'Správa zoznamu prístupových práv...';
-$lang['admin_register']= 'Pridaj nového užívateľa...';
-
-$lang['acl_group']  = 'Skupina';
-$lang['acl_user']   = 'Užívateľ';
-$lang['acl_perms']  = 'Práva pre';
-$lang['page']       = 'Stránka';
-$lang['namespace']  = 'Menný priestor';
-
-$lang['acl_perm1']  = 'Čítať';
-$lang['acl_perm2']  = 'Zmeniť';
-$lang['acl_perm4']  = 'Vytvoriť';
-$lang['acl_perm8']  = 'Nahrať súbor';
-$lang['acl_perm16'] = 'Zmazať';
-$lang['acl_new']    = 'Pridať novú položku';
+$lang['admin_register']= 'Pridaj nového užívateľa';
 
 $lang['spell_start'] = 'Skontrolovať pravopis';
 $lang['spell_stop']  = 'Úprava výsledku';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index bc05f3744daaaec2c0538929c48ca9539b38661a..c3bd650b43d780185bcdd88f181a70c70b6458a2 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -123,23 +123,8 @@ $lang['qb_media']   = 'Resim ve baÅŸka dosyalar ekle';
 $lang['qb_sig']     = 'Ä°mza Ekle';
 
 $lang['del_confirm']= 'Bu giriÅŸi sil?';
-
-$lang['admin_acl']  = 'Erişim kontrol listesi yönetimi';
 $lang['admin_register']= 'Yeni kullanıcı ekle...';
 
-$lang['acl_group']  = 'Grup';
-$lang['acl_user']   = 'Kullanıcı';
-$lang['acl_perms']  = 'Şunun için yetkiler:';
-$lang['page']       = 'Sayfa';
-$lang['namespace']  = 'İsim aralığı';
-
-$lang['acl_perm1']  = 'Okuma';
-$lang['acl_perm2']  = 'DeÄŸiÅŸtirme';
-$lang['acl_perm4']  = 'OluÅŸturma';
-$lang['acl_perm8']  = 'Yükleme';
-$lang['acl_perm16'] = 'Silme';
-$lang['acl_new']    = 'Yeni giriÅŸ ekle';
-
 $lang['spell_start'] = 'Hecelemeyi kontrol et';
 $lang['spell_stop']  = 'DeÄŸiÅŸtirmeye Devam et';
 $lang['spell_wait']  = 'Lütfen bekleyiniz...';
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index a0c86c6086180290c6f5c85e971364094a6029e7..88a68269136058f2131b1d4ce040c963afc0e379 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -24,7 +24,7 @@ $lang['btn_index']  = 'Mục lục';
 $lang['btn_secedit']= 'Biên soạn';
 $lang['btn_login']  = 'Đăng nhập';
 $lang['btn_logout'] = 'Thoát';
-$lang['btn_admin'] = 'Quản lý';
+$lang['btn_admin']  = 'Quản lý';
 $lang['btn_update'] = 'Cập nhật';
 $lang['btn_delete'] = 'Xoá';
 
@@ -103,18 +103,5 @@ $lang['qb_sig']     = 'Đặt chữ ký';
 
 $lang['del_confirm']= 'Xoá mục này?';
 
-$lang['admin_acl']  = 'Quản lý phép truy nhật {Access Control List}...';
-
-$lang['acl_group']  = 'Nhóm';
-$lang['acl_user']   = 'Người';
-$lang['acl_perms']  = 'Phép truy nhập cho';
-$lang['page']       = 'Trang';
-$lang['namespace']  = 'Không gian tên';
-
-$lang['acl_perm1']  = 'Đọc';
-$lang['acl_perm2']  = 'Biên soạn';
-$lang['acl_perm4']  = 'Tạo';
-$lang['acl_perm8']  = 'Tải lên';
-$lang['acl_new']    = 'Thêm mục mới';
 
 //Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 82a91f7e0ae2423920696fad78a179b9818871ba..5236ea00f9f19461374334abd68391805d505e20 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -122,22 +122,7 @@ $lang['qb_media']   = '加入圖片或檔案';
 $lang['qb_sig']     = '插入簽名';
 
 $lang['del_confirm']= '確定要刪除該管理規則?';
-
-$lang['admin_acl']  = '設定權限控制清單(ACL)...';
-$lang['admin_register']= '新增使用者中...';
-
-$lang['acl_group']  = '群組';
-$lang['acl_user']   = '帳號';
-$lang['acl_perms']  = '設定權限於';
-$lang['page']       = 'Page';
-$lang['namespace']  = 'Namespace';
-
-$lang['acl_perm1']  = '讀取權限';
-$lang['acl_perm2']  = '編輯頁面';
-$lang['acl_perm4']  = '新增頁面';
-$lang['acl_perm8']  = '上傳圖檔';
-$lang['acl_perm16'] = '刪除檔案';
-$lang['acl_new']    = '新增管理規則';
+$lang['admin_register']= '新增使用者中';
 
 $lang['spell_start'] = '檢查拼字中';
 $lang['spell_stop']  = '恢復編輯';
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 01a44b3e3478e516f0c4dd33d94bbf8356eaa5d4..5dc62edabe3a4dda3f91cb4bd9a27623743358f0 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -14,6 +14,13 @@ require_once(DOKU_PLUGIN.'admin.php');
  * need to inherit from this class
  */
 class admin_plugin_acl extends DokuWiki_Admin_Plugin {
+
+
+		function admin_plugin_acl(){
+			$this->setupLocale();
+		}
+
+
  
     /**
      * return some info
@@ -33,8 +40,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      * return prompt for admin menu
      */
     function getMenuText($language) {
-        global $lang;
-        return $lang['admin_acl'];
+        return $this->lang['admin_acl'];
     }
  
     /**
@@ -99,7 +105,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
     function html() {
       global $ID;
     
-      print p_locale_xhtml('admin_acl');
+      print $this->locale_xhtml('intro');
     
       ptln('<div class="acladmin">');
       ptln('<table class="inline">');
@@ -228,7 +234,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      * @author  Andreas Gohr <andi@splitbrain.org>
      */
     function admin_acl_html_dropdown($id){
-      global $lang;
       $cur = $id;
       $ret = '';
       $opt = array();
@@ -236,15 +241,15 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
       //prepare all options
     
       // current page
-      $opt[] = array('key'=> $id, 'val'=> $id.' ('.$lang['page'].')');
+      $opt[] = array('key'=> $id, 'val'=> $id.' ('.$this->lang['page'].')');
     
       // additional namespaces
       while(($id=getNS($id)) !== false){
-        $opt[] = array('key'=> $id.':*', 'val'=> $id.':* ('.$lang['namespace'].')');
+        $opt[] = array('key'=> $id.':*', 'val'=> $id.':* ('.$this->lang['namespace'].')');
       }
     
       // the top namespace
-      $opt[] = array('key'=> '*', 'val'=> '* ('.$lang['namespace'].')');
+      $opt[] = array('key'=> '*', 'val'=> '* ('.$this->lang['namespace'].')');
     
       // set sel on second entry (current namespace)
       $opt[1]['sel'] = ' selected="selected"';
@@ -255,7 +260,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
       // create HTML
       $att = array( 'name'  => 'acl_scope',
                     'class' => 'edit',
-                    'title' => $lang['page'].'/'.$lang['namespace']);
+                    'title' => $this->lang['page'].'/'.$this->lang['namespace']);
       $ret .= '<select '.html_attbuild($att).'>';
       foreach($opt as $o){
         $ret .= '<option value="'.$o['key'].'"'.$o['sel'].'>'.$o['val'].'</option>';
@@ -272,12 +277,12 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
      * @author  Andreas Gohr <andi@splitbrain.org>
      */
     function admin_acl_html_new(){
-      global $lang;
       global $ID;
+			global $lang;
     
       // table headers
       ptln('<tr>',2);
-      ptln('  <th class="leftalign" colspan="3">'.$lang['acl_new'].'</th>',2);
+      ptln('  <th class="leftalign" colspan="3">'.$this->lang['acl_new'].'</th>',2);
       ptln('</tr>',2);
     
       ptln('<tr>',2);
@@ -290,21 +295,21 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
       ptln('    <input type="hidden" name="acl_cmd" value="save" />',4);
      
       //scope select
-      ptln($lang['acl_perms'],4);
+      ptln($this->lang['acl_perms'],4);
       ptln($this->admin_acl_html_dropdown($ID),4); 
     
       $att = array( 'name'  => 'acl_type',
                     'class' => 'edit',
-                    'title' => $lang['acl_user'].'/'.$lang['acl_group']);
+                    'title' => $this->lang['acl_user'].'/'.$this->lang['acl_group']);
       ptln('    <select '.html_attbuild($att).'>',4);
-      ptln('      <option value="@">'.$lang['acl_group'].'</option>',4);
-      ptln('      <option value="">'.$lang['acl_user'].'</option>',4);
+      ptln('      <option value="@">'.$this->lang['acl_group'].'</option>',4);
+      ptln('      <option value="">'.$this->lang['acl_user'].'</option>',4);
       ptln('    </select>',4);
     
       $att = array( 'name'  => 'acl_user',
                     'type'  => 'text',
                     'class' => 'edit',
-                    'title' => $lang['acl_user'].'/'.$lang['acl_group']);
+                    'title' => $this->lang['acl_user'].'/'.$this->lang['acl_group']);
       ptln('    <input '.html_attbuild($att).' />',4);
       ptln('    <br />');
     
@@ -336,11 +341,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
       // table headers
       ptln('  <tr>');
       ptln('    <th class="leftalign" colspan="3">');
-      ptln($lang['acl_perms'],6);
+      ptln($this->lang['acl_perms'],6);
       if($ispage){
-        ptln($lang['page'],6);
+        ptln($this->lang['page'],6);
       }else{
-        ptln($lang['namespace'],6);
+        ptln($this->lang['namespace'],6);
       }
       ptln('<em>'.$id.'</em>',6);
       ptln('    </th>');
@@ -351,11 +356,11 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
       foreach ($permissions as $conf){
         //userfriendly group/user display
         if(substr($conf['name'],0,1)=="@"){
-          $group = $lang['acl_group'];
+          $group = $this->lang['acl_group'];
           $name  = substr($conf['name'],1);
           $type  = '@';
         }else{
-          $group = $lang['acl_user'];
+          $group = $this->lang['acl_user'];
           $name  = $conf['name'];
           $type  = '';
         }
@@ -426,12 +431,12 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         if($ispage && $perm > AUTH_EDIT) $atts['disabled'] = 'disabled';
     
         //build code
-        $ret .= '<label for="pbox'.$label.'" title="'.$lang['acl_perm'.$perm].'">';
+        $ret .= '<label for="pbox'.$label.'" title="'.$this->lang['acl_perm'.$perm].'">';
         $ret .= '<input '.html_attbuild($atts).' />';
-        $ret .= $lang['acl_perm'.$perm];
+        $ret .= $this->lang['acl_perm'.$perm];
         $ret .= "</label>\n";
       }
       return $ret;
     }
     
-}
\ No newline at end of file
+}
diff --git a/inc/lang/ar/admin_acl.txt b/lib/plugins/acl/lang/ar/intro.txt
similarity index 100%
rename from inc/lang/ar/admin_acl.txt
rename to lib/plugins/acl/lang/ar/intro.txt
diff --git a/lib/plugins/acl/lang/ar/lang.php b/lib/plugins/acl/lang/ar/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..63f4a2e33e0069962e47c401d9cc5e0c45c30546
--- /dev/null
+++ b/lib/plugins/acl/lang/ar/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Arabic language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Mostafa Hussein <mostafa@gmail.com>
+ */
+
+$lang['admin_acl']  = 'إدارة قوائم التحكم بالدخول';
+$lang['acl_group']  = 'مجموعة';
+$lang['acl_user']   = 'مستخدم';
+$lang['acl_perms']  = 'ترخيص لـ';
+$lang['page']       = 'صفحة';
+$lang['namespace']  = 'فضاء التسمية';
+
+$lang['acl_perm1']  = 'قراءة';
+$lang['acl_perm2']  = 'تحرير';
+$lang['acl_perm4']  = 'إنشاء';
+$lang['acl_perm8']  = 'تحميل';
+$lang['acl_perm16'] = 'مسح';
+$lang['acl_new']    = 'أضف أضافة جديدة';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/ca/admin_acl.txt b/lib/plugins/acl/lang/ca/intro.txt
similarity index 100%
rename from inc/lang/ca/admin_acl.txt
rename to lib/plugins/acl/lang/ca/intro.txt
diff --git a/lib/plugins/acl/lang/ca/lang.php b/lib/plugins/acl/lang/ca/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..f314c5d4177ca7d47945e6f88aa209c4bd6530ba
--- /dev/null
+++ b/lib/plugins/acl/lang/ca/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * catalan language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Carles Bellver <carles.bellver@cent.uji.es>
+ */
+
+$lang['admin_acl']  = 'Gestió de la Llista de Control d\'Accés';
+$lang['acl_group']  = 'Grup';
+$lang['acl_user']   = 'Usuari';
+$lang['acl_perms']  = 'Permisos per a';
+$lang['page']       = 'Pàgina';
+$lang['namespace']  = 'Espai';
+
+$lang['acl_perm1']  = 'Llegir';
+$lang['acl_perm2']  = 'Editar';
+$lang['acl_perm4']  = 'Crear';
+$lang['acl_perm8']  = 'Penjar fitxers';
+$lang['acl_perm16'] = 'Suprimir';
+$lang['acl_new']    = 'Afegeix nova entrada';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/cs/admin_acl.txt b/lib/plugins/acl/lang/cs/intro.txt
similarity index 100%
rename from inc/lang/cs/admin_acl.txt
rename to lib/plugins/acl/lang/cs/intro.txt
diff --git a/lib/plugins/acl/lang/cs/lang.php b/lib/plugins/acl/lang/cs/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..e639856f4e30fc56ce2fe3a461ca9f8ca56bfce7
--- /dev/null
+++ b/lib/plugins/acl/lang/cs/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Czech language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Bohumir Zamecnik <bohumir@zamecnik.org>
+ */
+
+$lang['admin_acl']  = 'Správa přístupových práv';
+$lang['acl_group']  = 'Skupina';
+$lang['acl_user']   = 'Uživatel';
+$lang['acl_perms']  = 'Práva pro';
+$lang['page']       = 'Stránka';
+$lang['namespace']  = 'Jmenný prostor';
+
+$lang['acl_perm1']  = 'Čtení';
+$lang['acl_perm2']  = 'Úpravy';
+$lang['acl_perm4']  = 'Vytvoření';
+$lang['acl_perm8']  = 'Upload';
+$lang['acl_perm16'] = 'Mazání';
+$lang['acl_new']    = 'Přidat novou položku';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/da/admin_acl.txt b/lib/plugins/acl/lang/da/intro.txt
similarity index 100%
rename from inc/lang/da/admin_acl.txt
rename to lib/plugins/acl/lang/da/intro.txt
diff --git a/lib/plugins/acl/lang/da/lang.php b/lib/plugins/acl/lang/da/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..483ee7a1544db1654f6cc8326b588fef1eee3985
--- /dev/null
+++ b/lib/plugins/acl/lang/da/lang.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * danish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     koeppe <koeppe@kazur.dk>
+ * @author     Jon Bendtsen <bendtsen@diku.dk>
+ */
+
+$lang['admin_acl']  = 'Rettigheds Administration';
+$lang['acl_group']  = 'Gruppe';
+$lang['acl_user']   = 'Bruger';
+$lang['acl_perms']  = 'Rettigheder for';
+$lang['page']       = 'Dokument';
+$lang['namespace']  = 'Navnerum';
+
+$lang['acl_perm1']  = 'Læs';
+$lang['acl_perm2']  = 'Skriv';
+$lang['acl_perm4']  = 'Opret';
+$lang['acl_perm8']  = 'Upload';
+$lang['acl_perm16'] = 'Slet';
+$lang['acl_new']    = 'Tilføj ny post';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/de/admin_acl.txt b/lib/plugins/acl/lang/de/intro.txt
similarity index 100%
rename from inc/lang/de/admin_acl.txt
rename to lib/plugins/acl/lang/de/intro.txt
diff --git a/lib/plugins/acl/lang/de/lang.php b/lib/plugins/acl/lang/de/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b6bc3f9f41bdab5aa4ff300a3f123c5a1b3f0f9
--- /dev/null
+++ b/lib/plugins/acl/lang/de/lang.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * german language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Christof <gagi@fin.de>
+ * @author     Anika Henke <henke@cosmocode.de>
+ * @author     Esther Brunner <esther@kaffeehaus.ch>
+ * @author     Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ */
+
+$lang['admin_acl']  = 'Zugangsverwaltung';
+$lang['acl_group']  = 'Gruppe';
+$lang['acl_user']   = 'Benutzer';
+$lang['acl_perms']  = 'Berechtigungen für';
+$lang['page']       = 'Seite';
+$lang['namespace']  = 'Namensraum';
+
+$lang['acl_perm1']  = 'Lesen';
+$lang['acl_perm2']  = 'Bearbeiten';
+$lang['acl_perm4']  = 'Anlegen';
+$lang['acl_perm8']  = 'Hochladen';
+$lang['acl_perm16'] = 'Entfernen';
+$lang['acl_new']    = 'Eintrag hinzufügen';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/en/admin_acl.txt b/lib/plugins/acl/lang/en/intro.txt
similarity index 100%
rename from inc/lang/en/admin_acl.txt
rename to lib/plugins/acl/lang/en/intro.txt
diff --git a/lib/plugins/acl/lang/en/lang.php b/lib/plugins/acl/lang/en/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..8f52e7bb6b05dbe23db7677b14e8dd3854812ad5
--- /dev/null
+++ b/lib/plugins/acl/lang/en/lang.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * english language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Anika Henke <henke@cosmocode.de>
+ * @author     Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ */
+
+$lang['admin_acl']  = 'Access Control List Management';
+$lang['acl_group']  = 'Group';
+$lang['acl_user']   = 'User';
+$lang['acl_perms']  = 'Permissions for';
+$lang['page']       = 'Page';
+$lang['namespace']  = 'Namespace';
+
+$lang['acl_perm1']  = 'Read';
+$lang['acl_perm2']  = 'Edit';
+$lang['acl_perm4']  = 'Create';
+$lang['acl_perm8']  = 'Upload';
+$lang['acl_perm16'] = 'Delete';
+$lang['acl_new']    = 'Add new Entry';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/et/admin_acl.txt b/lib/plugins/acl/lang/et/intro.txt
similarity index 100%
rename from inc/lang/et/admin_acl.txt
rename to lib/plugins/acl/lang/et/intro.txt
diff --git a/lib/plugins/acl/lang/et/lang.php b/lib/plugins/acl/lang/et/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..e90d5eaa92f9db0e5380d8c13fb01ee3a82308cf
--- /dev/null
+++ b/lib/plugins/acl/lang/et/lang.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Estonian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Oliver S6ro <seem.iges@mail.ee>
+ * @author     Aari Juhanson <aari@vmg.vil.ee>
+ * @author     Kaiko Kaur <kaiko@kultuur.edu.ee>
+ */
+
+$lang['admin_acl']  = 'Ligipääsukontrolli nimekirja haldamine';
+$lang['acl_group']  = 'Grupp';
+$lang['acl_user']   = 'Kasutaja';
+$lang['acl_perms']  = 'Lubatud';
+$lang['page']       = 'leht';
+$lang['namespace']  = 'alajaotus';
+
+$lang['acl_perm1']  = 'Lugemine';
+$lang['acl_perm2']  = 'Toimetamine';
+$lang['acl_perm4']  = 'Tekitamine';
+$lang['acl_perm8']  = 'Ãœles laadimine';
+$lang['acl_new']    = 'Uue kirje lisamine';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/eu/admin_acl.txt b/lib/plugins/acl/lang/eu/intro.txt
similarity index 100%
rename from inc/lang/eu/admin_acl.txt
rename to lib/plugins/acl/lang/eu/intro.txt
diff --git a/inc/lang/fi/admin_acl.txt b/lib/plugins/acl/lang/fi/intro.txt
similarity index 100%
rename from inc/lang/fi/admin_acl.txt
rename to lib/plugins/acl/lang/fi/intro.txt
diff --git a/inc/lang/fr/admin_acl.txt b/lib/plugins/acl/lang/fr/intro.txt
similarity index 100%
rename from inc/lang/fr/admin_acl.txt
rename to lib/plugins/acl/lang/fr/intro.txt
diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..0369166dec68ecdcb16eff8ab2d72f950ec11d9f
--- /dev/null
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * french language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Sébastien Bauer <sebastien.bauer@advalvas.be>
+ * @author     Antoine Fixary <antoine.fixary@freesbee.fr>
+ * @author     cumulus <pta-n56@myamail.com>
+ * @author     Gwenn Gueguen <contact@demisel.net>
+ * @author     Guy Brand <gb@isis.u-strasbg.fr>
+ * @author     Fabien Chabreuil <fabien@integralpersonality.com>
+ * @author     Stéphane Chamberland <stephane.chamberland@ec.gc.ca>
+ */
+
+$lang['admin_acl']  = 'Gestion de la liste des contrôles d\'accès';
+$lang['acl_group']  = 'Groupe';
+$lang['acl_user']   = 'Utilisateur';
+$lang['acl_perms']  = 'Permission pour';
+$lang['page']       = 'Page';
+$lang['namespace']  = 'Catégorie';
+
+$lang['acl_perm1']  = 'Lecture';
+$lang['acl_perm2']  = 'Écriture';
+$lang['acl_perm4']  = 'Création';
+$lang['acl_perm8']  = 'Télécharger';
+$lang['acl_perm16'] = 'Effacer';
+$lang['acl_new']    = 'Ajouter une nouvelle entrée';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/it/admin_acl.txt b/lib/plugins/acl/lang/it/intro.txt
similarity index 100%
rename from inc/lang/it/admin_acl.txt
rename to lib/plugins/acl/lang/it/intro.txt
diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..7b647eec0106f33555d855d62f68957d83c1b121
--- /dev/null
+++ b/lib/plugins/acl/lang/it/lang.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * italian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Giorgio Vecchiocattivi <giorgio@vecchio.it>
+ * @author     Roberto Bolli <http://www.rbnet.it/>
+ */
+
+$lang['admin_acl']  = 'Gestione Access Control List';
+$lang['acl_group']  = 'Gruppo';
+$lang['acl_user']   = 'Utente';
+$lang['acl_perms']  = 'Permessi per';
+$lang['page']       = 'Pagina';
+$lang['namespace']  = 'Categoria';
+
+$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';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/ja/admin_acl.txt b/lib/plugins/acl/lang/ja/intro.txt
similarity index 100%
rename from inc/lang/ja/admin_acl.txt
rename to lib/plugins/acl/lang/ja/intro.txt
diff --git a/lib/plugins/acl/lang/ja/lang.php b/lib/plugins/acl/lang/ja/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..09a4a1acd956f17bc4e1743b435ffc6285ff3090
--- /dev/null
+++ b/lib/plugins/acl/lang/ja/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * japanese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Davilin(Yuji Takenaka) <webmaster@davilin.com>
+ */
+
+$lang['admin_acl']  = 'アクセスコントロール管理';
+$lang['acl_group']  = 'グループ';
+$lang['acl_user']   = 'ユーザー';
+$lang['acl_perms']  = '権限を追加';
+$lang['page']       = '文書';
+$lang['namespace']  = '名前空間';
+
+$lang['acl_perm1']  = '読取';
+$lang['acl_perm2']  = '編集';
+$lang['acl_perm4']  = '作成';
+$lang['acl_perm8']  = 'アップロード';
+$lang['acl_perm16'] = '削除';
+$lang['acl_new']    = '新規エントリ';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/lt/admin_acl.txt b/lib/plugins/acl/lang/lt/intro.txt
similarity index 100%
rename from inc/lang/lt/admin_acl.txt
rename to lib/plugins/acl/lang/lt/intro.txt
diff --git a/lib/plugins/acl/lang/lt/lang.php b/lib/plugins/acl/lang/lt/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..102db9a1d8ef53945db1a5c7305b65b9cfba4967
--- /dev/null
+++ b/lib/plugins/acl/lang/lt/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * lithuanian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Linas Valiukas <shirshegsm@gmail.com>
+ */
+
+$lang['admin_acl']  = 'Priėjimo Kontrolės Sąrašų valdymas';
+$lang['acl_group']  = 'GrupÄ—';
+$lang['acl_user']   = 'Vartotojas';
+$lang['acl_perms']  = 'Leidimai';
+$lang['page']       = 'Puslapis';
+$lang['namespace']  = 'Pavadinimas';
+
+$lang['acl_perm1']  = 'Skaityti';
+$lang['acl_perm2']  = 'Redaguoti';
+$lang['acl_perm4']  = 'Sukurti';
+$lang['acl_perm8']  = 'Atsiųsti';
+$lang['acl_perm16'] = 'IÅ¡trinti';
+$lang['acl_new']    = 'Pridėti naują įrašą';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/lv/admin_acl.txt b/lib/plugins/acl/lang/lv/intro.txt
similarity index 100%
rename from inc/lang/lv/admin_acl.txt
rename to lib/plugins/acl/lang/lv/intro.txt
diff --git a/lib/plugins/acl/lang/lv/lang.php b/lib/plugins/acl/lang/lv/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..0dead2d7f9cb74e039e493e5eb74a6274e558808
--- /dev/null
+++ b/lib/plugins/acl/lang/lv/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * latvian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Aivars Miška <allefm@gmail.com>
+ */
+
+$lang['admin_acl']  = 'Piekļuves tiesību vadība';
+$lang['acl_group']  = 'Grupa';
+$lang['acl_user']   = 'Lietotājs';
+$lang['acl_perms']  = 'Tiesības';
+$lang['page']       = 'Lapa';
+$lang['namespace']  = 'Nodaļa';
+
+$lang['acl_perm1']  = 'Lasīt';
+$lang['acl_perm2']  = 'Labot';
+$lang['acl_perm4']  = 'Izveidot';
+$lang['acl_perm8']  = 'augšupielādēt';
+$lang['acl_new']    = 'Pievienot jaunu';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/nl/admin_acl.txt b/lib/plugins/acl/lang/nl/intro.txt
similarity index 100%
rename from inc/lang/nl/admin_acl.txt
rename to lib/plugins/acl/lang/nl/intro.txt
diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..5a3380fc4e85d6110b49ff95647e861e942a4c93
--- /dev/null
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * dutch language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     François Kooman <fkooman.tuxed.net>
+ * @author     Jack van Klaren <dokuwiki@afentoe.xs4all.nl>
+ * @author     Riny Heijdendael <riny@heijdendael.nl>
+ * @author     Koen Huybrechts <huybkoen@gmail.com>
+ */
+$lang['admin_acl']  = 'Toegangsrechten';
+$lang['acl_group']  = 'Groep';
+$lang['acl_user']   = 'Gebruiker';
+$lang['acl_perms']  = 'Permissies voor';
+$lang['page']       = 'Pagina';
+$lang['namespace']  = 'Namespace';
+ 
+$lang['acl_perm1']  = 'Lezen';
+$lang['acl_perm2']  = 'Bewerken';
+$lang['acl_perm4']  = 'Aanmaken';
+$lang['acl_perm8']  = 'Upload';
+$lang['acl_perm16'] = 'Verwijder';
+$lang['acl_new']    = 'Nieuwe regel toevoegen';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/no/admin_acl.txt b/lib/plugins/acl/lang/no/intro.txt
similarity index 100%
rename from inc/lang/no/admin_acl.txt
rename to lib/plugins/acl/lang/no/intro.txt
diff --git a/lib/plugins/acl/lang/no/lang.php b/lib/plugins/acl/lang/no/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..55b148e8e1b5ba5b6f09fb900d0d75a8959a8f36
--- /dev/null
+++ b/lib/plugins/acl/lang/no/lang.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Norwegian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Reidar Mosvold <Reidar.Mosvold@hit.no>
+ * @author     Jorge Barrera Grandon <jorge@digitalwolves.org>
+ */
+
+$lang['admin_acl']  = 'Administrasjon av Access Control List';
+$lang['acl_group']  = 'Gruppe';
+$lang['acl_user']   = 'Bruker';
+$lang['acl_perms']  = 'Rettigheter for';
+$lang['page']       = 'Side';
+$lang['namespace']  = 'Wikinavn';
+ 
+$lang['acl_perm1']  = 'Lese';
+$lang['acl_perm2']  = 'Redigere';
+$lang['acl_perm4']  = 'Lage';
+$lang['acl_perm8']  = 'Laste opp';
+$lang['acl_perm16'] = 'Slette';
+$lang['acl_new']    = 'Legg til ny oppføring';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/pl/admin_acl.txt b/lib/plugins/acl/lang/pl/intro.txt
similarity index 100%
rename from inc/lang/pl/admin_acl.txt
rename to lib/plugins/acl/lang/pl/intro.txt
diff --git a/lib/plugins/acl/lang/pl/lang.php b/lib/plugins/acl/lang/pl/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..0dcb1e8a2509e991d34e3ab52cfdbf61343b3828
--- /dev/null
+++ b/lib/plugins/acl/lang/pl/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * polish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Grzegorz Żur <grzegorz.zur@gmail.com>
+ */
+$lang['admin_acl']  = 'ZarzÄ…dzanie uprawnieniami';
+$lang['acl_group']  = 'Grupa';
+$lang['acl_user']   = 'Użytkownik';
+$lang['acl_perms']  = 'Uprawnienia użytkownika';
+$lang['page']       = 'Strona';
+$lang['namespace']  = 'Katalog';
+
+$lang['acl_perm1']  = 'Czytanie';
+$lang['acl_perm2']  = 'Zmiana';
+$lang['acl_perm4']  = 'Tworzenie';
+$lang['acl_perm8']  = 'Przesyłanie plików';
+$lang['acl_perm16'] = 'Usuwanie';
+$lang['acl_new']    = 'Dodaj nowy wpis';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/pt/admin_acl.txt b/lib/plugins/acl/lang/pt/intro.txt
similarity index 100%
rename from inc/lang/pt/admin_acl.txt
rename to lib/plugins/acl/lang/pt/intro.txt
diff --git a/lib/plugins/acl/lang/pt/lang.php b/lib/plugins/acl/lang/pt/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..a628e28f10bec3ac3cf6cb1deb1dbd1e0102b259
--- /dev/null
+++ b/lib/plugins/acl/lang/pt/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Portuguese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
+ */
+$lang['admin_acl']    = 'Gestão de ACLs';
+$lang['acl_group']    = 'Grupo';
+$lang['acl_user']     = 'Utilizador';
+$lang['acl_perms']    = 'Permissão para';
+$lang['page']         = 'Documento';
+$lang['namespace']    = 'Namespace';
+
+$lang['acl_perm1']    = 'Ler';
+$lang['acl_perm2']    = 'Editar';
+$lang['acl_perm4']    = 'Criar';
+$lang['acl_perm8']    = 'Carregar';
+$lang['acl_perm16']   = 'Remover';
+$lang['acl_new']      = 'Adicionar nova entrada';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/sk/admin_acl.txt b/lib/plugins/acl/lang/sk/intro.txt
similarity index 100%
rename from inc/lang/sk/admin_acl.txt
rename to lib/plugins/acl/lang/sk/intro.txt
diff --git a/lib/plugins/acl/lang/sk/lang.php b/lib/plugins/acl/lang/sk/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..150f9dbdbac1b32be7b8de430556993734885139
--- /dev/null
+++ b/lib/plugins/acl/lang/sk/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Slovak language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Ondrej Vegh <ov@vsieti.sk> with help of the scholars from Zdruzena stredna skola polygraficka in Bratislava
+ */
+
+$lang['admin_acl']  = 'Správa zoznamu prístupových práv';
+$lang['acl_group']  = 'Skupina';
+$lang['acl_user']   = 'Užívateľ';
+$lang['acl_perms']  = 'Práva pre';
+$lang['page']       = 'Stránka';
+$lang['namespace']  = 'Menný priestor';
+
+$lang['acl_perm1']  = 'Čítať';
+$lang['acl_perm2']  = 'Zmeniť';
+$lang['acl_perm4']  = 'Vytvoriť';
+$lang['acl_perm8']  = 'Nahrať súbor';
+$lang['acl_perm16'] = 'Zmazať';
+$lang['acl_new']    = 'Pridať novú položku';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/tr/admin_acl.txt b/lib/plugins/acl/lang/tr/intro.txt
similarity index 100%
rename from inc/lang/tr/admin_acl.txt
rename to lib/plugins/acl/lang/tr/intro.txt
diff --git a/lib/plugins/acl/lang/tr/lang.php b/lib/plugins/acl/lang/tr/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..e40ee810cc92055293973da9c985598027784ae2
--- /dev/null
+++ b/lib/plugins/acl/lang/tr/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * turkish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Selim FarsakoÄŸlu <farsakogluselim@yahoo.de>
+ */
+
+$lang['admin_acl']  = 'Erişim kontrol listesi yönetimi';
+$lang['acl_group']  = 'Grup';
+$lang['acl_user']   = 'Kullanıcı';
+$lang['acl_perms']  = 'Şunun için yetkiler:';
+$lang['page']       = 'Sayfa';
+$lang['namespace']  = 'İsim aralığı';
+
+$lang['acl_perm1']  = 'Okuma';
+$lang['acl_perm2']  = 'DeÄŸiÅŸtirme';
+$lang['acl_perm4']  = 'OluÅŸturma';
+$lang['acl_perm8']  = 'Yükleme';
+$lang['acl_perm16'] = 'Silme';
+$lang['acl_new']    = 'Yeni giriÅŸ ekle';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/vi/admin_acl.txt b/lib/plugins/acl/lang/vi/intro.txt
similarity index 100%
rename from inc/lang/vi/admin_acl.txt
rename to lib/plugins/acl/lang/vi/intro.txt
diff --git a/lib/plugins/acl/lang/vi/lang.php b/lib/plugins/acl/lang/vi/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..f871aca851adbb69c56d4b29c57736d823d0ec13
--- /dev/null
+++ b/lib/plugins/acl/lang/vi/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * vietnamese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     James Do <jdo@myrealbox.com>
+ */
+
+$lang['admin_acl']  = 'Quản lý phép truy nhật {Access Control List}';
+$lang['acl_group']  = 'Nhóm';
+$lang['acl_user']   = 'Người';
+$lang['acl_perms']  = 'Phép truy nhập cho';
+$lang['page']       = 'Trang';
+$lang['namespace']  = 'Không gian tên';
+
+$lang['acl_perm1']  = 'Đọc';
+$lang['acl_perm2']  = 'Biên soạn';
+$lang['acl_perm4']  = 'Tạo';
+$lang['acl_perm8']  = 'Tải lên';
+$lang['acl_new']    = 'Thêm mục mới';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/inc/lang/zh-tw/admin_acl.txt b/lib/plugins/acl/lang/zh-tw/intro.txt
similarity index 100%
rename from inc/lang/zh-tw/admin_acl.txt
rename to lib/plugins/acl/lang/zh-tw/intro.txt
diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..5db0311f9232bb0277ed987e8f4a7f30e646473c
--- /dev/null
+++ b/lib/plugins/acl/lang/zh-tw/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Chinese(Traditional) language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     chinsan <chinsan@mail2000.com.tw>
+ */
+
+$lang['admin_acl']  = '設定權限控制清單(ACL)';
+$lang['acl_group']  = '群組';
+$lang['acl_user']   = '帳號';
+$lang['acl_perms']  = '設定權限於';
+$lang['page']       = 'Page';
+$lang['namespace']  = 'Namespace';
+
+$lang['acl_perm1']  = '讀取權限';
+$lang['acl_perm2']  = '編輯頁面';
+$lang['acl_perm4']  = '新增頁面';
+$lang['acl_perm8']  = '上傳圖檔';
+$lang['acl_perm16'] = '刪除檔案';
+$lang['acl_new']    = '新增管理規則';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 56d908d222a8c05bc010ce8334da5bce9aa60d1a..b45429cc931b5e7e4e176e01a031255f177355ff 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -350,7 +350,7 @@ if (!class_exists('setting')) {
     }
     
     function prompt(&$plugin) {
-        if (!$this->pluginLocale) $this->setupPluginLocale(&$plugin);
+        if (!$this->pluginLocale) $this->setupPluginLocale($plugin);
         $prompt = $plugin->getLang($this->_key);
         if (!$prompt) $prompt = str_replace(array('____','_'),' ',$this->_key);
         return htmlspecialchars($prompt);