[Xfce4-commits] [www/wiki.xfce.org] 01/01: Update plugins, and sync some modifications

noreply at xfce.org noreply at xfce.org
Sat Mar 3 17:38:38 CET 2018


This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository www/wiki.xfce.org.

commit 4666c5572d6d450f8ee9ab8c839c487c05811a89
Author: Romain B <skunnyk at alteroot.org>
Date:   Sat Mar 3 17:37:25 2018 +0100

    Update plugins, and sync some modifications
---
 lib/plugins/captcha/action.php                     |   4 +-
 lib/plugins/captcha/helper.php                     |   2 +-
 lib/plugins/captcha/lang/cs/lang.php               |   2 +-
 lib/plugins/captcha/lang/cs/settings.php           |   5 +-
 lib/plugins/captcha/lang/de-informal/lang.php      |  11 +-
 lib/plugins/captcha/lang/de-informal/settings.php  |  10 +-
 lib/plugins/captcha/lang/de/lang.php               |   2 +-
 lib/plugins/captcha/lang/de/settings.php           |   5 +-
 lib/plugins/captcha/lang/eo/lang.php               |  11 +-
 lib/plugins/captcha/lang/eo/settings.php           |  26 ++--
 lib/plugins/captcha/lang/ja/lang.php               |   2 +-
 lib/plugins/captcha/lang/ja/settings.php           |   4 +-
 lib/plugins/captcha/lang/nl/lang.php               |   2 +-
 lib/plugins/captcha/lang/nl/settings.php           |   4 +-
 lib/plugins/captcha/lang/pt-br/lang.php            |   6 +-
 lib/plugins/captcha/lang/pt-br/settings.php        |  13 +-
 lib/plugins/captcha/lang/uk/lang.php               |   2 +-
 lib/plugins/captcha/lang/uk/settings.php           |   4 +
 lib/plugins/captcha/manager.dat                    |   2 +-
 lib/plugins/captcha/plugin.info.txt                |   2 +-
 lib/plugins/captcha/style.css                      |   6 +-
 lib/plugins/dl/style.css                           |   8 --
 lib/plugins/dl/syntax.php                          | 158 ---------------------
 lib/plugins/loglog/lang/eo/intro.txt               |   2 +-
 lib/plugins/loglog/lang/eo/lang.php                |   8 +-
 lib/plugins/loglog/manager.dat                     |   1 +
 lib/plugins/loglog/plugin.info.txt                 |   2 +-
 lib/plugins/redirect/action.php                    |  49 +++----
 lib/plugins/redirect/admin.php                     |  47 +++---
 lib/plugins/redirect/lang/de/intro.txt             |  10 +-
 lib/plugins/redirect/lang/de/lang.php              |   5 +-
 lib/plugins/redirect/lang/de/settings.php          |   5 +-
 lib/plugins/redirect/lang/en/intro.txt             |   5 +-
 lib/plugins/redirect/manager.dat                   |   2 +-
 lib/plugins/redirect/plugin.info.txt               |   2 +-
 lib/plugins/translation/action.php                 |  55 ++++---
 lib/plugins/translation/helper.php                 |  57 ++++++--
 lib/plugins/translation/lang/de-informal/lang.php  |   6 +-
 .../translation/lang/de-informal/settings.php      |  26 ++--
 lib/plugins/translation/lang/uk/settings.php       |   1 -
 lib/plugins/translation/manager.dat                |   2 +-
 lib/plugins/translation/plugin.info.txt            |   2 +-
 lib/plugins/translation/syntax/notrans.php         |  27 +++-
 lib/plugins/translation/syntax/trans.php           |  21 ++-
 lib/tpl/xfce/main.php                              |   2 +-
 lib/tpl/xfce/tpl_footer.php                        |  51 ++++---
 46 files changed, 327 insertions(+), 352 deletions(-)

diff --git a/lib/plugins/captcha/action.php b/lib/plugins/captcha/action.php
index 907b2c5..e49617b 100644
--- a/lib/plugins/captcha/action.php
+++ b/lib/plugins/captcha/action.php
@@ -200,8 +200,8 @@ class action_plugin_captcha extends DokuWiki_Action_Plugin {
         $helper = plugin_load('helper', 'captcha');
         $out = $helper->getHTML();
 
-        // new wiki - insert after the submit button
-        $event->data->insertElement($pos + 1, $out);
+        // new wiki - insert before the submit button
+        $event->data->insertElement($pos, $out);
     }
 
     /**
diff --git a/lib/plugins/captcha/helper.php b/lib/plugins/captcha/helper.php
index 0d4f883..63e412f 100644
--- a/lib/plugins/captcha/helper.php
+++ b/lib/plugins/captcha/helper.php
@@ -345,7 +345,7 @@ class helper_plugin_captcha extends DokuWiki_Plugin {
 
         // prepare result and task text
         $res  = $num[0] + ($num[1] * $op);
-        $task = $num[0].(($op < 0) ? '-' : '+').$num[1].'=?';
+        $task = $num[0].(($op < 0) ? '-' : '+').$num[1].'= ';
 
         return array($task, $res);
     }
diff --git a/lib/plugins/captcha/lang/cs/lang.php b/lib/plugins/captcha/lang/cs/lang.php
index e03223f..07b782f 100644
--- a/lib/plugins/captcha/lang/cs/lang.php
+++ b/lib/plugins/captcha/lang/cs/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Antonin Komenda <gree at grees.net>
  * @author Jaroslav Lichtblau <jlichtblau at seznam.cz>
  */
diff --git a/lib/plugins/captcha/lang/cs/settings.php b/lib/plugins/captcha/lang/cs/settings.php
index 5167538..d82633f 100644
--- a/lib/plugins/captcha/lang/cs/settings.php
+++ b/lib/plugins/captcha/lang/cs/settings.php
@@ -2,9 +2,10 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Antonin Komenda <gree at grees.net>
  * @author Jaroslav Lichtblau <jlichtblau at seznam.cz>
+ * @author Quark66 <mkucera66 at seznam.cz>
  */
 $lang['mode']                  = 'Který typ CAPTCHA se má použít?';
 $lang['mode_o_js']             = 'Text (předvyplněný JavaScriptem)';
@@ -13,6 +14,8 @@ $lang['mode_o_math']           = 'Matematický problém';
 $lang['mode_o_question']       = 'Vlastní otázka';
 $lang['mode_o_image']          = 'Obrázek (špatná přístupnost)';
 $lang['mode_o_audio']          = 'Obrázek (lepší přístupnost)';
+$lang['mode_o_svg']            = 'SVG (špatná dostupnost, čitelné)';
+$lang['mode_o_svgaudio']       = 'SVG+Audio (lepší dostupnost, čitelné)';
 $lang['mode_o_figlet']         = 'ASCII art figlet (špatná přístupnost) ';
 $lang['forusers']              = 'Používat CAPTCHA i pro registrované uživatele?';
 $lang['loginprotect']          = 'Vyžadovat pro přihlášení CAPTCHA?';
diff --git a/lib/plugins/captcha/lang/de-informal/lang.php b/lib/plugins/captcha/lang/de-informal/lang.php
index 867031e..c09e261 100644
--- a/lib/plugins/captcha/lang/de-informal/lang.php
+++ b/lib/plugins/captcha/lang/de-informal/lang.php
@@ -2,11 +2,12 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Thomas Templin <templin at gnuwhv.de>
+ * @author Daniel Eiter <daniel at eiterfamily.com>
  */
-$lang['testfailed']            = 'Das CAPTCHA wurde nicht korrekt beantwortet.';
-$lang['fillcaptcha']           = 'Bitte übertrage die Buchstaben in das Eingabefeld.';
-$lang['fillmath']              = 'Bitte löse folgende Gleichung:';
+$lang['testfailed']            = 'Das CAPTCHA wurde nicht korrekt beantwortet.  Vielleicht bist du gar kein Mensch?';
+$lang['fillcaptcha']           = 'Bitte gib alle Buchstaben in das Eingabefeld ein  um zu zeigen dass du ein Mensch bist. ';
+$lang['fillmath']              = 'Bitte löse folgende Gleichung  um zu zeigen dass du ein Mensch bist. ';
 $lang['soundlink']             = 'Wenn Du die Buchstaben auf dem Bild nicht lesen kannst, lade diese .wav Datei herunter, um sie vorgelesen zu bekommen.';
-$lang['honeypot']              = 'Dieses Feld bitte leer lassen';
+$lang['honeypot']              = 'Dieses Feld bitte leer lassen:';
diff --git a/lib/plugins/captcha/lang/de-informal/settings.php b/lib/plugins/captcha/lang/de-informal/settings.php
index 28a2004..fa8afe0 100644
--- a/lib/plugins/captcha/lang/de-informal/settings.php
+++ b/lib/plugins/captcha/lang/de-informal/settings.php
@@ -2,17 +2,21 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Thomas Templin <templin at gnuwhv.de>
  * @author Dana <dannax3 at gmx.de>
+ * @author Daniel Eiter <daniel at eiterfamily.com>
+ * @author F. Mueller-Donath <j.felix at mueller-donath.de>
  */
 $lang['mode']                  = 'Welcher CAPTCHA-Typ soll benutzt werden?';
