Merge branch 'master' into extension_manager

* master: (33 commits)
  translation update
  translation update
  translation update
  translation update
  translation update
  changed style of `<file>` slightly to help tell it apart from `<code>`
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  translation update
  removed now unused interwiki icons
  removed old, possibly never used interwiki definitions
  FS#2806 - fix auth capability listing in html_debug()
  translation update
  change 'debug' setting to 'security' (rather than 'danger')
  convert from iso-8859-1 if not utf8
  add 'danger' alert to authpgsql config settings
  ...

6 files changed, 17 insertions, 12 deletions

diff --git a/lib/plugins/authmysql/lang/de/settings.php b/lib/plugins/authmysql/lang/de/settings.php
index 97ba06a9d..90e0ee5a8 100644
--- a/lib/plugins/authmysql/lang/de/settings.php
+++ b/lib/plugins/authmysql/lang/de/settings.php
@@ -1,8 +1,8 @@
 <?php
+
 /**
- * German language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Matthias Schulte <dokuwiki@lupo49.de>
  */
 $lang['server']                = 'MySQL-Server';
diff --git a/lib/plugins/authmysql/lang/fr/settings.php b/lib/plugins/authmysql/lang/fr/settings.php
index dfb79b545..d69c8d41c 100644
--- a/lib/plugins/authmysql/lang/fr/settings.php
+++ b/lib/plugins/authmysql/lang/fr/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * French language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Bruno Veilleux <bruno.vey@gmail.com>
  */
 $lang['server']                = 'Votre serveur MySQL';
diff --git a/lib/plugins/authmysql/lang/nl/settings.php b/lib/plugins/authmysql/lang/nl/settings.php
index dc85b7eee..39fa32112 100644
--- a/lib/plugins/authmysql/lang/nl/settings.php
+++ b/lib/plugins/authmysql/lang/nl/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Dutch language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  */
 $lang['server']                = 'Je MySQL server';
 $lang['user']                  = 'MySql gebruikersnaam';
diff --git a/lib/plugins/authmysql/lang/ru/settings.php b/lib/plugins/authmysql/lang/ru/settings.php
index 066598331..23fd349af 100644
--- a/lib/plugins/authmysql/lang/ru/settings.php
+++ b/lib/plugins/authmysql/lang/ru/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Russian language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  */
 $lang['server']                = 'Ваш MySQL-сервер';
diff --git a/lib/plugins/authmysql/lang/zh-tw/settings.php b/lib/plugins/authmysql/lang/zh-tw/settings.php
index 95d068150..3fbee151c 100644
--- a/lib/plugins/authmysql/lang/zh-tw/settings.php
+++ b/lib/plugins/authmysql/lang/zh-tw/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese Traditional language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author syaoranhinata@gmail.com
  */
 $lang['server']                = '您的 MySQL 伺服器';
diff --git a/lib/plugins/authmysql/lang/zh/settings.php b/lib/plugins/authmysql/lang/zh/settings.php
index 772f75ecd..b58159e85 100644
--- a/lib/plugins/authmysql/lang/zh/settings.php
+++ b/lib/plugins/authmysql/lang/zh/settings.php
@@ -1,7 +1,8 @@
 <?php
+
 /**
- * Chinese language file
- *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author lainme <lainme993@gmail.com>
  */
 $lang['server']                = '您的 MySQL 服务器';