-$lang['mode_o_js']             = 'Text (automatisch ausgefüllt via JavaScript)';
-$lang['mode_o_text']           = 'Text (manuell auszufüllen)';
+$lang['mode_o_js']             = 'Text (vorausgefüllt mit JavaScript)';
+$lang['mode_o_text']           = 'Text (nur manuell)';
 $lang['mode_o_math']           = 'Mathe-Aufgabe';
 $lang['mode_o_question']       = 'Feste Frage';
 $lang['mode_o_image']          = 'Bild (nicht barrierefrei)';
 $lang['mode_o_audio']          = 'Bild+Audio (barrierefrei)';
+$lang['mode_o_svg']            = 'SVG (nicht barrierefrei, lesbar)';
+$lang['mode_o_svgaudio']       = 'SVG + Audio (barrierefrei, lesbar)';
 $lang['mode_o_figlet']         = 'Figlet ASCII-Kunst (nicht barrierefrei)';
 $lang['forusers']              = 'CAPTCHA auch für  angemeldete Benutzer verwenden?';
 $lang['loginprotect']          = 'Vorraussetzen eines CAPTCHA zum Einloggen?';
diff --git a/lib/plugins/captcha/lang/de/lang.php b/lib/plugins/captcha/lang/de/lang.php
index ac6fa4a..c6e6c5b 100644
--- a/lib/plugins/captcha/lang/de/lang.php
+++ b/lib/plugins/captcha/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Andreas Gohr <andi at splitbrain.org>
  */
 $lang['testfailed']            = 'Das CAPTCHA wurde nicht korrekt beantwortet.';
diff --git a/lib/plugins/captcha/lang/de/settings.php b/lib/plugins/captcha/lang/de/settings.php
index 549a53d..1cd79d4 100644
--- a/lib/plugins/captcha/lang/de/settings.php
+++ b/lib/plugins/captcha/lang/de/settings.php
@@ -2,10 +2,11 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Andreas Gohr <andi at splitbrain.org>
  * @author Thomas Templin <templin at gnuwhv.de>
  * @author Leo Rudin <leo.rudin at gmx.ch>
+ * @author F. Mueller-Donath <j.felix at mueller-donath.de>
  */
 $lang['mode']                  = 'Welcher CAPTCHA-Typ soll benutzt werden?';
 $lang['mode_o_js']             = 'Text (automatisch ausgefüllt via JavaScript)';
@@ -14,6 +15,8 @@ $lang['mode_o_math']           = 'Mathe-Aufgabe';
 $lang['mode_o_question']       = 'Feste Frage';
 $lang['mode_o_image']          = 'Bild (nicht barrierefrei)';
 $lang['mode_o_audio']          = 'Bild+Audio (barrierefrei)';
+$lang['mode_o_svg']            = 'SVG (nicht barrierefrei, lesbar)';
+$lang['mode_o_svgaudio']       = 'SVG + Audio (barrierefrei, lesbar)';
 $lang['mode_o_figlet']         = 'Figlet ASCII-Kunst (nicht barrierefrei)';
 $lang['forusers']              = 'Soll das CAPTCHA auch für eingeloggte Benutzer gebraucht werden?';
 $lang['loginprotect']          = 'Benötigt es ein CAPTCHA um sich einzuloggen?';
diff --git a/lib/plugins/captcha/lang/eo/lang.php b/lib/plugins/captcha/lang/eo/lang.php
index 01ed128..ff9058e 100644
--- a/lib/plugins/captcha/lang/eo/lang.php
+++ b/lib/plugins/captcha/lang/eo/lang.php
@@ -3,11 +3,12 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * 
- * @author Tradukis Ljosxa Kuznecov <ka2pink at gmail.com>
+ * @author Ljosxa Kuznecov <ka2pink at gmail.com>
  * @author Robert Bogenschneider <bogi at uea.org>
+ * @author Moisés Braga Ribeiro <moisesbr at gmail.com>
  */
-$lang['testfailed']            = 'Pardonon, sed CAPTCHA ne respondis korekte. Eble vi tute ne estas homo, ĉu?';
-$lang['fillcaptcha']           = 'Bonvolu tajpi ĉiujn literojn en la kampeton, por pruvi ke vi estas homo.';
-$lang['fillmath']              = 'Bonvolu solvi sekvan ekvacion por pruvi, ke vi estas homa.';
-$lang['soundlink']             = 'Se vi ne povas legi la literojn en la bildo, ŝarĝu tiun .wav-dosieron por aŭdi ilin.';
+$lang['testfailed']            = 'Pardonon, sed la testo CAPTCHA ne estis respondita ĝuste. Eble vi tute ne estas homo, ĉu?';
+$lang['fillcaptcha']           = 'Bonvolu tajpi ĉiujn literojn en la kampon por pruvi ke vi estas homo.';
+$lang['fillmath']              = 'Bonvolu solvi la sekvan ekvacion por pruvi ke vi estas homo.';
+$lang['soundlink']             = 'Se vi ne povas legi la literojn en la bildo, elŝutu tiun dosieron .wav por aŭskulti ilin.';
 $lang['honeypot']              = 'Bonvolu lasi tiun kampon malplena:';
diff --git a/lib/plugins/captcha/lang/eo/settings.php b/lib/plugins/captcha/lang/eo/settings.php
index c197757..0a2fcb2 100644
--- a/lib/plugins/captcha/lang/eo/settings.php
+++ b/lib/plugins/captcha/lang/eo/settings.php
@@ -3,20 +3,24 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
- * @author Tradukis Ljosxa Kuznecov <ka2pink at gmail.com>
+ * @author Ljosxa Kuznecov <ka2pink at gmail.com>
  * @author Robert Bogenschneider <bogi at uea.org>
+ * @author Moisés Braga Ribeiro <moisesbr at gmail.com>
  */
-$lang['mode']                  = 'Kiun varianton de CAPTCHA uzi?';
-$lang['mode_o_js']             = 'Teksto (prilaborita per Java-skripto)';
+$lang['mode']                  = 'Kian teston CAPTCHA uzi?';
+$lang['mode_o_js']             = 'Teksto (antaŭplenumita per Ĝavoskripto)';
 $lang['mode_o_text']           = 'Teksto (nur permane)';
 $lang['mode_o_math']           = 'Matematika problemo';
-$lang['mode_o_question']       = 'Fiksa demando';
+$lang['mode_o_question']       = 'Fiksa Demando';
 $lang['mode_o_image']          = 'Bildo (malbona alirebleco)';
 $lang['mode_o_audio']          = 'Bildo+Sono (pli bona alirebleco)';
-$lang['mode_o_figlet']         = 'Figlet ASCII - arto (malbona alirebleco)';
-$lang['forusers']              = 'Uzi CAPTCHA-n ankaŭ por ensalutintaj uzantoj?';
-$lang['lettercount']           = 'Kvanto da uzendaj literoj (3-16). Se vi pligrandigas la kvanton, certigu ke vi same pligrandigas la larĝecon de la suba bildo.';
-$lang['width']                 = 'Larĝeco de CAPTCHA-bildo (pikseloj)';
-$lang['height']                = 'Alteco de CAPTCHA-bildo (pikseloj)';
-$lang['question']              = 'Demando por fiks-demanda funkciado';
-$lang['answer']                = 'Respondo por fiks-demanda funkciado';
+$lang['mode_o_svg']            = 'SVG (malbona alirebleco, legebla)';
+$lang['mode_o_svgaudio']       = 'SVG+Sono (pli bona alirebleco, legebla)';
+$lang['mode_o_figlet']         = 'Bildo el Askia Arto (malbona alirebleco)';
+$lang['forusers']              = 'Ĉu uzi teston CAPTCHA ankaŭ por ensalutintaj uzantoj?';
+$lang['loginprotect']          = 'Ĉu postuli teston CAPTCHA por ensaluti?';
+$lang['lettercount']           = 'Kvanto da uzendaj literoj (3-16). Se vi pligrandigas la kvanton, certigu ke vi ankaŭ pligrandigas la larĝecon de la suba bildo.';
+$lang['width']                 = 'Larĝeco de la CAPTCHA-bildo (rastrumeroj)';
+$lang['height']                = 'Alteco de la CAPTCHA-bildo (rastrumeroj)';
+$lang['question']              = 'Demando por la reĝimo de fiksa demando';
+$lang['answer']                = 'Respondo por la reĝimo de fiksa demando';
diff --git a/lib/plugins/captcha/lang/ja/lang.php b/lib/plugins/captcha/lang/ja/lang.php
index 7e7fd25..a68aaf7 100644
--- a/lib/plugins/captcha/lang/ja/lang.php
+++ b/lib/plugins/captcha/lang/ja/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author OHTSU Yoshifumi <dev at decomo.info>
  * @author Hideaki SAWADA <chuno at live.jp>
  */
diff --git a/lib/plugins/captcha/lang/ja/settings.php b/lib/plugins/captcha/lang/ja/settings.php
index 1fb5372..c55c83a 100644
--- a/lib/plugins/captcha/lang/ja/settings.php
+++ b/lib/plugins/captcha/lang/ja/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author OHTSU Yoshifumi <dev at decomo.info>
  * @author Hideaki SAWADA <chuno at live.jp>
  * @author Ikuo Obataya <i.obataya at gmail.com>
@@ -14,6 +14,8 @@ $lang['mode_o_math']           = '計算式';
 $lang['mode_o_question']       = '固定質問';
 $lang['mode_o_image']          = '画像 (低アクセシビリティ)';
 $lang['mode_o_audio']          = '画像+音声 (中アクセシビリティ)';
+$lang['mode_o_svg']            = 'SVG (低アクセシビリティ・読みやすい)';
+$lang['mode_o_svgaudio']       = 'SVG+音声 (中アクセシビリティ・読みやすい)';
 $lang['mode_o_figlet']         = 'Figlet [アルファベットAA] (低アクセシビリティ)';
 $lang['forusers']              = 'ログインユーザーに対してもCAPTCHA認証を行う';
 $lang['loginprotect']          = 'ログインにCAPTCHAを要求しますか?';
diff --git a/lib/plugins/captcha/lang/nl/lang.php b/lib/plugins/captcha/lang/nl/lang.php
index bf07a56..afc165f 100644
--- a/lib/plugins/captcha/lang/nl/lang.php
+++ b/lib/plugins/captcha/lang/nl/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Ruben Schouten <mail at ruben.cc>
  * @author Mark C. Prins <mprins at users.sf.net>
  * @author Mark Prins <mprins at users.sf.net>
diff --git a/lib/plugins/captcha/lang/nl/settings.php b/lib/plugins/captcha/lang/nl/settings.php
index 0050236..9b5dd8d 100644
--- a/lib/plugins/captcha/lang/nl/settings.php
+++ b/lib/plugins/captcha/lang/nl/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Ruben Schouten <mail at ruben.cc>
  * @author Mark C. Prins <mprins at users.sf.net>
  * @author Mark Prins <mprins at users.sf.net>
@@ -15,6 +15,8 @@ $lang['mode_o_math']           = 'Wiskunde opgave (eenvoudige rekensom)';
 $lang['mode_o_question']       = 'Vaste vraag';
 $lang['mode_o_image']          = 'Afbeelding (slechte toegankelijkhied)';
 $lang['mode_o_audio']          = 'Afbeelding+Audio (betere toegankelijkheid)';
+$lang['mode_o_svg']            = 'SVG (slecht toegankelijk, leesbaar)';
+$lang['mode_o_svgaudio']       = 'SVG+Audio (beter toegankelijk, leesbaar)';
 $lang['mode_o_figlet']         = 'Figlet ASCII Art (slechte toegankelijkheid)';
 $lang['forusers']              = 'Ook CAPTCHA voor ingelogde gebruikers gebruiken?';
 $lang['loginprotect']          = 'Vereis een CAPTCHA om in te loggen?';
diff --git a/lib/plugins/captcha/lang/pt-br/lang.php b/lib/plugins/captcha/lang/pt-br/lang.php
index 7a37dd1..1796406 100644
--- a/lib/plugins/captcha/lang/pt-br/lang.php
+++ b/lib/plugins/captcha/lang/pt-br/lang.php
@@ -5,8 +5,8 @@
  * 
  * @author Juliano Marconi Lanigra <juliano.marconi at gmail.com>
  */
-$lang['testfailed']            = 'Desculpe, mas o CAPTCHA não foi preenchido corretamente. Talvez você não seja humano?';
-$lang['fillcaptcha']           = 'Por favor preencha todas as letras dentro da caixa para provar que você é humano.';
+$lang['testfailed']            = 'Desculpe, mas o CAPTCHA não foi respondido corretamente. Talvez você não seja humano?';
+$lang['fillcaptcha']           = 'Por favor digite todas as letras dentro da caixa para provar que você é humano.';
 $lang['fillmath']              = 'Por favor resolva a seguinte equação para provar que você é humano.';
-$lang['soundlink']             = 'Se você não pode ler as letras na imagem, faça o download desse .wav para que elas sejam lidas para você.';
+$lang['soundlink']             = 'Se você não pode ler as letras na imagem, faça o download desse arquivo .wav para que elas sejam lidas para você.';
 $lang['honeypot']              = 'Por favor deixe esse campo em branco:';
diff --git a/lib/plugins/captcha/lang/pt-br/settings.php b/lib/plugins/captcha/lang/pt-br/settings.php
index 01d3e84..207b24e 100644
--- a/lib/plugins/captcha/lang/pt-br/settings.php
+++ b/lib/plugins/captcha/lang/pt-br/settings.php
@@ -5,18 +5,21 @@
  * 
  * @author Juliano Marconi Lanigra <juliano.marconi at gmail.com>
  * @author Oze Projetos <oze at oze.net.br>
+ * @author Moisés Braga Ribeiro <moisesbr at gmail.com>
  */
 $lang['mode']                  = 'Qual tipo de CAPTCHA usar?';
 $lang['mode_o_js']             = 'Texto (pré-preenchido com JavaScript)';
 $lang['mode_o_text']           = 'Texto (somente manual)';
 $lang['mode_o_math']           = 'Problema de Matemática';
-$lang['mode_o_question']       = 'Questão Resolvida';
+$lang['mode_o_question']       = 'Pergunta Fixa';
 $lang['mode_o_image']          = 'Imagem (acessibilidade ruim)';
-$lang['mode_o_audio']          = 'Imagem+Áudio (acessibilidade melhor)';
-$lang['mode_o_figlet']         = 'Figlet ASCII Art (acessibilidade ruim)';
-$lang['forusers']              = 'Também usar CAPTCHA para usuários logados?';
+$lang['mode_o_audio']          = 'Imagem+Áudio (melhor acessibilidade)';
+$lang['mode_o_svg']            = 'SVG (acessibilidade ruim, legível)';
+$lang['mode_o_svgaudio']       = 'SVG+Áudio (melhor acessibilidade, legível)';
+$lang['mode_o_figlet']         = 'Figura de Arte ASCII (acessibilidade ruim)';
+$lang['forusers']              = 'Usar CAPTCHA também para usuários logados?';
 $lang['loginprotect']          = 'Exigir um CAPTCHA para entrar?';
-$lang['lettercount']           = 'Número de letras para usar (3-16). Se você aumentar a quantidade, lembre de também aumentar a largura da imagem abaixo.';
+$lang['lettercount']           = 'Número de letras para usar (3-16). Se você aumentar a quantidade, lembre-se de também aumentar a largura da imagem abaixo.';
 $lang['width']                 = 'Largura da imagem do CAPTCHA (pixel)';
 $lang['height']                = 'Altura da imagem do CAPTCHA (pixel)';
 $lang['question']              = 'Pergunta para o modo de pergunta fixa';
diff --git a/lib/plugins/captcha/lang/uk/lang.php b/lib/plugins/captcha/lang/uk/lang.php
index 898a138..5be5d5e 100644
--- a/lib/plugins/captcha/lang/uk/lang.php
+++ b/lib/plugins/captcha/lang/uk/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Oleksandr Baranyuk <boffin at drivehq.com>
  */
 $lang['testfailed']            = 'Вибачте, ви дали неправильну CAPTCHA-відповідь. Може ви взагалі не людина?';
diff --git a/lib/plugins/captcha/lang/uk/settings.php b/lib/plugins/captcha/lang/uk/settings.php
index 949c615..9bc7ae3 100644
--- a/lib/plugins/captcha/lang/uk/settings.php
+++ b/lib/plugins/captcha/lang/uk/settings.php
@@ -3,6 +3,7 @@
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  *
+ * @author Олексій <alexey.furashev at gmail.com>
  * @author Oleksandr Baranyuk <boffin at drivehq.com>
  */
 $lang['mode']                  = 'Який тип CAPTCHA використати?';
@@ -12,8 +13,11 @@ $lang['mode_o_math']           = 'Математична задача';
 $lang['mode_o_question']       = 'Фіксоване питання';
 $lang['mode_o_image']          = 'Зображення (погана впізнаваність)';
 $lang['mode_o_audio']          = 'Зображення+аудіо (краща впізнаваність)';
+$lang['mode_o_svg']            = 'SVG (погана впізнаваність, читабельний)';
+$lang['mode_o_svgaudio']       = 'SVG+Audio (погана впізнаваність, читабельний)';
 $lang['mode_o_figlet']         = 'Картинка з ASCII-символів (погана впізнаваність)';
 $lang['forusers']              = 'Використовувати CAPTCHA для авторизованих користувачів?';
+$lang['loginprotect']          = 'Використовувати CAPTCHA  для входу?';
 $lang['lettercount']           = 'Кількість символів (3-16). Якщо ви збільшуєте кількість, розширте також картинку нижче.';
 $lang['width']                 = 'Ширина CAPTCHA-зображення (пікселів)';
 $lang['height']                = 'Висота CAPTCHA-зображення (пікселів)';
diff --git a/lib/plugins/captcha/manager.dat b/lib/plugins/captcha/manager.dat
index 68d7c9a..c586e1d 100644
--- a/lib/plugins/captcha/manager.dat
+++ b/lib/plugins/captcha/manager.dat
@@ -1,3 +1,3 @@
 downloadurl=https://github.com/splitbrain/dokuwiki-plugin-captcha/zipball/master
 installed=Sun, 14 Feb 2016 12:17:57 +0100
-updated=Sun, 05 Mar 2017 13:23:20 +0100
+updated=Sat, 03 Mar 2018 17:13:56 +0100
diff --git a/lib/plugins/captcha/plugin.info.txt b/lib/plugins/captcha/plugin.info.txt
index 1b37630..f2350fe 100644
--- a/lib/plugins/captcha/plugin.info.txt
+++ b/lib/plugins/captcha/plugin.info.txt
@@ -1,7 +1,7 @@
 base   captcha
 author Andreas Gohr
 email  andi at splitbrain.org
-date   2017-02-02
+date   2017-12-05
 name   CAPTCHA Plugin
 desc   Use a CAPTCHA challenge to protect DokuWiki against automated spam
 url    http://www.dokuwiki.org/plugin:captcha
diff --git a/lib/plugins/captcha/style.css b/lib/plugins/captcha/style.css
index e29676b..6c0912f 100644
--- a/lib/plugins/captcha/style.css
+++ b/lib/plugins/captcha/style.css
@@ -18,6 +18,7 @@
     display: inline-block;
     background-color: __background__;
     vertical-align: bottom;
+    border: 1px solid __border__;
 }
 
 .dokuwiki #plugin__captcha_wrapper svg {
@@ -32,5 +33,8 @@
 }
 
 .dokuwiki #plugin__captcha_wrapper {
-clear: left;
+    clear: left;
+    border: 1px solid __border__;
+    padding: 0.75em;
+    margin: 1em 0;
 }
diff --git a/lib/plugins/dl/style.css b/lib/plugins/dl/style.css
deleted file mode 100644
index 083fa50..0000000
--- a/lib/plugins/dl/style.css
+++ /dev/null
@@ -1,8 +0,0 @@
-div.dokuwiki dt {
-  font-weight: bold;
-}
-div.dokuwiki dd {
-  margin-left: 20px;
-  margin-top: 0.5em;
-  margin-bottom: 1em;
-}
diff --git a/lib/plugins/dl/syntax.php b/lib/plugins/dl/syntax.php
deleted file mode 100644
index 1d5d979..0000000
--- a/lib/plugins/dl/syntax.php
+++ /dev/null
@@ -1,158 +0,0 @@
-    <?php
-        if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
-    if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
-    require_once(DOKU_PLUGIN.'syntax.php');
-
-    /** Declare Definition List.
-
-        Declares a HTML - Definition-List
-
-        Indentation: First either no indentation, or any number of spaces.
-        Title: Line starts with (optional) spaces and a question mark
-        Definition: Line starts with (opt.) spaces and an exclamation mark
-        End: Multiple lines are allowed, so an empty line declares the end
-        Subdefinitions: Indent more
-
-        Syntax:
-         ? Definition Title
-           Multiple lines are possible
-         ! Definition Description
-         ? Definition Title1
-         ? Definition Title2
-         ! Definition Description1
-         ! Definition Description2
-         ! Definition Description3
-           ? Subdefinition
-           ! Description
-         ! Back
-           ? Again deeper
-
-        License: LGPL
-        */
-    class syntax_plugin_dl extends DokuWiki_Syntax_Plugin {
-
-      function getInfo() {
-        return array('author' => 'Marc Wäckerlin',
-                     'email'  => 'marc [at] waeckerlin [dot-org]',
-                     'name'   => 'Definition List Plugin',
-                     'desc'   => 'HTML Definition List',
-                     'url'    => 'http://marc.waeckerlin.org');
-      }
-
-      function getType() {
-        return 'container';
-      }
-
-      function getAllowedTypes() {
-        return array('container','substition','protected','disabled','formatting','paragraphs');
-      }
-      
-      function getPType() {
-         return 'block';
-      }
-
-      function getSort() {
-        return 10;
-      }
-
-      function connectTo($mode) {
-        $this->Lexer->addEntryPattern('^ *\!', $mode, 'plugin_dl');
-        $this->Lexer->addEntryPattern('^ *\?[^\n]*', $mode, 'plugin_dl');
-      }
-
-      function postConnect() {
-        $this->Lexer->addPattern('\n *\!', 'plugin_dl');
-        $this->Lexer->addPattern('^ *\!', 'plugin_dl');
-        $this->Lexer->addPattern('\n *\?[^\n]*', 'plugin_dl');
-        $this->Lexer->addPattern('^ *\?[^\n]*', 'plugin_dl');
-        $this->Lexer->addExitPattern('\n$', 'plugin_dl');
-      }
-
-      function handle($match, $state, $pos, &$handler){
-        if (($state==DOKU_LEXER_MATCHED ||
-             $state==DOKU_LEXER_ENTER)
-            && ereg('\?', $match)) {
-          $title =
-            htmlspecialchars(ereg_replace("\n* *\?(.*)", '\1', $match));
-          $match = ereg_replace("(\n* *\?).*", '\1', $match);
-        } else {
-          $title = '';
-        }
-        return array($match, $state, $title);
-      }
-
-      function render($format, &$renderer, $data) {
-        static $close = '';
-        static $level = 0;
-        static $last_neesting = 0;
-        static $indent = array();
-        static $dlstart = "\n<dl>";
-        static $dlend = "\n</dl>";
-        static $dtstart = "\n<dt>";
-        static $dtend = "</dt>";
-        static $ddstart = "\n<dd>";
-        static $ddend = "</dd>";
-        list($match, $state, $title) = $data;
-        while ($match[0]=="\n") $match=substr($match, 1);
-        $neesting = strlen($match);
-        if ($state==DOKU_LEXER_MATCHED) {
-          if ($last_neesting<$neesting) {
-            $renderer->doc .= $close.$ddstart.$dlstart;
-            $close = '';
-            $indent[++$level] = $neesting;
-          } else if ($last_neesting>$neesting) {
-            $renderer->doc .= $close.$dlend.($level?$ddend:'');
-            $close = '';
-            while ($level && $indent[--$level]>$neesting)
-              $renderer->doc .= $dlend.($level?$ddend:'');
-          }
-          $last_neesting = $neesting;
-        }
-        switch ($state) {
-          case DOKU_LEXER_ENTER: {
-            $last_neesting = $neesting;
-            if ($level>0) $renderer->doc .= $close;
-            for (; $level>0; --$level)
-              $renderer->doc .= $dlend.($level!=1?$ddend:'');
-            $renderer->doc .= $dlstart;
-            if (ereg('\?', $match)) {
-              $renderer->doc .= $dtstart;
-              $close = $dtend;
-              if ($title!='')
-                $renderer->doc .= '<a name="'.$title.'"></a>'.$title;
-            } else if (ereg('!', $match)) {
-              $renderer->doc .= $ddstart;
-              $close = $ddend;
-            } else return false;
-            $indent[++$level] = $neesting;
-          } return true;
-          case DOKU_LEXER_EXIT: {
-            $renderer->doc .= $close;
-            for (; $level>0; --$level)
-              $renderer->doc .= $dlend.($level!=1?$ddend:'');
-            $renderer->doc .= "\n";
-          } return true;
-          case DOKU_LEXER_MATCHED: {
-            if (ereg('\?', $match)) {
-              $renderer->doc .= $close;
-              $renderer->doc .= $dtstart;
-              $close = $dtend;
-              if ($title!='')
-                $renderer->doc .= '<a class="target" name="'
-                  .$title.'"></a>'.$title;
-            } else if (ereg('!', $match)) {
-
-              $renderer->doc .= $close;
-              $renderer->doc .= $ddstart;
-              $close = $ddend;
-            } else return false;
-          } return true;
-          case DOKU_LEXER_UNMATCHED: {
-            $renderer->doc .= htmlspecialchars($match);
-          } return true;
-        }
-        return false;
-      }
-    }
-    ?>
-
diff --git a/lib/plugins/loglog/lang/eo/intro.txt b/lib/plugins/loglog/lang/eo/intro.txt
index 0382fcb..48567b0 100644
--- a/lib/plugins/loglog/lang/eo/intro.txt
+++ b/lib/plugins/loglog/lang/eo/intro.txt
@@ -1,3 +1,3 @@
 ====== Semajnaj en/elsalutoj de uzantoj ======
 
-Tiu paĝo montras ĉiujn en- kaj elsalutojn de uzantoj dum la pasintaj 7 tagoj. Vi povas uzi la navigadajn butonojn sube por montri pli fruajn semajnojn.
\ No newline at end of file
+Tiu ĉi paĝo montras ĉiujn en- kaj elsalutojn de uzantoj dum la pasintaj 7 tagoj. Vi povas uzi la navigbutonojn sube por montri pli fruajn semajnojn.
\ No newline at end of file
diff --git a/lib/plugins/loglog/lang/eo/lang.php b/lib/plugins/loglog/lang/eo/lang.php
index 2936772..cca98c4 100644
--- a/lib/plugins/loglog/lang/eo/lang.php
+++ b/lib/plugins/loglog/lang/eo/lang.php
@@ -2,15 +2,17 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Robert Bogenschneider <bogi at uea.org>
+ * @author Moisés Braga Ribeiro <moisesbr at gmail.com>
  */
 $lang['menu']                  = 'Semajnaj en/elsalutoj de uzantoj';
 $lang['date']                  = 'Dato';
 $lang['ip']                    = 'IP-adreso';
-$lang['action']                = 'Agado';
-$lang['range']                 = 'Montrata dato-periodo:';
+$lang['action']                = 'Ago';
+$lang['range']                 = 'Montrata dat-amplekso:';
 $lang['off']                   = 'elsalutinta';
+$lang['autologoff']            = 'elsalutinta aŭtomate';
 $lang['in']                    = 'ensalutinta konstante';
 $lang['tin']                   = 'ensalutinta portempe';
 $lang['fail']                  = 'malsukcesa provo ensaluti';
diff --git a/lib/plugins/loglog/manager.dat b/lib/plugins/loglog/manager.dat
index 5a90ae5..ecce0fb 100644
--- a/lib/plugins/loglog/manager.dat
+++ b/lib/plugins/loglog/manager.dat
@@ -1,2 +1,3 @@
 downloadurl=https://github.com/splitbrain/dokuwiki-plugin-loglog/zipball/master
 installed=Sun, 05 Mar 2017 13:11:17 +0100
+updated=Sat, 30 Sep 2017 21:45:11 +0200
diff --git a/lib/plugins/loglog/plugin.info.txt b/lib/plugins/loglog/plugin.info.txt
index e015e14..ae038bb 100644
--- a/lib/plugins/loglog/plugin.info.txt
+++ b/lib/plugins/loglog/plugin.info.txt
@@ -1,7 +1,7 @@
 base    loglog
 author  Andreas Gohr
 email   dokuwiki at cosmocode.de
-date    2016-02-03
+date    2017-02-08
 name    Login/Logout logging plugin
 desc    Log logins and logouts of users to a file
 url     http://www.dokuwiki.org/plugin:loglog
diff --git a/lib/plugins/redirect/action.php b/lib/plugins/redirect/action.php
index f8261d0..c7bafd8 100644
--- a/lib/plugins/redirect/action.php
+++ b/lib/plugins/redirect/action.php
@@ -9,46 +9,47 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
-require_once(DOKU_PLUGIN.'action.php');
-
+/**
+ * Class action_plugin_redirect
+ *
+ * Execute redirects
+ */
 class action_plugin_redirect extends DokuWiki_Action_Plugin {
 
     /**
      * register the eventhandlers
+     *
+     * @param Doku_Event_Handler $controller
      */
-    function register(Doku_Event_Handler $controller){
-        $controller->register_hook('DOKUWIKI_STARTED',
-                                   'AFTER',
-                                   $this,
-                                   'handle_start',
-                                   array());
+    public function register(Doku_Event_Handler $controller) {
+        $controller->register_hook(
+            'DOKUWIKI_STARTED',
+            'AFTER',
+            $this,
+            'handle_start',
+            array()
+        );
     }
 
     /**
      * handle event
+     *
+     * @param Doku_Event $event
+     * @param array $param
      */
-    function handle_start(&$event, $param){
+    public function handle_start(Doku_Event $event, $param) {
         global $ID;
         global $ACT;
+        global $INPUT;
 
         if($ACT != 'show') return;
+        if($INPUT->get->str('redirect') == 'no') return;
 
-        $redirects = confToHash(dirname(__FILE__).'/redirect.conf');
-        if($redirects[$ID]){
-            if(preg_match('/^https?:\/\//',$redirects[$ID])){
-                send_redirect($redirects[$ID]);
-            }else{
-                if($this->getConf('showmsg')){
-                    msg(sprintf($this->getLang('redirected'),hsc($ID)));
-                }
-                $link = explode('#', $redirects[$ID], 2);
-                send_redirect(wl($link[0] ,'',true) . '#' . rawurlencode($link[1]));
-            }
-            exit;
-        }
+        /** @var helper_plugin_redirect $hlp */
+        $hlp = plugin_load('helper', 'redirect');
+        $url = $hlp->getRedirectURL($ID);
+        if($url) send_redirect($url);
     }
 
-
 }
 
diff --git a/lib/plugins/redirect/admin.php b/lib/plugins/redirect/admin.php
index 9953928..d2362a1 100644
--- a/lib/plugins/redirect/admin.php
+++ b/lib/plugins/redirect/admin.php
@@ -1,44 +1,60 @@
 <?php
+/**
+ * Redirect plugin
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi at splitbrain.org>
+ */
+
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
-require_once(DOKU_PLUGIN.'admin.php');
-
 /**
- * All DokuWiki plugins to extend the admin function
- * need to inherit from this class
+ * Class admin_plugin_redirect
+ *
+ * Provide editing mechanism for configuration
  */
 class admin_plugin_redirect extends DokuWiki_Admin_Plugin {
 
+    /** @var helper_plugin_redirect */
+    protected $hlp;
+
+    /**
+     * admin_plugin_redirect constructor.
+     */
+    public function __construct() {
+        $this->hlp = plugin_load('helper', 'redirect');
+    }
+
     /**
      * Access for managers allowed
      */
-    function forAdminOnly(){
+    public function forAdminOnly() {
         return false;
     }
 
     /**
      * return sort order for position in admin menu
      */
-    function getMenuSort() {
+    public function getMenuSort() {
         return 140;
     }
 
     /**
      * return prompt for admin menu
      */
-    function getMenuText($language) {
+    public function getMenuText($language) {
         return $this->getLang('name');
     }
 
     /**
      * handle user request
      */
-    function handle() {
-        if($_POST['redirdata']){
-            if(io_saveFile(dirname(__FILE__).'/redirect.conf',cleanText($_POST['redirdata']))){
-                msg($this->getLang('saved'),1);
+    public function handle() {
+        global $INPUT;
+        if($INPUT->post->has('redirdata')) {
+            if($this->hlp->saveConfigFile($INPUT->post->str('redirdata'))) {
+                msg($this->getLang('saved'), 1);
             }
         }
     }
@@ -46,18 +62,17 @@ class admin_plugin_redirect extends DokuWiki_Admin_Plugin {
     /**
      * output appropriate html
      */
-    function html() {
+    public function html() {
         global $lang;
         echo $this->locale_xhtml('intro');
         echo '<form action="" method="post" >';
         echo '<input type="hidden" name="do" value="admin" />';
         echo '<input type="hidden" name="page" value="redirect" />';
         echo '<textarea class="edit" rows="15" cols="80" style="height: 300px" name="redirdata">';
-        echo formtext(io_readFile(dirname(__FILE__).'/redirect.conf'));
+        echo formtext($this->hlp->loadConfigFile());
         echo '</textarea><br />';
-        echo '<input type="submit" value="'.$lang['btn_save'].'" class="button" />';
+        echo '<input type="submit" value="' . $lang['btn_save'] . '" class="button" />';
         echo '</form>';
     }
 
 }
-//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/lib/plugins/redirect/lang/de/intro.txt b/lib/plugins/redirect/lang/de/intro.txt
index 520da20..a8a1cfc 100644
--- a/lib/plugins/redirect/lang/de/intro.txt
+++ b/lib/plugins/redirect/lang/de/intro.txt
@@ -1,3 +1,11 @@
 ====== Redirect Konfiguration ======
 
-Hier kannst du die Weiterleitungen für dein Wiki einstellen. Du kannst zu externen Webseiten oder Wikiseiten weiterleiten. Alle angaben müssen absolut sein. Wiki IDs dürfen keine Sonderzeichen enthalten, kleingeschrieben und den kompletten Namensraum angeben. Der Raute bei einem Seitenanker muss ein \ vorangestellt sein (\#).
\ No newline at end of file
+Hier können Sie Weiterleitungen für Wiki-Seiten konfigurieren. Sie können zu externen Webseiten oder Wikiseiten weiterleiten. Alle Angaben müssen absolut sein. Wiki-IDs dürfen keine Sonderzeichen enthalten und müssen kleingeschrieben werden. Es muss immer der komplette Namensraum angeben werden. Der Raute bei einem Seitenanker muss ein \ vorangestellt sein (\#).
+
+Nutzen Sie das folgende Format:
+
+<code>
+pagename    internalpage
+otherpage   http://example.com
+somepage    internalpage\#headline
+</code>
diff --git a/lib/plugins/redirect/lang/de/lang.php b/lib/plugins/redirect/lang/de/lang.php
index 8185704..52314f2 100644
--- a/lib/plugins/redirect/lang/de/lang.php
+++ b/lib/plugins/redirect/lang/de/lang.php
@@ -2,9 +2,10 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Dominik Eckelmann <deckelmann at gmail.com>
+ * @author Andreas Gohr <andi at splitbrain.org>
  */
 $lang['name']                  = 'Einstellung für Seitenweiterleitungen';
 $lang['saved']                 = 'Daten gespeichert.';
-$lang['redirected']            = 'Du wurdest von <b>%s</b> weitergeleitet.';
+$lang['redirected']            = 'Sie wurden von <b>%s</b> weitergeleitet.';
diff --git a/lib/plugins/redirect/lang/de/settings.php b/lib/plugins/redirect/lang/de/settings.php
index 0c6ebac..cf2a2aa 100644
--- a/lib/plugins/redirect/lang/de/settings.php
+++ b/lib/plugins/redirect/lang/de/settings.php
@@ -2,7 +2,8 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
+ *
  * @author Dominik Eckelmann <deckelmann at gmail.com>
+ * @author Andreas Gohr <andi at splitbrain.org>
  */
-$lang['showmsg']               = 'Zeige dem Benutzer eine Information über die Weiterleitung an.';
+$lang['showmsg']               = 'Nutzer bei Weiterleitungen informieren';
diff --git a/lib/plugins/redirect/lang/en/intro.txt b/lib/plugins/redirect/lang/en/intro.txt
index 31f335e..b2260c2 100644
--- a/lib/plugins/redirect/lang/en/intro.txt
+++ b/lib/plugins/redirect/lang/en/intro.txt
@@ -1,9 +1,6 @@
 ====== Redirect Configuration ======
 
-Here you can set up redirects for your wiki. You can redirect to external
-websites or pages in the wiki. All given pagenames have to be absolute
-and cleaned (no specialchars, all lowercase, full namespaces).
-Anchor hash must be escaped with a \.
+Here you can set up redirects for your wiki. You can redirect to external websites or pages in the wiki. All given pagenames have to be absolute and cleaned (no specialchars, all lowercase, full namespaces). Anchor hash must be escaped with a \.
 
 Use the following format:
 
diff --git a/lib/plugins/redirect/manager.dat b/lib/plugins/redirect/manager.dat
index ed44968..6e2006d 100644
--- a/lib/plugins/redirect/manager.dat
+++ b/lib/plugins/redirect/manager.dat
@@ -1,3 +1,3 @@
 downloadurl=https://github.com/splitbrain/dokuwiki-plugin-redirect/zipball/master
 installed=Tue, 25 Nov 2014 17:53:25 +0100
-updated=Sun, 05 Mar 2017 13:36:58 +0100
+updated=Sat, 03 Mar 2018 17:16:17 +0100
diff --git a/lib/plugins/redirect/plugin.info.txt b/lib/plugins/redirect/plugin.info.txt
index cf876bf..cc445bf 100644
--- a/lib/plugins/redirect/plugin.info.txt
+++ b/lib/plugins/redirect/plugin.info.txt
@@ -1,7 +1,7 @@
 base   redirect
 author Andreas Gohr
 email  andi at splitbrain.org
-date   2016-02-03
+date   2017-11-05
 name   Redirect Plugin
 desc   Redirect page access based on a central redirection list
 url    http://www.dokuwiki.org/plugin:redirect
diff --git a/lib/plugins/translation/action.php b/lib/plugins/translation/action.php
index 80f82ab..f3ed91b 100644
--- a/lib/plugins/translation/action.php
+++ b/lib/plugins/translation/action.php
@@ -10,9 +10,9 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
-if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
-require_once(DOKU_PLUGIN . 'action.php');
-
+/**
+ * Class action_plugin_translation
+ */
 class action_plugin_translation extends DokuWiki_Action_Plugin {
 
     /**
@@ -31,7 +31,9 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
     }
 
     /**
-     * Register the events
+     * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller
      */
     function register(Doku_Event_Handler $controller) {
         $scriptName = basename($_SERVER['PHP_SELF']);
@@ -59,6 +61,7 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
 
         if($scriptName !== 'js.php' && $scriptName !== 'ajax.php') {
             $controller->register_hook('DOKUWIKI_STARTED', 'BEFORE', $this, 'translation_hook');
+            $controller->register_hook('DETAIL_STARTED', 'BEFORE', $this, 'translation_hook');
             $controller->register_hook('MEDIAMANAGER_STARTED', 'BEFORE', $this, 'translation_hook');
         }
 
@@ -70,10 +73,10 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
      * Hook Callback. Make current language available as page template placeholder and handle
      * original language copying
      *
-     * @param $event
+     * @param Doku_Event $event
      * @param $args
      */
-    function page_template_replacement(&$event, $args) {
+    function page_template_replacement(Doku_Event $event, $args) {
         global $ID;
 
         // load orginal content as template?
@@ -121,10 +124,10 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
     /**
      * Hook Callback. Load correct translation when loading JavaScript
      *
-     * @param $event
+     * @param Doku_Event $event
      * @param $args
      */
-    function translation_js(&$event, $args) {
+    function translation_js(Doku_Event $event, $args) {
         global $conf;
         if(!isset($_GET['lang'])) return;
         if(!in_array($_GET['lang'], $this->helper->translations)) return;
@@ -136,11 +139,11 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
     /**
      * Hook Callback. Pass language code to JavaScript dispatcher
      *
-     * @param $event
+     * @param Doku_Event $event
      * @param $args
      * @return bool
      */
-    function setJsCacheKey(&$event, $args) {
+    function setJsCacheKey(Doku_Event $event, $args) {
         if(!isset($this->locale)) return false;
         $count = count($event->data['script']);
         for($i = 0; $i < $count; $i++) {
@@ -155,10 +158,10 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
     /**
      * Hook Callback. Make sure the JavaScript is translation dependent
      *
-     * @param $event
+     * @param Doku_Event $event
      * @param $args
      */
-    function translation_jscache(&$event, $args) {
+    function translation_jscache(Doku_Event $event, $args) {
         if(!isset($_GET['lang'])) return;
         if(!in_array($_GET['lang'], $this->helper->translations)) return;
 
@@ -182,10 +185,10 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
     /**
      * Hook Callback. Translate the AJAX loaded media manager
      *
-     * @param $event
+     * @param Doku_Event $event
      * @param $args
      */
-    function translate_media_manager(&$event, $args) {
+    function translate_media_manager(Doku_Event $event, $args) {
         global $conf;
         if(isset($_REQUEST['ID'])) {
             $id = getID();
@@ -203,18 +206,25 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
 
     /**
      * Hook Callback. Change the UI language in foreign language namespaces
+     *
+     * @param Doku_Event $event
+     * @param $args
+     * @return bool
      */
-    function translation_hook(&$event, $args) {
+    function translation_hook(Doku_Event $event, $args) {
         global $ID;
+        /** @noinspection PhpUnusedLocalVariableInspection we include the language file later on */
         global $lang;
         global $conf;
         global $ACT;
         // redirect away from start page?
-        if($this->conf['redirectstart'] && $ID == $conf['start'] && $ACT == 'show') {
+        if($this->getConf('redirectstart') && $ID == $conf['start'] && $ACT == 'show') {
             $lc = $this->helper->getBrowserLang();
-            if(!$lc) $lc = $conf['lang'];
-            header('Location: ' . wl($lc . ':' . $conf['start'], '', true, '&'));
-            exit;
+
+            list($translatedStartpage,) = $this->helper->buildTransID($lc, $conf['start']);
+            if (cleanID($translatedStartpage) !== cleanID($ID)) {
+                send_redirect(wl($translatedStartpage, '', true));
+            }
         }
 
         // check if we are in a foreign language namespace
@@ -225,7 +235,7 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
             $_SESSION[DOKU_COOKIE]['translationlc'] = $lc;
         }
         if(!$lc) $lc = $_SESSION[DOKU_COOKIE]['translationlc'];
-        if(!$lc) return;
+        if(!$lc) return false;
         $this->locale = $lc;
 
         if(!$this->getConf('translateui')) {
@@ -244,8 +254,11 @@ class action_plugin_translation extends DokuWiki_Action_Plugin {
     /**
      * Hook Callback.  Resort page match results so that results are ordered by translation, having the
      * default language first
+     *
+     * @param Doku_Event $event
+     * @param $args
      */
-    function translation_search(&$event, $args) {
+    function translation_search(Doku_Event $event, $args) {
 
         if($event->data['has_titles']) {
             // sort into translation slots
diff --git a/lib/plugins/translation/helper.php b/lib/plugins/translation/helper.php
index ddbf528..b2151ed 100644
--- a/lib/plugins/translation/helper.php
+++ b/lib/plugins/translation/helper.php
@@ -9,6 +9,9 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
+/**
+ * Class helper_plugin_translation
+ */
 class helper_plugin_translation extends DokuWiki_Plugin {
     var $translations = array();
     var $translationNs = '';
@@ -24,10 +27,7 @@ class helper_plugin_translation extends DokuWiki_Plugin {
         require_once(DOKU_INC . 'inc/pageutils.php');
         require_once(DOKU_INC . 'inc/utf8.php');
 
-        // load wanted translation into array
-        $this->translations = strtolower(str_replace(',', ' ', $this->getConf('translations')));
-        $this->translations = array_unique(array_filter(explode(' ', $this->translations)));
-        sort($this->translations);
+        $this->loadTranslationNamespaces();
 
         // load language names
         $this->LN = confToHash(dirname(__FILE__) . '/lang/langnames.txt');
@@ -56,7 +56,20 @@ class helper_plugin_translation extends DokuWiki_Plugin {
     }
 
     /**
+     * Parse 'translations'-setting into $this->translations
+     */
+    public function loadTranslationNamespaces() {
+        // load wanted translation into array
+        $this->translations = strtolower(str_replace(',', ' ', $this->getConf('translations')));
+        $this->translations = array_unique(array_filter(explode(' ', $this->translations)));
+        sort($this->translations);
+    }
+
+    /**
      * Check if the given ID is a translation and return the language code.
+     *
+     * @param string $id
+     * @return string
      */
     function getLangPart($id) {
         list($lng) = $this->getTransParts($id);
@@ -66,6 +79,9 @@ class helper_plugin_translation extends DokuWiki_Plugin {
     /**
      * Check if the given ID is a translation and return the language code and
      * the id part.
+     *
+     * @param string $id
+     * @return array
      */
     function getTransParts($id) {
         $rx = '/^' . $this->translationNs . '(' . join('|', $this->translations) . '):(.*)/';
@@ -80,7 +96,12 @@ class helper_plugin_translation extends DokuWiki_Plugin {
      * languages
      */
     function getBrowserLang() {
-        $rx = '/(^|,|:|;|-)(' . join('|', $this->translations) . ')($|,|:|;|-)/i';
+        global $conf;
+        $langs = $this->translations;
+        if (!in_array($conf['lang'], $langs)) {
+            $langs[] = $conf['lang'];
+        }
+        $rx = '/(^|,|:|;|-)(' . join('|', $langs) . ')($|,|:|;|-)/i';
         if(preg_match($rx, $_SERVER['HTTP_ACCEPT_LANGUAGE'], $match)) {
             return strtolower($match[2]);
         }
@@ -90,10 +111,13 @@ class helper_plugin_translation extends DokuWiki_Plugin {
     /**
      * Returns the ID and name to the wanted translation, empty
      * $lng is default lang
+     *
+     * @param string $lng
+     * @param string $idpart
+     * @return array
      */
     function buildTransID($lng, $idpart) {
-        global $conf;
-        if($lng) {
+        if($lng && in_array($lng, $this->translations)) {
             $link = ':' . $this->translationNs . $lng . ':' . $idpart;
             $name = $lng;
         } else {
@@ -106,6 +130,9 @@ class helper_plugin_translation extends DokuWiki_Plugin {
     /**
      * Returns the real language code, even when an empty one is given
      * (eg. resolves th default language)
+     *
+     * @param string $lc
+     * @return string
      */
     function realLC($lc) {
         global $conf;
@@ -121,6 +148,10 @@ class helper_plugin_translation extends DokuWiki_Plugin {
     /**
      * Check if current ID should be translated and any GUI
      * should be shown
+     *
+     * @param string $id
+     * @param bool   $checkact
+     * @return bool
      */
     function istranslatable($id, $checkact = true) {
         global $ACT;
@@ -140,15 +171,13 @@ class helper_plugin_translation extends DokuWiki_Plugin {
      */
     function showAbout() {
         global $ID;
-        global $conf;
-        global $INFO;
 
         $curlc = $this->getLangPart($ID);
 
         $about = $this->getConf('about');
         if($this->getConf('localabout')) {
-            list($lc, $idpart) = $this->getTransParts($about);
-            list($about, $name) = $this->buildTransID($curlc, $idpart);
+            list(/* $lc */, $idpart) = $this->getTransParts($about);
+            list($about, /* $name */) = $this->buildTransID($curlc, $idpart);
             $about = cleanID($about);
         }
 
@@ -170,7 +199,6 @@ class helper_plugin_translation extends DokuWiki_Plugin {
         $result = array();
 
         list($lc, $idpart) = $this->getTransParts($id);
-        $lang = $this->realLC($lc);
 
         foreach($this->translations as $t) {
             if($t == $lc) continue; //skip self
@@ -308,6 +336,8 @@ class helper_plugin_translation extends DokuWiki_Plugin {
         }
 
         // flag
+        $flag = false;
+        $style = '';
         if(isset($this->opts['flag'])) {
             $flag = DOKU_BASE . 'lib/plugins/translation/flags/' . hsc($lang) . '.gif';
             $style = ' style="background-image: url(\'' . $flag . '\')"';
@@ -362,12 +392,13 @@ class helper_plugin_translation extends DokuWiki_Plugin {
         $idpart = preg_replace($rx, '', $ID);
 
         // compare modification times
-        list($orig, $name) = $this->buildTransID($this->defaultlang, $idpart);
+        list($orig, /* $name */) = $this->buildTransID($this->defaultlang, $idpart);
         $origfn = wikiFN($orig);
         if($INFO['lastmod'] >= @filemtime($origfn)) return;
 
         // get revision from before translation
         $orev = 0;
+
         $changelog = new PageChangelog($orig);
         $revs = $changelog->getRevisions(0, 100);
         foreach($revs as $rev) {
diff --git a/lib/plugins/translation/lang/de-informal/lang.php b/lib/plugins/translation/lang/de-informal/lang.php
index e402a02..1bdd259 100644
--- a/lib/plugins/translation/lang/de-informal/lang.php
+++ b/lib/plugins/translation/lang/de-informal/lang.php
@@ -1,3 +1,7 @@
 <?php
 
-$lang['translations'] = 'Übersetzungen dieser Seite';
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ */
+$lang['translations']          = 'Übersetzungen dieser Seite';
diff --git a/lib/plugins/translation/lang/de-informal/settings.php b/lib/plugins/translation/lang/de-informal/settings.php
index 4ad65b9..6084ced 100644
--- a/lib/plugins/translation/lang/de-informal/settings.php
+++ b/lib/plugins/translation/lang/de-informal/settings.php
@@ -1,13 +1,17 @@
 <?php
 
-$lang['translations']  = 'Liste der Sprachen (ISO codes), mittels Leerzeichen separiert. Die Default-Sprache nicht angeben.';
-$lang['translationns'] = 'Wenn die Übersetzung nur unterhalb eines Namensraumes gelten soll, diesen hier angeben.';
-$lang['skiptrans']     = 'Wenn der Seitennamen dem regulären Ausdruck entspricht, dann den Sprachumschalter nicht anzeigen.';
-$lang['dropdown']      = 'Eine Auswahlliste benutzen, um die Übersetzungen anzuzeigen (zu bevorzugen bei mehr als fünf Sprachen).';
-$lang['translateui']   = 'Soll die Sprache der Benutzerschnittstelle auch in die jeweilige Fremdspache umgeschaltet werden?';
-$lang['redirectstart'] = 'Anhand des Browsers des Benutzers erkennen, welche Sprache angezeigt werden soll. (Startseite leitet in den passenden Namensraum um).';
-$lang['about']         = 'Gebe hier eine Seite an, welche den Mechanismus der Übersetzung erklärt. Sie wird vom Sprachumschalter verlinkt.';
-$lang['localabout']    = 'Sprachspezifische Versionen der oben angegebenen Seite (anstelle einer globalen) nutzen.';
-$lang['checkage']      = 'Warnungen von möglicherweise veralteten Übersetzungen anzeigen.';
-$lang['display']       = 'Gebe hier an welches/r Symbol/Text im Sprachumschalter angezeigt werden soll. (Die Nutzung von länderspezifischen Flaggen wird aus Gründen der Benutzbarkeit nicht empfohlen.)';
-
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *
+ * @author Felix <j.felix at mueller-donath.de>
+ */
+$lang['translations']          = 'Liste der Sprachen (ISO codes), mittels Leerzeichen separiert. Die Default-Sprache nicht angeben.';
+$lang['translationns']         = 'Wenn die Übersetzung nur unterhalb eines Namensraumes gelten soll, diesen hier angeben.';
+$lang['skiptrans']             = 'Wenn der Seitennamen dem regulären Ausdruck entspricht, dann den Sprachumschalter nicht anzeigen.';
+$lang['dropdown']              = 'Eine Auswahlliste benutzen, um die Übersetzungen anzuzeigen (zu bevorzugen bei mehr als fünf Sprachen).';
+$lang['translateui']           = 'Soll die Sprache der Benutzerschnittstelle auch in die jeweilige Fremdspache umgeschaltet werden?';
+$lang['redirectstart']         = 'Anhand des Browsers des Benutzers erkennen, welche Sprache angezeigt werden soll. (Startseite leitet in den passenden Namensraum um).';
+$lang['about']                 = 'Gebe hier eine Seite an, welche den Mechanismus der Übersetzung erklärt. Sie wird vom Sprachumschalter verlinkt.';
+$lang['localabout']            = 'Sprachspezifische Versionen der oben angegebenen Seite (anstelle einer globalen) nutzen.';
+$lang['checkage']              = 'Warnungen von möglicherweise veralteten Übersetzungen anzeigen.';
+$lang['display']               = 'Gib hier an welches/r Symbol/Text im Sprachumschalter angezeigt werden soll. (Die Nutzung von länderspezifischen Flaggen wird aus Gründen der Benutzbarkeit nicht empfohlen.)';
diff --git a/lib/plugins/translation/lang/uk/settings.php b/lib/plugins/translation/lang/uk/settings.php
index 11e87a0..d6ee3cd 100644
--- a/lib/plugins/translation/lang/uk/settings.php
+++ b/lib/plugins/translation/lang/uk/settings.php
@@ -15,4 +15,3 @@ $lang['about']         = 'Введіть тут ім\'я сторінки, на
 $lang['localabout']    = 'Використовувати локалізовану версію сторінки роз\'яснень (замість однієї глобальної сторінки роз\'яснень).';
 $lang['checkage']      = 'Відображувати попередження про можливу не актуальність перекладу сторінок?';
 $lang['display']       = 'Оберіть що б ви хотіли відображувати в перемикачі мов. Примітка: використовувати прапор країни для перемикача мов не рекомендується експертами по зручності використання інтерфейсу.';
-?>
diff --git a/lib/plugins/translation/manager.dat b/lib/plugins/translation/manager.dat
index 28a2043..d8ce31c 100644
--- a/lib/plugins/translation/manager.dat
+++ b/lib/plugins/translation/manager.dat
@@ -1,3 +1,3 @@
 downloadurl=https://github.com/splitbrain/dokuwiki-plugin-translation/zipball/master
 installed=Tue, 25 Nov 2014 17:52:25 +0100
-updated=Sun, 05 Mar 2017 13:40:48 +0100
+updated=Sat, 30 Sep 2017 21:47:48 +0200
diff --git a/lib/plugins/translation/plugin.info.txt b/lib/plugins/translation/plugin.info.txt
index 14ea71f..23b4b8f 100644
--- a/lib/plugins/translation/plugin.info.txt
+++ b/lib/plugins/translation/plugin.info.txt
@@ -2,7 +2,7 @@
 base   translation
 author Andreas Gohr
 email  andi at splitbrain.org
-date   2016-09-07
+date   2017-06-13
 name   Translation Plugin
 desc   Supports the easy setup of a multi-language wiki.
 url    http://www.dokuwiki.org/plugin:translation
diff --git a/lib/plugins/translation/syntax/notrans.php b/lib/plugins/translation/syntax/notrans.php
index b8cb9cd..0d04671 100644
--- a/lib/plugins/translation/syntax/notrans.php
+++ b/lib/plugins/translation/syntax/notrans.php
@@ -8,10 +8,14 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
+/**
+ * Class syntax_plugin_translation_notrans
+ */
 class syntax_plugin_translation_notrans extends DokuWiki_Syntax_Plugin {
 
     /**
      * for th helper plugin
+     * @var helper_plugin_translation
      */
     var $hlp = null;
 
@@ -19,7 +23,7 @@ class syntax_plugin_translation_notrans extends DokuWiki_Syntax_Plugin {
      * Constructor. Load helper plugin
      */
     function __construct(){
-        $this->hlp =& plugin_load('helper', 'translation');
+        $this->hlp = plugin_load('helper', 'translation');
     }
 
     /**
@@ -36,17 +40,23 @@ class syntax_plugin_translation_notrans extends DokuWiki_Syntax_Plugin {
         return 155;
     }
 
-
     /**
      * Connect pattern to lexer
+     *
+     * @param string $mode
      */
     function connectTo($mode) {
         $this->Lexer->addSpecialPattern('~~NOTRANS~~',$mode,'plugin_translation_notrans');
     }
 
-
     /**
-     * Handle the match
+     * Handler to prepare matched data for the rendering process
+     *
+     * @param   string       $match   The text matched by the patterns
+     * @param   int          $state   The lexer state for the match
+     * @param   int          $pos     The character position of the matched text
+     * @param   Doku_Handler $handler The Doku_Handler object
+     * @return  bool|array Return an array with all data you want to use in render, false don't add an instruction
      */
     function handle($match, $state, $pos, Doku_Handler $handler){
         return array('notrans');
@@ -54,16 +64,25 @@ class syntax_plugin_translation_notrans extends DokuWiki_Syntax_Plugin {
 
     /**
      * Create output
+     *
+     * @param string $format
+     * @param Doku_Renderer $renderer
+     * @param array $data
+     * @return bool
      */
     function render($format, Doku_Renderer $renderer, $data) {
         // store info in metadata
         if($format == 'metadata'){
+            /** @var Doku_Renderer_metadata $renderer */
             $renderer->meta['plugin']['translation']['notrans'] = true;
         }
         return false;
     }
 
     // for backward compatibility
+    /**
+     * @return string
+     */
     function _showTranslations(){
         return $this->hlp->showTranslations();
     }
diff --git a/lib/plugins/translation/syntax/trans.php b/lib/plugins/translation/syntax/trans.php
index bbd4645..152276e 100644
--- a/lib/plugins/translation/syntax/trans.php
+++ b/lib/plugins/translation/syntax/trans.php
@@ -8,6 +8,9 @@
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
+/**
+ * Class syntax_plugin_translation_trans
+ */
 class syntax_plugin_translation_trans extends DokuWiki_Syntax_Plugin {
     /**
      * What kind of syntax are we?
@@ -25,24 +28,36 @@ class syntax_plugin_translation_trans extends DokuWiki_Syntax_Plugin {
 
     /**
      * Connect pattern to lexer
+     *
+     * @param string $mode
      */
     function connectTo($mode) {
         $this->Lexer->addSpecialPattern('~~TRANS~~', $mode, 'plugin_translation_trans');
     }
 
     /**
-     * Handle the match
+     * Handler to prepare matched data for the rendering process
+     *
+     * @param   string       $match   The text matched by the patterns
+     * @param   int          $state   The lexer state for the match
+     * @param   int          $pos     The character position of the matched text
+     * @param   Doku_Handler $handler The Doku_Handler object
+     * @return  bool|array Return an array with all data you want to use in render, false don't add an instruction
      */
     function handle($match, $state, $pos, Doku_Handler $handler) {
         return array();
     }
 
     /**
-     * Create output
+     * Handles the actual output creation.
+     *
+     * @param string          $format   output format being rendered
+     * @param Doku_Renderer   $renderer the current renderer object
+     * @param array           $data     data created by handler()
+     * @return  boolean                 rendered correctly? (however, returned value is not used at the moment)
      */
     function render($format, Doku_Renderer $renderer, $data) {
         if($format != 'xhtml') return false;
-
         // disable caching
         $renderer->nocache();
 
diff --git a/lib/tpl/xfce/main.php b/lib/tpl/xfce/main.php
index 79ba544..34c70ff 100644
--- a/lib/tpl/xfce/main.php
+++ b/lib/tpl/xfce/main.php
@@ -23,7 +23,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
     <?php tpl_includeFile('meta.html') ?>
-	<link rel="stylesheet" media="screen" href="https://www.xfce.org/style/css.php?site=wiki" type="text/css" />
+	<link rel="stylesheet" media="screen" href="https://xfce.org/style/css.php?site=wiki" type="text/css" />
 </head>
 
 <body>
diff --git a/lib/tpl/xfce/tpl_footer.php b/lib/tpl/xfce/tpl_footer.php
index 35a80a4..5396fa9 100644
--- a/lib/tpl/xfce/tpl_footer.php
+++ b/lib/tpl/xfce/tpl_footer.php
@@ -8,35 +8,34 @@ if (!defined('DOKU_INC')) die();
 ?>
 
 <!-- ********** FOOTER ********** -->
-<div id="dokuwiki__footer">
+<div class="bars">
+	<div class="bar-left">
+		<?php tpl_button('edit')?>
+		<?php tpl_button('history')?>
+		<?php tpl_button('recent')?>
+		<?php tpl_button('index')?>
+		<?php tpl_button('revert')?>
+		<?php tpl_button('media')?>
+	</div>
+	<div class="bar-right">
+		<?php tpl_button('subscribe')?>
+		<?php tpl_button('admin')?>
+		<?php tpl_button('profile')?>
+		<?php tpl_button('login')?>
+		<?php tpl_button('top')?>
+	</div>
+</div>
 
-    <div class="bar" id="footertools">
-      <div class="bar-left">
-        <?php tpl_button('edit')?>
-        <?php tpl_button('history')?>
-        <?php tpl_button('recent')?>
-        <?php tpl_button('index')?>
-        <?php tpl_button('revert')?>
-        <?php tpl_button('media')?>
-      </div>
-      <div class="bar-right">
-        <?php tpl_button('subscribe')?>
-        <?php tpl_button('admin')?>
-        <?php tpl_button('profile')?>
-        <?php tpl_button('login')?>
-        <?php tpl_button('top')?>
-      </div>
-      <hr class="a11y" />
-    </div>
+<hr class="a11y" />
 
-    <div class="pad">
-        <?php tpl_license(''); // license text ?>
+<div class="pad">
+	<?php tpl_license(''); // license text ?>
 
-        <div class="credit">
-            Copyright 2003-<?php echo date('Y'); ?> Xfce Development Team.
-        </div>
-    </div>
+	<div class="credit">
+		Copyright 2003-<?php echo date('Y'); ?> Xfce Development Team.
+	</div>
+	</div>
 
-</div><!-- /footer -->
+</div>
 
 <?php tpl_includeFile('footer.html') ?>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list