From 32f6505fe52f99f50966e08334b7a07d2fbedc07 Mon Sep 17 00:00:00 2001
From: Ahmad Abd-Elghany <tolpa1@gmail.com>
Date: Mon, 28 Oct 2013 21:30:55 +0100
Subject: translation update

---
 inc/lang/ar/lang.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index ad1de212b..fdb407da0 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -1,12 +1,13 @@
 <?php
+
 /**
- * Arabic language file
- *
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * 
  * @author Mostafa Hussein <mostafa@gmail.com>
  * @author Yaman Hokan <always.smile.yh@hotmail.com>
  * @author Usama Akkad <uahello@gmail.com>
  * @author uahello@gmail.com
+ * @author Ahmad Abd-Elghany <tolpa1@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -50,6 +51,7 @@ $lang['btn_revert']            = 'استعد';
 $lang['btn_register']          = 'سجّل';
 $lang['btn_apply']             = 'طبق';
 $lang['btn_media']             = 'مدير الوسائط';
+$lang['btn_deleteuser']        = 'احذف حسابي الخاص';
 $lang['loggedinas']            = 'داخل باسم';
 $lang['user']                  = 'اسم المستخدم';
 $lang['pass']                  = 'كلمة السر';
@@ -61,6 +63,7 @@ $lang['fullname']              = 'الاسم الحقيقي';
 $lang['email']                 = 'البريد الإلكتروني';
 $lang['profile']               = 'الملف الشخصي';
 $lang['badlogin']              = 'عذرا، اسم المشترك أو كلمة السر غير صحيحة';
+$lang['badpassconfirm']        = 'عذراً,كلمة السر غير صحيحة';
 $lang['minoredit']             = 'تعديلات طفيفة';
 $lang['draftdate']             = 'حفظ المسودات آليا مفعّل';
 $lang['nosecedit']             = 'غُيرت الصفحة في هذه الأثناء، معلومات الجزء اصبحت قديمة. حُمُلت كل الصفحة بدلا.';
@@ -77,6 +80,11 @@ $lang['profna']                = 'هذه الويكي لا تدعم تعديل 
 $lang['profnochange']          = 'لا تغييرات، لا شيء ليُعمل.';
 $lang['profnoempty']           = 'غير مسموح باسم مستخدم أو بريد فارغ.';
 $lang['profchanged']           = 'حُدث الملف الشخصي للمستخدم بنجاح.';
+$lang['profnodelete']          = 'هذه الموسوعه لا ندعم حذف الأشخاص';
+$lang['profdeleteuser']        = 'احذف حساب';
+$lang['profdeleted']           = 'حسابك الخاص تم حذفه من هذه الموسوعة';
+$lang['profconfdelete']        = 'أنا أرغب في حذف حسابي من هذه الموسوعة.<br/> 
+هذا الحدث غير ممكن.';
 $lang['pwdforget']             = 'أنسيت كلمة السر؟ احصل على واحدة جديدة';
 $lang['resendna']              = 'هذه الويكي لا تدعم إعادة إرسال كلمة المرور.';
 $lang['resendpwd']             = 'اضبط كلمة سر جديدة لـ';
-- 
cgit v1.2.3


From e068f3bfba02021f42a5e9c5afa8d8f1a87e8fea Mon Sep 17 00:00:00 2001
From: Robert Bogenschneider <bogi@uea.org>
Date: Tue, 29 Oct 2013 13:26:37 +0100
Subject: translation update

---
 inc/lang/eo/admin.txt | 2 +-
 inc/lang/eo/lang.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/eo/admin.txt b/inc/lang/eo/admin.txt
index 2ede2763c..4b0cf7909 100644
--- a/inc/lang/eo/admin.txt
+++ b/inc/lang/eo/admin.txt
@@ -1,3 +1,3 @@
-====== Administro ======
+====== Administrado ======
 
 Sube vi povas trovi liston de administraj taskoj disponeblaj en DokuWiki.
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 39346bb01..4ed03244e 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Antono Vasiljev <esperanto.minsk ĈE tut.by>
  * @author Felipe Castro <fefcas@yahoo.com.br>
  * @author Felipe Castro <fefcas@uol.com.br>
-- 
cgit v1.2.3


From 9269d0b1fb78c217069efd497734c183df9937be Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 29 Oct 2013 20:52:27 +0100
Subject: Fix the media usage index to include local links

---
 inc/parser/metadata.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 437559370..8ba159d62 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -274,7 +274,12 @@ class Doku_Renderer_metadata extends Doku_Renderer {
         $this->internallink($link, $link);
     }
 
-    function locallink($hash, $name = null){}
+    function locallink($hash, $name = null){
+        if(is_array($name)) {
+            $this->_firstimage($name['src']);
+            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+        }
+    }
 
     /**
      * keep track of internal links in $this->meta['relation']['references']
-- 
cgit v1.2.3


From 6589c60cca0146ef5c4f606105e1c2ed9cf23cbd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 30 Oct 2013 19:44:57 +0100
Subject: compatibility functions for missing ctype extension FS#2873

---
 inc/compatibility.php | 36 ++++++++++++++++++++++++++++++++++++
 inc/load.php          |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 inc/compatibility.php

(limited to 'inc')

diff --git a/inc/compatibility.php b/inc/compatibility.php
new file mode 100644
index 000000000..ae780e5ac
--- /dev/null
+++ b/inc/compatibility.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * compatibility functions
+ *
+ * This file contains a few functions that might be missing from the PHP build
+ */
+
+if(!function_exists('ctype_space')) {
+    /**
+     * Check for whitespace character(s)
+     *
+     * @see ctype_space
+     * @param string $text
+     * @return bool
+     */
+    function ctype_space($text) {
+        if(!is_string($text)) return false; #FIXME original treats between -128 and 255 inclusive as ASCII chars
+        if(trim($text) === '') return true;
+        return false;
+    }
+}
+
+if(!function_exists('ctype_digit')) {
+    /**
+     * Check for numeric character(s)
+     *
+     * @see ctype_digit
+     * @param string $text
+     * @return bool
+     */
+    function ctype_digit($text) {
+        if(!is_string($text)) return false; #FIXME original treats between -128 and 255 inclusive as ASCII chars
+        if(preg_match('/^\d+$/', $text)) return true;
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/inc/load.php b/inc/load.php
index 923671296..c5b40ffd8 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -35,6 +35,7 @@ require_once(DOKU_INC.'inc/template.php');
 require_once(DOKU_INC.'inc/toolbar.php');
 require_once(DOKU_INC.'inc/utf8.php');
 require_once(DOKU_INC.'inc/auth.php');
+require_once(DOKU_INC.'inc/compatibility.php');
 
 /**
  * spl_autoload_register callback
-- 
cgit v1.2.3


From a1288caece2153c08e04252643c89815c1be2a66 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 31 Oct 2013 23:56:08 +0100
Subject: localize some meta header titels. Fixes FS#2409

---
 inc/lang/en/lang.php |  4 ++++
 inc/lang/nl/lang.php |  4 ++++
 inc/template.php     | 10 +++++-----
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index d4ddf293a..ab84c67f3 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -356,4 +356,8 @@ $lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload
 $lang['media_update']          = 'Upload new version';
 $lang['media_restore']         = 'Restore this version';
 
+$lang['currentns']             = 'Current namespace';
+$lang['searchresult']          = 'Search Result';
+$lang['plainhtml']             = 'Plain HTML';
+$lang['wikimarkup']            = 'Wiki Markup';
 //Setup VIM: ex: et ts=2 :
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index ed33dad3d..5f95a99bf 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -341,3 +341,7 @@ $lang['media_perm_read']       = 'Sorry, u heeft niet voldoende rechten om besta
 $lang['media_perm_upload']     = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.';
 $lang['media_update']          = 'Upload nieuwe versie';
 $lang['media_restore']         = 'Deze versie terugzetten';
+$lang['currentns']             = 'Huidige namespace';
+$lang['searchresult']          = 'Zoekresultaat';
+$lang['plainhtml']             = 'Alleen HTML';
+$lang['wikimarkup']            = 'Wiki Opmaak';
diff --git a/inc/template.php b/inc/template.php
index e967bf27d..41f398016 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -318,11 +318,11 @@ function tpl_metaheaders($alt = true) {
     if($alt) {
         $head['link'][] = array(
             'rel'  => 'alternate', 'type'=> 'application/rss+xml',
-            'title'=> 'Recent Changes', 'href'=> DOKU_BASE.'feed.php'
+            'title'=> $lang['btn_recent'], 'href'=> DOKU_BASE.'feed.php'
         );
         $head['link'][] = array(
             'rel'  => 'alternate', 'type'=> 'application/rss+xml',
-            'title'=> 'Current Namespace',
+            'title'=> $lang['currentns'],
             'href' => DOKU_BASE.'feed.php?mode=list&ns='.$INFO['namespace']
         );
         if(($ACT == 'show' || $ACT == 'search') && $INFO['writable']) {
@@ -336,21 +336,21 @@ function tpl_metaheaders($alt = true) {
         if($ACT == 'search') {
             $head['link'][] = array(
                 'rel'  => 'alternate', 'type'=> 'application/rss+xml',
-                'title'=> 'Search Result',
+                'title'=> $lang['searchresult'],
                 'href' => DOKU_BASE.'feed.php?mode=search&q='.$QUERY
             );
         }
 
         if(actionOK('export_xhtml')) {
             $head['link'][] = array(
-                'rel' => 'alternate', 'type'=> 'text/html', 'title'=> 'Plain HTML',
+                'rel' => 'alternate', 'type'=> 'text/html', 'title'=> $lang['plainhtml'],
                 'href'=> exportlink($ID, 'xhtml', '', false, '&')
             );
         }
 
         if(actionOK('export_raw')) {
             $head['link'][] = array(
-                'rel' => 'alternate', 'type'=> 'text/plain', 'title'=> 'Wiki Markup',
+                'rel' => 'alternate', 'type'=> 'text/plain', 'title'=> $lang['wikimarkup'],
                 'href'=> exportlink($ID, 'raw', '', false, '&')
             );
         }
-- 
cgit v1.2.3


From c8bbb09431bd7819e045a455a4ec4d85eff781b1 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 Nov 2013 01:08:27 +0000
Subject: removed deprecated third param of cleanID()

---
 inc/pageutils.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/pageutils.php b/inc/pageutils.php
index 60f326e04..c8d3cf4bb 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -94,9 +94,8 @@ function getID($param='id',$clean=true){
  * @author Andreas Gohr <andi@splitbrain.org>
  * @param  string  $raw_id    The pageid to clean
  * @param  boolean $ascii     Force ASCII
- * @param  boolean $media     DEPRECATED
  */
-function cleanID($raw_id,$ascii=false,$media=false){
+function cleanID($raw_id,$ascii=false){
     global $conf;
     static $sepcharpat = null;
 
-- 
cgit v1.2.3


From 8c867678811e7f91159175c41ef4722a2fc5308c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 Nov 2013 01:17:09 +0000
Subject: removed loading of deprecated RTL styles

---
 inc/config_cascade.php |   3 -
 inc/farm.php           |   2 -
 inc/preload.php        | 154 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 154 insertions(+), 5 deletions(-)
 create mode 100644 inc/preload.php

(limited to 'inc')

diff --git a/inc/config_cascade.php b/inc/config_cascade.php
index e1ab0eead..2c4f1612b 100644
--- a/inc/config_cascade.php
+++ b/inc/config_cascade.php
@@ -50,9 +50,6 @@ $config_cascade = array_merge(
             ),
         'userstyle' => array(
             'screen'  => DOKU_CONF.'userstyle.css',
-            // @deprecated 2012-04-09: rtl will cease to be a mode of its own,
-            //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
-            'rtl'     => DOKU_CONF.'userrtl.css',
             'print'   => DOKU_CONF.'userprint.css',
             'feed'    => DOKU_CONF.'userfeed.css',
             'all'     => DOKU_CONF.'userall.css',
diff --git a/inc/farm.php b/inc/farm.php
index 54692928d..cee61816c 100644
--- a/inc/farm.php
+++ b/inc/farm.php
@@ -135,9 +135,7 @@ $config_cascade = array(
         ),
     ),
     'userstyle' => array(
-        'default' => DOKU_CONF.'userstyle.css', // 'default' was renamed to 'screen' on 2011-02-26, so will be deprecated in the next version
         'screen'  => DOKU_CONF.'userstyle.css',
-        'rtl'     => DOKU_CONF.'userrtl.css', // deprecated since version after 2012-04-09
         'print'   => DOKU_CONF.'userprint.css',
         'feed'    => DOKU_CONF.'userfeed.css',
         'all'     => DOKU_CONF.'userall.css',
diff --git a/inc/preload.php b/inc/preload.php
new file mode 100644
index 000000000..54f4d4c39
--- /dev/null
+++ b/inc/preload.php
@@ -0,0 +1,154 @@
+<?php
+/**
+* This overwrites the DOKU_CONF. Each animal gets its own configuration and data directory.
+*
+* The farm ($farm) can be any directory.
+* Animals are direct subdirectories of the farm directory. They have to reflect the domain
+* name: If an animal resides in http://www.domain.org:8080/mysite/test/ directories that
+* will match range from $farm/8080.www.domain.org.mysite.test/ to a simple $farm/domain/.
+*/
+
+$farm = 'C:/UniServer/www/dokuwiki-farm';
+//$farm = '';
+
+if(!defined('DOKU_CONF')) define('DOKU_CONF', conf_path($farm));
+if(!defined('DOKU_FARM')) define('DOKU_FARM', false);
+
+/**
+ * Find the appropriate configuration directory.
+ *
+ * Try finding a matching configuration directory by stripping the website's
+ * hostname from left to right and pathname from right to left. The first
+ * configuration file found will be used; the remaining will ignored. If no
+ * configuration file is found, return the default confdir './conf'.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author virtual host part based on conf_path() from Drupal.org's /includes/bootstrap.inc
+ *   (see http://cvs.drupal.org/viewvc/drupal/drupal/includes/bootstrap.inc?view=markup)
+ */
+function conf_path($farm) {
+
+    if (!$farm)
+        return DOKU_INC.'conf/';
+
+    // htacces based
+    if(isset($_REQUEST['animal'])) {
+        if(!is_dir($farm.'/'.$_REQUEST['animal'])) nice_die("Sorry! This Wiki doesn't exist!");
+        if(!defined('DOKU_FARM')) define('DOKU_FARM', 'htaccess');
+        return $farm.'/'.$_REQUEST['animal'].'/conf/';
+    }
+
+    // virtual host based
+    $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
+    $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
+    for ($i = count($uri) - 1; $i > 0; $i--) {
+        for ($j = count($server); $j > 0; $j--) {
+            $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
+            if(is_dir("$farm/$dir/conf/")) {
+                if(!defined('DOKU_FARM')) define('DOKU_FARM', 'virtual');
+                return "$farm/$dir/conf/";
+            }
+        }
+    }
+
+    // default conf directory in farm
+    if(is_dir("$farm/default/conf/")) {
+        if(!defined('DOKU_FARM')) define('DOKU_FARM', 'default');
+        return "$farm/default/conf/";
+    }
+    // farmer
+    return DOKU_INC.'conf/';
+}
+
+//echo conf_path($farm);
+
+/*
+$farm = 'W:/www/dokuwiki-farm';
+$farmerURL = 'wiki';
+if ($_SERVER['SERVER_NAME'] != $farmerURL) {
+
+    // don't do anything if the animal doesn't exist
+    if(!is_dir($farm . '/' . $_SERVER['SERVER_NAME'])) nice_die("Sorry! This Wiki doesn't exist!");
+
+    if(!defined('DOKU_CONF')) define('DOKU_CONF', $farm . '/' . $_SERVER['SERVER_NAME'] . '/conf/');
+} else {
+    if(!defined('DOKU_CONF')) define('DOKU_CONF', DOKU_INC . '/conf/');
+}
+*/
+
+
+
+require_once @DOKU_INC.'inc/config_cascade.php';
+
+$config_cascade = array(
+    'main' => array(
+        'default'   => array(DOKU_INC.'conf/dokuwiki.php'),
+        'local'     => array(DOKU_CONF.'local.php'),
+        'protected' => array(DOKU_CONF.'local.protected.php'),
+    ),
+    'acronyms'  => array(
+        'default'   => array(DOKU_INC.'conf/acronyms.conf'),
+        'local'     => array(DOKU_CONF.'acronyms.local.conf'),
+    ),
+    'entities'  => array(
+        'default'   => array(DOKU_INC.'conf/entities.conf'),
+        'local'     => array(DOKU_CONF.'entities.local.conf'),
+    ),
+    'interwiki' => array(
+        'default'   => array(DOKU_INC.'conf/interwiki.conf'),
+        'local'     => array(DOKU_CONF.'interwiki.local.conf'),
+    ),
+    'license' => array(
+        'default'   => array(DOKU_INC.'conf/license.php'),
+        'local'     => array(DOKU_CONF.'license.local.php'),
+    ),
+    'mediameta' => array(
+        'default'   => array(DOKU_INC.'conf/mediameta.php'),
+        'local'     => array(DOKU_CONF.'mediameta.local.php'),
+    ),
+    'mime'      => array(
+        'default'   => array(DOKU_INC.'conf/mime.conf'),
+        'local'     => array(DOKU_CONF.'mime.local.conf'),
+    ),
+    'scheme'    => array(
+        'default'   => array(DOKU_INC.'conf/scheme.conf'),
+        'local'     => array(DOKU_CONF.'scheme.local.conf'),
+    ),
+    'smileys'   => array(
+        'default'   => array(DOKU_INC.'conf/smileys.conf'),
+        'local'     => array(DOKU_CONF.'smileys.local.conf'),
+    ),
+    'wordblock' => array(
+        'default'   => array(DOKU_INC.'conf/wordblock.conf'),
+        'local'     => array(DOKU_CONF.'wordblock.local.conf'),
+    ),
+    // whatever
+    'acl'       => array(
+        'default'   => DOKU_CONF.'acl.auth.php',
+    ),
+    'plainauth.users' => array(
+        'default'   => DOKU_CONF.'users.auth.php',
+    ),
+    'userstyle' => array(
+        'default' => DOKU_CONF.'userstyle.css',
+        'print'   => DOKU_CONF.'userprint.css',
+        'feed'    => DOKU_CONF.'userfeed.css',
+        'all'     => DOKU_CONF.'userall.css',
+    ),
+    'userscript' => array(
+        'default' => DOKU_CONF.'userscript.js'
+    ),
+    'plugins' => array(
+        'local'     => array(DOKU_CONF.'plugins.local.php'),
+        'protected' => array(
+            DOKU_INC.'conf/plugins.required.php',
+            DOKU_CONF.'plugins.protected.php',
+        ),
+    ),
+    /*'plugins' => array(
+        'default'   => array(DOKU_CONF.'plugins.php'),
+        'local'     => array(DOKU_CONF.'plugins.local.php'),
+        'protected' => array(DOKU_CONF.'plugins.protected.php'),
+    ),*/
+);
+
-- 
cgit v1.2.3


From 0045ec49e6995048e7a0057ebd33d4373bf56239 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 Nov 2013 01:22:10 +0000
Subject: removed deprecated tpl_getFavicon()

---
 inc/template.php | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'inc')

diff --git a/inc/template.php b/inc/template.php
index 41f398016..60e178d1a 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1693,18 +1693,6 @@ function tpl_includeFile($file) {
     }
 }
 
-/**
- * Returns icon from data/media root directory if it exists, otherwise
- * the one in the template's image directory.
- *
- * @deprecated Use tpl_getMediaFile() instead
- * @author Anika Henke <anika@selfthinker.org>
- */
-function tpl_getFavicon($abs = false, $fileName = 'favicon.ico') {
-    $look = array(":wiki:$fileName", ":$fileName", "images/$fileName");
-    return tpl_getMediaFile($look, $abs);
-}
-
 /**
  * Returns <link> tag for various icon types (favicon|mobile|generic)
  *
-- 
cgit v1.2.3


From b1f535eb5e822dc2e16f687bb0a69c8643224d87 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 Nov 2013 01:24:22 +0000
Subject: removed deprecated html_attbuild()

---
 inc/html.php | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'inc')

diff --git a/inc/html.php b/inc/html.php
index bbe29e371..7f473cdb6 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -27,20 +27,6 @@ function html_wikilink($id,$name=null,$search=''){
     return $xhtml_renderer->internallink($id,$name,$search,true,'navigation');
 }
 
-/**
- * Helps building long attribute lists
- *
- * @deprecated Use buildAttributes instead
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-function html_attbuild($attributes){
-    $ret = '';
-    foreach ( $attributes as $key => $value ) {
-        $ret .= $key.'="'.formText($value).'" ';
-    }
-    return trim($ret);
-}
-
 /**
  * The loginform
  *
-- 
cgit v1.2.3


From 9b47ccb8d0bb02c6f5a7a67d261a43f0fd31413c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 Nov 2013 10:42:19 +0000
Subject: deleted wrongly added file

---
 inc/farm.php | 146 -----------------------------------------------------------
 1 file changed, 146 deletions(-)
 delete mode 100644 inc/farm.php

(limited to 'inc')

diff --git a/inc/farm.php b/inc/farm.php
deleted file mode 100644
index cee61816c..000000000
--- a/inc/farm.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * This overwrites DOKU_CONF. Each animal gets its own configuration and data directory.
- * This can be used together with preload.php. See preload.php.dist for an example setup.
- * For more information see http://www.dokuwiki.org/farms.
- *
- * The farm directory (constant DOKU_FARMDIR) can be any directory and needs to be set.
- * Animals are direct subdirectories of the farm directory.
- * There are two different approaches:
- *  * An .htaccess based setup can use any animal directory name:
- *    http://example.org/<path_to_farm>/subdir/ will need the subdirectory '$farm/subdir/'.
- *  * A virtual host based setup needs animal directory names which have to reflect
- *    the domain name: If an animal resides in http://www.example.org:8080/mysite/test/,
- *    directories that will match range from '$farm/8080.www.example.org.mysite.test/'
- *    to a simple '$farm/domain/'.
- *
- * @author Anika Henke <anika@selfthinker.org>
- * @author Michael Klier <chi@chimeric.de>
- * @author Christopher Smith <chris@jalakai.co.uk>
- * @author virtual host part of farm_confpath() based on conf_path() from Drupal.org's /includes/bootstrap.inc
- *   (see https://github.com/drupal/drupal/blob/7.x/includes/bootstrap.inc#L537)
- * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-// DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC would be (if it was set already)
-if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', fullpath(dirname(__FILE__).'/../').'/');
-if(!defined('DOKU_CONF')) define('DOKU_CONF', farm_confpath(DOKU_FARMDIR));
-if(!defined('DOKU_FARM')) define('DOKU_FARM', false);
-
-
-/**
- * Find the appropriate configuration directory.
- *
- * If the .htaccess based setup is used, the configuration directory can be
- * any subdirectory of the farm directory.
- *
- * Otherwise try finding a matching configuration directory by stripping the
- * website's hostname from left to right and pathname from right to left. The
- * first configuration file found will be used; the remaining will ignored.
- * If no configuration file is found, return the default confdir './conf'.
- */
-function farm_confpath($farm) {
-
-    // htaccess based or cli
-    // cli usage example: animal=your_animal bin/indexer.php
-    if(isset($_REQUEST['animal']) || ('cli' == php_sapi_name() && isset($_SERVER['animal']))) {
-        $mode = isset($_REQUEST['animal']) ? 'htaccess' : 'cli';
-        $animal = $mode == 'htaccess' ? $_REQUEST['animal'] : $_SERVER['animal'];
-        // check that $animal is a string and just a directory name and not a path
-        if (!is_string($animal) || strpbrk($animal, '\\/') !== false)
-            nice_die('Sorry! Invalid animal name!');
-        if(!is_dir($farm.'/'.$animal))
-            nice_die("Sorry! This Wiki doesn't exist!");
-        if(!defined('DOKU_FARM')) define('DOKU_FARM', $mode);
-        return $farm.'/'.$animal.'/conf/';
-    }
-
-    // virtual host based
-    $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
-    $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
-    for ($i = count($uri) - 1; $i > 0; $i--) {
-        for ($j = count($server); $j > 0; $j--) {
-            $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
-            if(is_dir("$farm/$dir/conf/")) {
-                if(!defined('DOKU_FARM')) define('DOKU_FARM', 'virtual');
-                return "$farm/$dir/conf/";
-            }
-        }
-    }
-
-    // default conf directory in farm
-    if(is_dir("$farm/default/conf/")) {
-        if(!defined('DOKU_FARM')) define('DOKU_FARM', 'default');
-        return "$farm/default/conf/";
-    }
-    // farmer
-    return DOKU_INC.'conf/';
-}
-
-/* Use default config files and local animal config files */
-$config_cascade = array(
-    'main' => array(
-        'default'   => array(DOKU_INC.'conf/dokuwiki.php'),
-        'local'     => array(DOKU_CONF.'local.php'),
-        'protected' => array(DOKU_CONF.'local.protected.php'),
-    ),
-    'acronyms'  => array(
-        'default'   => array(DOKU_INC.'conf/acronyms.conf'),
-        'local'     => array(DOKU_CONF.'acronyms.local.conf'),
-    ),
-    'entities'  => array(
-        'default'   => array(DOKU_INC.'conf/entities.conf'),
-        'local'     => array(DOKU_CONF.'entities.local.conf'),
-    ),
-    'interwiki' => array(
-        'default'   => array(DOKU_INC.'conf/interwiki.conf'),
-        'local'     => array(DOKU_CONF.'interwiki.local.conf'),
-    ),
-    'license' => array(
-        'default'   => array(DOKU_INC.'conf/license.php'),
-        'local'     => array(DOKU_CONF.'license.local.php'),
-    ),
-    'mediameta' => array(
-        'default'   => array(DOKU_INC.'conf/mediameta.php'),
-        'local'     => array(DOKU_CONF.'mediameta.local.php'),
-    ),
-    'mime'      => array(
-        'default'   => array(DOKU_INC.'conf/mime.conf'),
-        'local'     => array(DOKU_CONF.'mime.local.conf'),
-    ),
-    'scheme'    => array(
-        'default'   => array(DOKU_INC.'conf/scheme.conf'),
-        'local'     => array(DOKU_CONF.'scheme.local.conf'),
-    ),
-    'smileys'   => array(
-        'default'   => array(DOKU_INC.'conf/smileys.conf'),
-        'local'     => array(DOKU_CONF.'smileys.local.conf'),
-    ),
-    'wordblock' => array(
-        'default'   => array(DOKU_INC.'conf/wordblock.conf'),
-        'local'     => array(DOKU_CONF.'wordblock.local.conf'),
-    ),
-    'acl'       => array(
-        'default'   => DOKU_CONF.'acl.auth.php',
-    ),
-    'plainauth.users' => array(
-        'default'   => DOKU_CONF.'users.auth.php',
-    ),
-    'plugins' => array( // needed since Angua
-        'default'   => array(DOKU_INC.'conf/plugins.php'),
-        'local'     => array(DOKU_CONF.'plugins.local.php'),
-        'protected' => array(
-            DOKU_INC.'conf/plugins.required.php',
-            DOKU_CONF.'plugins.protected.php',
-        ),
-    ),
-    'userstyle' => array(
-        'screen'  => DOKU_CONF.'userstyle.css',
-        'print'   => DOKU_CONF.'userprint.css',
-        'feed'    => DOKU_CONF.'userfeed.css',
-        'all'     => DOKU_CONF.'userall.css',
-    ),
-    'userscript' => array(
-        'default' => DOKU_CONF.'userscript.js'
-    ),
-);
-- 
cgit v1.2.3


From 3f0e8c6cf19f88f23fb4db76b031a92a5951101f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 Nov 2013 10:44:49 +0000
Subject: deleted another wronlgy added file

---
 inc/preload.php | 154 --------------------------------------------------------
 1 file changed, 154 deletions(-)
 delete mode 100644 inc/preload.php

(limited to 'inc')

diff --git a/inc/preload.php b/inc/preload.php
deleted file mode 100644
index 54f4d4c39..000000000
--- a/inc/preload.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-/**
-* This overwrites the DOKU_CONF. Each animal gets its own configuration and data directory.
-*
-* The farm ($farm) can be any directory.
-* Animals are direct subdirectories of the farm directory. They have to reflect the domain
-* name: If an animal resides in http://www.domain.org:8080/mysite/test/ directories that
-* will match range from $farm/8080.www.domain.org.mysite.test/ to a simple $farm/domain/.
-*/
-
-$farm = 'C:/UniServer/www/dokuwiki-farm';
-//$farm = '';
-
-if(!defined('DOKU_CONF')) define('DOKU_CONF', conf_path($farm));
-if(!defined('DOKU_FARM')) define('DOKU_FARM', false);
-
-/**
- * Find the appropriate configuration directory.
- *
- * Try finding a matching configuration directory by stripping the website's
- * hostname from left to right and pathname from right to left. The first
- * configuration file found will be used; the remaining will ignored. If no
- * configuration file is found, return the default confdir './conf'.
- *
- * @author Anika Henke <anika@selfthinker.org>
- * @author virtual host part based on conf_path() from Drupal.org's /includes/bootstrap.inc
- *   (see http://cvs.drupal.org/viewvc/drupal/drupal/includes/bootstrap.inc?view=markup)
- */
-function conf_path($farm) {
-
-    if (!$farm)
-        return DOKU_INC.'conf/';
-
-    // htacces based
-    if(isset($_REQUEST['animal'])) {
-        if(!is_dir($farm.'/'.$_REQUEST['animal'])) nice_die("Sorry! This Wiki doesn't exist!");
-        if(!defined('DOKU_FARM')) define('DOKU_FARM', 'htaccess');
-        return $farm.'/'.$_REQUEST['animal'].'/conf/';
-    }
-
-    // virtual host based
-    $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
-    $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
-    for ($i = count($uri) - 1; $i > 0; $i--) {
-        for ($j = count($server); $j > 0; $j--) {
-            $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
-            if(is_dir("$farm/$dir/conf/")) {
-                if(!defined('DOKU_FARM')) define('DOKU_FARM', 'virtual');
-                return "$farm/$dir/conf/";
-            }
-        }
-    }
-
-    // default conf directory in farm
-    if(is_dir("$farm/default/conf/")) {
-        if(!defined('DOKU_FARM')) define('DOKU_FARM', 'default');
-        return "$farm/default/conf/";
-    }
-    // farmer
-    return DOKU_INC.'conf/';
-}
-
-//echo conf_path($farm);
-
-/*
-$farm = 'W:/www/dokuwiki-farm';
-$farmerURL = 'wiki';
-if ($_SERVER['SERVER_NAME'] != $farmerURL) {
-
-    // don't do anything if the animal doesn't exist
-    if(!is_dir($farm . '/' . $_SERVER['SERVER_NAME'])) nice_die("Sorry! This Wiki doesn't exist!");
-
-    if(!defined('DOKU_CONF')) define('DOKU_CONF', $farm . '/' . $_SERVER['SERVER_NAME'] . '/conf/');
-} else {
-    if(!defined('DOKU_CONF')) define('DOKU_CONF', DOKU_INC . '/conf/');
-}
-*/
-
-
-
-require_once @DOKU_INC.'inc/config_cascade.php';
-
-$config_cascade = array(
-    'main' => array(
-        'default'   => array(DOKU_INC.'conf/dokuwiki.php'),
-        'local'     => array(DOKU_CONF.'local.php'),
-        'protected' => array(DOKU_CONF.'local.protected.php'),
-    ),
-    'acronyms'  => array(
-        'default'   => array(DOKU_INC.'conf/acronyms.conf'),
-        'local'     => array(DOKU_CONF.'acronyms.local.conf'),
-    ),
-    'entities'  => array(
-        'default'   => array(DOKU_INC.'conf/entities.conf'),
-        'local'     => array(DOKU_CONF.'entities.local.conf'),
-    ),
-    'interwiki' => array(
-        'default'   => array(DOKU_INC.'conf/interwiki.conf'),
-        'local'     => array(DOKU_CONF.'interwiki.local.conf'),
-    ),
-    'license' => array(
-        'default'   => array(DOKU_INC.'conf/license.php'),
-        'local'     => array(DOKU_CONF.'license.local.php'),
-    ),
-    'mediameta' => array(
-        'default'   => array(DOKU_INC.'conf/mediameta.php'),
-        'local'     => array(DOKU_CONF.'mediameta.local.php'),
-    ),
-    'mime'      => array(
-        'default'   => array(DOKU_INC.'conf/mime.conf'),
-        'local'     => array(DOKU_CONF.'mime.local.conf'),
-    ),
-    'scheme'    => array(
-        'default'   => array(DOKU_INC.'conf/scheme.conf'),
-        'local'     => array(DOKU_CONF.'scheme.local.conf'),
-    ),
-    'smileys'   => array(
-        'default'   => array(DOKU_INC.'conf/smileys.conf'),
-        'local'     => array(DOKU_CONF.'smileys.local.conf'),
-    ),
-    'wordblock' => array(
-        'default'   => array(DOKU_INC.'conf/wordblock.conf'),
-        'local'     => array(DOKU_CONF.'wordblock.local.conf'),
-    ),
-    // whatever
-    'acl'       => array(
-        'default'   => DOKU_CONF.'acl.auth.php',
-    ),
-    'plainauth.users' => array(
-        'default'   => DOKU_CONF.'users.auth.php',
-    ),
-    'userstyle' => array(
-        'default' => DOKU_CONF.'userstyle.css',
-        'print'   => DOKU_CONF.'userprint.css',
-        'feed'    => DOKU_CONF.'userfeed.css',
-        'all'     => DOKU_CONF.'userall.css',
-    ),
-    'userscript' => array(
-        'default' => DOKU_CONF.'userscript.js'
-    ),
-    'plugins' => array(
-        'local'     => array(DOKU_CONF.'plugins.local.php'),
-        'protected' => array(
-            DOKU_INC.'conf/plugins.required.php',
-            DOKU_CONF.'plugins.protected.php',
-        ),
-    ),
-    /*'plugins' => array(
-        'default'   => array(DOKU_CONF.'plugins.php'),
-        'local'     => array(DOKU_CONF.'plugins.local.php'),
-        'protected' => array(DOKU_CONF.'plugins.protected.php'),
-    ),*/
-);
-
-- 
cgit v1.2.3


From 13054fbf5e7e9dd2c2544a358603cd8f195f9996 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 4 Nov 2013 10:46:06 +0000
Subject: Revert "deleted wrongly added file"

This reverts commit 9b47ccb8d0bb02c6f5a7a67d261a43f0fd31413c.
---
 inc/farm.php | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 inc/farm.php

(limited to 'inc')

diff --git a/inc/farm.php b/inc/farm.php
new file mode 100644
index 000000000..cee61816c
--- /dev/null
+++ b/inc/farm.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * This overwrites DOKU_CONF. Each animal gets its own configuration and data directory.
+ * This can be used together with preload.php. See preload.php.dist for an example setup.
+ * For more information see http://www.dokuwiki.org/farms.
+ *
+ * The farm directory (constant DOKU_FARMDIR) can be any directory and needs to be set.
+ * Animals are direct subdirectories of the farm directory.
+ * There are two different approaches:
+ *  * An .htaccess based setup can use any animal directory name:
+ *    http://example.org/<path_to_farm>/subdir/ will need the subdirectory '$farm/subdir/'.
+ *  * A virtual host based setup needs animal directory names which have to reflect
+ *    the domain name: If an animal resides in http://www.example.org:8080/mysite/test/,
+ *    directories that will match range from '$farm/8080.www.example.org.mysite.test/'
+ *    to a simple '$farm/domain/'.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Michael Klier <chi@chimeric.de>
+ * @author Christopher Smith <chris@jalakai.co.uk>
+ * @author virtual host part of farm_confpath() based on conf_path() from Drupal.org's /includes/bootstrap.inc
+ *   (see https://github.com/drupal/drupal/blob/7.x/includes/bootstrap.inc#L537)
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ */
+
+// DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC would be (if it was set already)
+if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', fullpath(dirname(__FILE__).'/../').'/');
+if(!defined('DOKU_CONF')) define('DOKU_CONF', farm_confpath(DOKU_FARMDIR));
+if(!defined('DOKU_FARM')) define('DOKU_FARM', false);
+
+
+/**
+ * Find the appropriate configuration directory.
+ *
+ * If the .htaccess based setup is used, the configuration directory can be
+ * any subdirectory of the farm directory.
+ *
+ * Otherwise try finding a matching configuration directory by stripping the
+ * website's hostname from left to right and pathname from right to left. The
+ * first configuration file found will be used; the remaining will ignored.
+ * If no configuration file is found, return the default confdir './conf'.
+ */
+function farm_confpath($farm) {
+
+    // htaccess based or cli
+    // cli usage example: animal=your_animal bin/indexer.php
+    if(isset($_REQUEST['animal']) || ('cli' == php_sapi_name() && isset($_SERVER['animal']))) {
+        $mode = isset($_REQUEST['animal']) ? 'htaccess' : 'cli';
+        $animal = $mode == 'htaccess' ? $_REQUEST['animal'] : $_SERVER['animal'];
+        // check that $animal is a string and just a directory name and not a path
+        if (!is_string($animal) || strpbrk($animal, '\\/') !== false)
+            nice_die('Sorry! Invalid animal name!');
+        if(!is_dir($farm.'/'.$animal))
+            nice_die("Sorry! This Wiki doesn't exist!");
+        if(!defined('DOKU_FARM')) define('DOKU_FARM', $mode);
+        return $farm.'/'.$animal.'/conf/';
+    }
+
+    // virtual host based
+    $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
+    $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
+    for ($i = count($uri) - 1; $i > 0; $i--) {
+        for ($j = count($server); $j > 0; $j--) {
+            $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
+            if(is_dir("$farm/$dir/conf/")) {
+                if(!defined('DOKU_FARM')) define('DOKU_FARM', 'virtual');
+                return "$farm/$dir/conf/";
+            }
+        }
+    }
+
+    // default conf directory in farm
+    if(is_dir("$farm/default/conf/")) {
+        if(!defined('DOKU_FARM')) define('DOKU_FARM', 'default');
+        return "$farm/default/conf/";
+    }
+    // farmer
+    return DOKU_INC.'conf/';
+}
+
+/* Use default config files and local animal config files */
+$config_cascade = array(
+    'main' => array(
+        'default'   => array(DOKU_INC.'conf/dokuwiki.php'),
+        'local'     => array(DOKU_CONF.'local.php'),
+        'protected' => array(DOKU_CONF.'local.protected.php'),
+    ),
+    'acronyms'  => array(
+        'default'   => array(DOKU_INC.'conf/acronyms.conf'),
+        'local'     => array(DOKU_CONF.'acronyms.local.conf'),
+    ),
+    'entities'  => array(
+        'default'   => array(DOKU_INC.'conf/entities.conf'),
+        'local'     => array(DOKU_CONF.'entities.local.conf'),
+    ),
+    'interwiki' => array(
+        'default'   => array(DOKU_INC.'conf/interwiki.conf'),
+        'local'     => array(DOKU_CONF.'interwiki.local.conf'),
+    ),
+    'license' => array(
+        'default'   => array(DOKU_INC.'conf/license.php'),
+        'local'     => array(DOKU_CONF.'license.local.php'),
+    ),
+    'mediameta' => array(
+        'default'   => array(DOKU_INC.'conf/mediameta.php'),
+        'local'     => array(DOKU_CONF.'mediameta.local.php'),
+    ),
+    'mime'      => array(
+        'default'   => array(DOKU_INC.'conf/mime.conf'),
+        'local'     => array(DOKU_CONF.'mime.local.conf'),
+    ),
+    'scheme'    => array(
+        'default'   => array(DOKU_INC.'conf/scheme.conf'),
+        'local'     => array(DOKU_CONF.'scheme.local.conf'),
+    ),
+    'smileys'   => array(
+        'default'   => array(DOKU_INC.'conf/smileys.conf'),
+        'local'     => array(DOKU_CONF.'smileys.local.conf'),
+    ),
+    'wordblock' => array(
+        'default'   => array(DOKU_INC.'conf/wordblock.conf'),
+        'local'     => array(DOKU_CONF.'wordblock.local.conf'),
+    ),
+    'acl'       => array(
+        'default'   => DOKU_CONF.'acl.auth.php',
+    ),
+    'plainauth.users' => array(
+        'default'   => DOKU_CONF.'users.auth.php',
+    ),
+    'plugins' => array( // needed since Angua
+        'default'   => array(DOKU_INC.'conf/plugins.php'),
+        'local'     => array(DOKU_CONF.'plugins.local.php'),
+        'protected' => array(
+            DOKU_INC.'conf/plugins.required.php',
+            DOKU_CONF.'plugins.protected.php',
+        ),
+    ),
+    'userstyle' => array(
+        'screen'  => DOKU_CONF.'userstyle.css',
+        'print'   => DOKU_CONF.'userprint.css',
+        'feed'    => DOKU_CONF.'userfeed.css',
+        'all'     => DOKU_CONF.'userall.css',
+    ),
+    'userscript' => array(
+        'default' => DOKU_CONF.'userscript.js'
+    ),
+);
-- 
cgit v1.2.3


From 74850f2906bbb3935065d28e3e22ac131766d6f2 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 9 Nov 2013 19:51:29 +0000
Subject: added possibility to approve users to ACL policies in installer

---
 inc/lang/en/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index ab84c67f3..c6bb0aa2d 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -315,6 +315,7 @@ $lang['i_policy']              = 'Initial ACL policy';
 $lang['i_pol0']                = 'Open Wiki (read, write, upload for everyone)';
 $lang['i_pol1']                = 'Public Wiki (read for everyone, write and upload for registered users)';
 $lang['i_pol2']                = 'Closed Wiki (read, write, upload for registered users only)';
+$lang['i_policyapprove']       = 'Registered users need to be approved before allowing access (to a Public or Closed Wiki)';
 $lang['i_retry']               = 'Retry';
 $lang['i_license']             = 'Please choose the license you want to put your content under:';
 $lang['i_license_none']        = 'Do not show any license information';
-- 
cgit v1.2.3


From fb4828803b474f9729dcc8e9920b19b7bc533a54 Mon Sep 17 00:00:00 2001
From: Danny Lin <danny0838@gmail.com>
Date: Mon, 11 Nov 2013 09:26:50 +0800
Subject: Update zh-tw translation

---
 inc/lang/zh-tw/lang.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 176121881..456377810 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -8,11 +8,11 @@
  * @author http://www.chinese-tools.com/tools/converter-simptrad.html
  * @author Wayne San <waynesan@zerozone.tw>
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
- * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
  * @author syaoranhinata@gmail.com
  * @author Ichirou Uchiki <syaoranhinata@gmail.com>
  * @author tsangho <ou4222@gmail.com>
+ * @author Danny Lin <danny0838@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -81,15 +81,17 @@ $lang['regbadmail']            = '您輸入的電郵地址似乎不正確。若
 $lang['regbadpass']            = '兩次輸入的密碼不一致，請再試一次。';
 $lang['regpwmail']             = '您的 DokuWiki 帳號密碼';
 $lang['reghere']               = '您還沒有帳號嗎？註冊一個吧。';
-$lang['profna']                = '在本 wiki 上，不能修改個人資料。';
+$lang['profna']                = '本 wiki 不支援修改個人資料。';
 $lang['profnochange']          = '並未作任何變更。';
 $lang['profnoempty']           = '帳號或電郵地址不可空白！';
 $lang['profchanged']           = '個人資料已更新。';
-$lang['profnodelete']          = '這一wiki不支援刪除用戶';
+$lang['profnodelete']          = '本 wiki 不支援刪除使用者';
 $lang['profdeleteuser']        = '刪除帳號';
-$lang['profdeleted']           = '您在這wiki中的用戶帳號已經被刪除';
+$lang['profdeleted']           = '您的使用者帳號已從本 wiki 刪除';
+$lang['profconfdelete']        = '我想把帳號從本 wiki 刪除（不能復原）';
+$lang['profconfdeletemissing'] = '未勾選確認方塊';
 $lang['pwdforget']             = '忘記密碼了？索取新密碼！';
-$lang['resendna']              = '本 wiki 並不支援重寄密碼。';
+$lang['resendna']              = '本 wiki 不支援重寄密碼。';
 $lang['resendpwd']             = '設定新密碼供';
 $lang['resendpwdmissing']      = '抱歉，您必須填寫所有欄位。';
 $lang['resendpwdnouser']       = '抱歉，資料庫內找不到這個使用者。';
@@ -97,7 +99,7 @@ $lang['resendpwdbadauth']      = '抱歉，認證碼無效。請確認您使用
 $lang['resendpwdconfirm']      = '確認連結已通過郵件發送給您了。';
 $lang['resendpwdsuccess']      = '您的新密碼已寄出。';
 $lang['license']               = '若無特別註明，本 wiki 上的內容都是採用以下授權方式：';
-$lang['licenseok']             = '注意：編輯此頁面表示您已同意以下的授權方式：';
+$lang['licenseok']             = '注意：編輯此頁面表示您同意用以下授權方式發布您撰寫的內容：';
 $lang['searchmedia']           = '搜尋檔名：';
 $lang['searchmedia_in']        = '在 %s 裏搜尋';
 $lang['txt_upload']            = '請選擇要上傳的檔案';
@@ -232,7 +234,7 @@ $lang['qb_extlink']            = '外部連結';
 $lang['qb_hr']                 = '水平線';
 $lang['qb_ol']                 = '有序列表項目';
 $lang['qb_ul']                 = '無序列表項目';
-$lang['qb_media']              = '加入圖片或檔案';
+$lang['qb_media']              = '加入圖片或檔案 (開新視窗)';
 $lang['qb_sig']                = '插入簽名';
 $lang['qb_smileys']            = '表情符號';
 $lang['qb_chars']              = '特殊字元';
@@ -271,6 +273,8 @@ $lang['subscr_m_receive']      = '接收';
 $lang['subscr_style_every']    = '每次更改都發送信件';
 $lang['subscr_style_digest']   = '對每個頁面發送更改的摘要信件 (每 %.2f 天)';
 $lang['subscr_style_list']     = '自上次發信以來更改的頁面的列表 (每 %.2f 天)';
+
+/* auth.class language support */
 $lang['authtempfail']          = '暫不提供帳號認證。若本狀況持續，請通知本 wiki 管理員。';
 $lang['authpwdexpire']         = '您的密碼將在 %d 天內到期，請馬上更換新密碼。';
 $lang['i_chooselang']          = '選擇您的語系';
@@ -332,3 +336,8 @@ $lang['media_perm_read']       = '抱歉，您沒有足夠權限讀取檔案。'
 $lang['media_perm_upload']     = '抱歉，您沒有足夠權限上傳檔案。';
 $lang['media_update']          = '上傳新的版本';
 $lang['media_restore']         = '還原這個版本';
+
+$lang['currentns']             = '目前的命名空間';
+$lang['searchresult']          = '搜尋結果';
+$lang['plainhtml']             = '純 HTML';
+$lang['wikimarkup']            = 'Wiki 語法標記';
-- 
cgit v1.2.3


From 3b77d6b3902e7c6a4d65c6d7fb191a5ac639d337 Mon Sep 17 00:00:00 2001
From: Ben Fey <benedikt.fey@beck-heun.de>
Date: Tue, 12 Nov 2013 20:46:38 +0100
Subject: translation update

---
 inc/lang/de/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 685e668c4..dceaf1af0 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -2,7 +2,7 @@
 
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
+ * 
  * @author Andreas Gohr <andi@splitbrain.org>
  * @author Christof <gagi@fin.de>
  * @author Anika Henke <anika@selfthinker.org>
-- 
cgit v1.2.3


From 797e3eee76b03d0f1af440597bcb6cc3a8fc0951 Mon Sep 17 00:00:00 2001
From: Artur <ncuxxx@gmail.com>
Date: Tue, 12 Nov 2013 20:48:09 +0100
Subject: translation update

---
 inc/lang/ru/lang.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'inc')

diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 6a0c4bb6b..237b819db 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -22,6 +22,7 @@
  * @author Johnny Utah <pcpa@cyberpunk.su>
  * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
  * @author Pavel <ivanovtsk@mail.ru>
+ * @author Artur <ncuxxx@gmail.com>
  */
 $lang['encoding']              = ' utf-8';
 $lang['direction']             = 'ltr';
-- 
cgit v1.2.3


From 90a057c9a99f25c1d828c83b69ac6a6068bbe8c8 Mon Sep 17 00:00:00 2001
From: alex <ralexay@gmail.com>
Date: Tue, 12 Nov 2013 20:49:06 +0100
Subject: translation update

---
 inc/lang/he/lang.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'inc')

diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 4ddc3a019..2c4d758ff 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -10,6 +10,7 @@
  * @author Yaron Yogev <yaronyogev@gmail.com>
  * @author Yaron Shahrabani <sh.yaron@gmail.com>
  * @author Roy Zahor <roy.zahor@gmail.com>
+ * @author alex <ralexay@gmail.com>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'rtl';
@@ -80,6 +81,7 @@ $lang['profna']                = 'בוויקי הזה לא ניתן לשנות 
 $lang['profnochange']          = 'אין שינויים, הפרופיל לא עודכן';
 $lang['profnoempty']           = 'השם וכתובת הדוא״ל לא יכולים להיות ריקים';
 $lang['profchanged']           = 'הפרופיל עודכן בהצלחה';
+$lang['profdeleteuser']        = 'הסר חשבון';
 $lang['pwdforget']             = 'שכחת את הססמה שלך? ניתן לקבל חדשה';
 $lang['resendna']              = 'הוויקי הזה אינו תומך בחידוש ססמה';
 $lang['resendpwd']             = 'הגדר סיסמא חדשה בעבור';
@@ -128,11 +130,15 @@ $lang['js']['nosmblinks']      = 'קישור לכונני שיתוף של Window
 $lang['js']['linkwiz']         = 'אשף הקישורים';
 $lang['js']['linkto']          = 'קישור אל:';
 $lang['js']['del_confirm']     = 'באמת למחוק?';
+$lang['js']['restore_confirm'] = 'באמת לשחזר את הגירסא הזאת?';
 $lang['js']['media_diff']      = 'הצגת הבדלים:';
 $lang['js']['media_diff_both'] = 'זה לצד זה';
 $lang['js']['media_select']    = 'בחר קבצים...';
 $lang['js']['media_upload_btn'] = 'העלאה';
+$lang['js']['media_done_btn']  = 'בוצע';
 $lang['js']['media_drop']      = 'גרור לכאן קבצים בכדי להעלותם';
+$lang['js']['media_cancel']    = 'הסר';
+$lang['js']['media_overwrt']   = 'שכתב קבצים קיימים';
 $lang['rssfailed']             = 'אירע כשל בעת קבלת הזנה זו:';
 $lang['nothingfound']          = 'לא נמצאו תוצאות.';
 $lang['mediaselect']           = 'קובצי מדיה';
@@ -183,6 +189,10 @@ $lang['summary']               = 'תקציר העריכה';
 $lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">תוסף פלאש לדפדפן</a> נדרש כדי להציג תוכן זה.';
 $lang['download']              = 'הורדת מקטע';
 $lang['tools']                 = 'כלים';
+$lang['user_tools']            = 'כלים של משתמש';
+$lang['site_tools']            = 'כלים של אתר';
+$lang['page_tools']            = 'כלים של דף';
+$lang['skip_to_content']       = 'עבור לתוכן';
 $lang['mail_newpage']          = 'דף נוסף:';
 $lang['mail_changed']          = 'דף שונה:';
 $lang['mail_subscribe_list']   = 'דפים שהשתנו במרחב השם:';
-- 
cgit v1.2.3


From ac4d41ba8ae73bb61890475242df4887e1f58399 Mon Sep 17 00:00:00 2001
From: soer9648 <soer9648@eucl.dk>
Date: Tue, 12 Nov 2013 20:52:27 +0100
Subject: translation update

---
 inc/lang/da/lang.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'inc')

diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 0da7e4761..eb50bb240 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -16,6 +16,7 @@
  * @author Mikael Lyngvig <mikael@lyngvig.org>
  * @author Soren Birk <soer9648@hotmail.com>
  * @author Jens Hyllegaard <jens.hyllegaard@gmail.com>
+ * @author soer9648 <soer9648@eucl.dk>
  */
 $lang['encoding']              = 'utf-8';
 $lang['direction']             = 'ltr';
@@ -91,6 +92,7 @@ $lang['profchanged']           = 'Brugerprofil opdateret korrekt.';
 $lang['profnodelete']          = 'Denne wiki supporterer ikke sletning af brugere';
 $lang['profdeleteuser']        = 'Slet Konto';
 $lang['profdeleted']           = 'Din brugerkonto er blevet slettet fra denne wiki';
+$lang['profconfdelete']        = 'Jeg ønsker at slette min konto fra denne wiki. <br/> Denne handling kan ikke fortrydes.';
 $lang['pwdforget']             = 'Har du glemt dit adgangskode? Få et nyt';
 $lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.';
 $lang['resendpwd']             = 'Vælg ny adgangskode for';
-- 
cgit v1.2.3


From fe578fe947d692a258e3a5f436b6359ada06c8da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 13 Nov 2013 22:40:09 +0200
Subject: media_isexternal do not capture

do not capture groups in media_isexternal. saves perhaps some cpu cycles and some bytes memory
---
 inc/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/media.php b/inc/media.php
index a9f6be771..f8fb3d496 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -90,7 +90,7 @@ function media_metasave($id,$auth,$data){
  * @return bool
  */
 function media_isexternal($id){
-    if (preg_match('#^(https?|ftp)://#i', $id)) return true;
+    if (preg_match('#^(?:https?|ftp)://#i', $id)) return true;
     return false;
 }
 
-- 
cgit v1.2.3


From 5381a7ee4e6527c7d6d6af67134ef92ba97f8745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 13 Nov 2013 22:52:40 +0200
Subject: remove 'infos' misspelling

http://english.stackexchange.com/questions/117552/why-does-information-not-have-a-plural-form
---
 inc/RemoteAPICore.php | 6 +++---
 inc/actions.php       | 2 +-
 inc/media.php         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc')

diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index 74c6689ac..2eb8ea403 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -88,12 +88,12 @@ class RemoteAPICore {
             ), 'wiki.getPageInfo' => array(
                 'args' => array('string'),
                 'return' => 'array',
-                'doc' => 'Returns a struct with infos about the page.',
+                'doc' => 'Returns a struct with info about the page.',
                 'name' => 'pageInfo'
             ), 'wiki.getPageInfoVersion' => array(
                 'args' => array('string', 'int'),
                 'return' => 'array',
-                'doc' => 'Returns a struct with infos about the page.',
+                'doc' => 'Returns a struct with info about the page.',
                 'name' => 'pageInfo'
             ), 'wiki.getPageVersions' => array(
                 'args' => array('string', 'int'),
@@ -136,7 +136,7 @@ class RemoteAPICore {
             ), 'wiki.getAttachmentInfo' => array(
                 'args' => array('string'),
                 'return' => 'array',
-                'doc' => 'Returns a struct with infos about the attachment.'
+                'doc' => 'Returns a struct with info about the attachment.'
             ), 'dokuwiki.getXMLRPCAPIVersion' => array(
                 'args' => array(),
                 'name' => 'getAPIVersion',
diff --git a/inc/actions.php b/inc/actions.php
index 5a59d852d..50cbe369f 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -53,7 +53,7 @@ function act_dispatch(){
             }
         }
 
-        //display some infos
+        //display some info
         if($ACT == 'check'){
             check();
             $ACT = 'show';
diff --git a/inc/media.php b/inc/media.php
index a9f6be771..6b87960e1 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -1484,7 +1484,7 @@ function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false
 }
 
 /**
- * Prints a thumbnail and metainfos
+ * Prints a thumbnail and metainfo
  */
 function media_printimgdetail($item, $fullscreen=false){
     // prepare thumbnail
-- 
cgit v1.2.3


From 1d40c802b748fdf35b44c0782ea1e19977ddaa85 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Thu, 14 Nov 2013 19:11:35 +0100
Subject: translation update

---
 inc/lang/sk/lang.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'inc')

diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index e8c1151d5..a5fc47f5f 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -327,3 +327,7 @@ $lang['media_perm_read']       = 'Prepáčte, ale nemáte dostatočné oprávnen
 $lang['media_perm_upload']     = 'Prepáčte, ale nemáte dostatočné oprávnenie na nahrávanie súborov.';
 $lang['media_update']          = 'Nahrať novú verziu';
 $lang['media_restore']         = 'Obnoviť túto verziu';
+$lang['currentns']             = 'Aktuálny menný priestor';
+$lang['searchresult']          = 'Výsledky hľadania';
+$lang['plainhtml']             = 'Jednoduché HTML';
+$lang['wikimarkup']            = 'Wiki formát';
-- 
cgit v1.2.3


From dc4e861bc179b74b87293e83e19a73f781d41690 Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sat, 16 Nov 2013 01:30:59 +0100
Subject: translation update

---
 inc/lang/ko/lang.php       | 16 ++++++++++------
 inc/lang/ko/searchpage.txt |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index e6cae3db0..0d4385884 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -23,7 +23,7 @@ $lang['btn_edit']              = '문서 편집';
 $lang['btn_source']            = '원본 보기';
 $lang['btn_show']              = '문서 보기';
 $lang['btn_create']            = '문서 만들기';
-$lang['btn_search']            = '찾기';
+$lang['btn_search']            = '검색';
 $lang['btn_save']              = '저장';
 $lang['btn_preview']           = '미리 보기';
 $lang['btn_top']               = '맨 위로';
@@ -98,8 +98,8 @@ $lang['resendpwdconfirm']      = '확인 링크를 이메일로 보냈습니다.
 $lang['resendpwdsuccess']      = '새 비밀번호를 이메일로 보냈습니다.';
 $lang['license']               = '별도로 명시하지 않을 경우, 이 위키의 내용은 다음의 라이선스에 따라 사용할 수 있습니다:';
 $lang['licenseok']             = '참고: 이 문서를 편집하면 내용은 다음 라이선스에 따라 사용 허가에 동의합니다:';
-$lang['searchmedia']           = '파일 이름 찾기:';
-$lang['searchmedia_in']        = '%s에서 찾기';
+$lang['searchmedia']           = '파일 이름 검색:';
+$lang['searchmedia_in']        = '%s에서 검색';
 $lang['txt_upload']            = '올릴 파일 선택';
 $lang['txt_filename']          = '올릴 파일 이름 입력 (선택 사항)';
 $lang['txt_overwrt']           = '기존 파일에 덮어쓰기';
@@ -108,7 +108,7 @@ $lang['lockedby']              = '현재 잠겨진 사용자';
 $lang['lockexpire']            = '잠금 해제 시간';
 $lang['js']['willexpire']      = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리 보기를 눌러 잠금 시간을 다시 설정하세요.';
 $lang['js']['notsavedyet']     = '저장하지 않은 바뀜이 사라집니다.';
-$lang['js']['searchmedia']     = '파일 찾기';
+$lang['js']['searchmedia']     = '파일 검색';
 $lang['js']['keepopen']        = '선택할 때 창을 열어 놓기';
 $lang['js']['hidedetails']     = '자세한 정보 숨기기';
 $lang['js']['mediatitle']      = '링크 설정';
@@ -308,7 +308,7 @@ $lang['minutes']               = '%d분 전';
 $lang['seconds']               = '%d초 전';
 $lang['wordblock']             = '차단 문구(스팸)를 포함하고 있어서 바뀜을 저장하지 않았습니다.';
 $lang['media_uploadtab']       = '올리기';
-$lang['media_searchtab']       = '찾기';
+$lang['media_searchtab']       = '검색';
 $lang['media_file']            = '파일';
 $lang['media_viewtab']         = '보기';
 $lang['media_edittab']         = '편집';
@@ -320,7 +320,7 @@ $lang['media_sort_date']       = '날짜';
 $lang['media_namespaces']      = '이름공간 선택';
 $lang['media_files']           = '%s에 있는 파일';
 $lang['media_upload']          = '%s에 올리기';
-$lang['media_search']          = '%s에서 찾기';
+$lang['media_search']          = '%s에서 검색';
 $lang['media_view']            = '%s';
 $lang['media_viewold']         = '%2$s (%1$s에 있음)';
 $lang['media_edit']            = '%s 편집';
@@ -330,3 +330,7 @@ $lang['media_perm_read']       = '죄송하지만 파일을 읽을 권한이 없
 $lang['media_perm_upload']     = '죄송하지만 파일을 올릴 권한이 없습니다.';
 $lang['media_update']          = '새 판 올리기';
 $lang['media_restore']         = '이 판으로 되돌리기';
+$lang['currentns']             = '현재 이름공간';
+$lang['searchresult']          = '검색 결과';
+$lang['plainhtml']             = '일반 HTML';
+$lang['wikimarkup']            = '위키 문법';
diff --git a/inc/lang/ko/searchpage.txt b/inc/lang/ko/searchpage.txt
index cb9bae2e0..35384c536 100644
--- a/inc/lang/ko/searchpage.txt
+++ b/inc/lang/ko/searchpage.txt
@@ -1,5 +1,5 @@
-====== 찾기 ======
+====== 검색 ======
 
-아래에서 찾기 결과를 볼 수 있습니다. 만일 원하는 문서를 찾지 못하였다면, "문서 만들기"나 "문서 편집"을 사용해 쿼리 내용과 같은 이름의 문서를 만들거나 편집할 수 있습니다.
+아래에서 검색 결과를 볼 수 있습니다. 만일 원하는 문서를 찾지 못하였다면, "문서 만들기"나 "문서 편집"을 사용해 쿼리 내용과 같은 이름의 문서를 만들거나 편집할 수 있습니다.
 
 ===== 결과 =====
\ No newline at end of file
-- 
cgit v1.2.3


From 9f8bbd4f694b7d35bf68038b6dc6bb8c1442aa56 Mon Sep 17 00:00:00 2001
From: Robert Bogenschneider <bogi@uea.org>
Date: Sun, 17 Nov 2013 00:00:58 +0100
Subject: translation update

---
 inc/lang/eo/lang.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'inc')

diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 4ed03244e..a543b2571 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -330,3 +330,7 @@ $lang['media_perm_read']       = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi d
 $lang['media_perm_upload']     = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.';
 $lang['media_update']          = 'Alŝuti novan version';
 $lang['media_restore']         = 'Restarigi ĉi tiun version';
+$lang['currentns']             = 'Aktuala nomspaco';
+$lang['searchresult']          = 'Serĉrezulto';
+$lang['plainhtml']             = 'Plena HTML';
+$lang['wikimarkup']            = 'Vikiteksto';
-- 
cgit v1.2.3


From f716ff896398302183a4268f3bc3fb85f95affeb Mon Sep 17 00:00:00 2001
From: Myeongjin <aranet100@gmail.com>
Date: Sun, 17 Nov 2013 00:55:59 +0100
Subject: translation update

---
 inc/lang/ko/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index 0d4385884..39f2428fa 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -96,8 +96,8 @@ $lang['resendpwdnouser']       = '죄송하지만 데이터베이스에서 이 
 $lang['resendpwdbadauth']      = '죄송하지만 인증 코드가 올바르지 않습니다. 잘못된 확인 링크인지 확인하세요.';
 $lang['resendpwdconfirm']      = '확인 링크를 이메일로 보냈습니다.';
 $lang['resendpwdsuccess']      = '새 비밀번호를 이메일로 보냈습니다.';
-$lang['license']               = '별도로 명시하지 않을 경우, 이 위키의 내용은 다음의 라이선스에 따라 사용할 수 있습니다:';
-$lang['licenseok']             = '참고: 이 문서를 편집하면 내용은 다음 라이선스에 따라 사용 허가에 동의합니다:';
+$lang['license']               = '별도로 명시하지 않을 경우, 이 위키의 내용은 다음 라이선스에 따라 사용할 수 있습니다:';
+$lang['licenseok']             = '참고: 이 문서를 편집하면 내용은 다음 라이선스에 따라 배포하는 데 동의합니다:';
 $lang['searchmedia']           = '파일 이름 검색:';
 $lang['searchmedia_in']        = '%s에서 검색';
 $lang['txt_upload']            = '올릴 파일 선택';
-- 
cgit v1.2.3


From 43c137edff65d5383d3e19fbbf50bc5045e4107a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 17 Nov 2013 19:55:02 +0000
Subject: changed user approval option to disable registration option in
 installer

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index c6bb0aa2d..7d52ca3db 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -315,7 +315,7 @@ $lang['i_policy']              = 'Initial ACL policy';
 $lang['i_pol0']                = 'Open Wiki (read, write, upload for everyone)';
 $lang['i_pol1']                = 'Public Wiki (read for everyone, write and upload for registered users)';
 $lang['i_pol2']                = 'Closed Wiki (read, write, upload for registered users only)';
-$lang['i_policyapprove']       = 'Registered users need to be approved before allowing access (to a Public or Closed Wiki)';
+$lang['i_disablereg']          = 'Do not allow users to register themselves';
 $lang['i_retry']               = 'Retry';
 $lang['i_license']             = 'Please choose the license you want to put your content under:';
 $lang['i_license_none']        = 'Do not show any license information';
-- 
cgit v1.2.3


From ab9346edc1621443d00551060b6db2d544ad3a71 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 17 Nov 2013 20:53:46 +0000
Subject: swapped logic for allowing/disabling registration in installer

---
 inc/lang/en/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc')

diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 7d52ca3db..17a75803f 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -315,7 +315,7 @@ $lang['i_policy']              = 'Initial ACL policy';
 $lang['i_pol0']                = 'Open Wiki (read, write, upload for everyone)';
 $lang['i_pol1']                = 'Public Wiki (read for everyone, write and upload for registered users)';
 $lang['i_pol2']                = 'Closed Wiki (read, write, upload for registered users only)';
-$lang['i_disablereg']          = 'Do not allow users to register themselves';
+$lang['i_allowreg']            = 'Allow users to register themselves';
 $lang['i_retry']               = 'Retry';
 $lang['i_license']             = 'Please choose the license you want to put your content under:';
 $lang['i_license_none']        = 'Do not show any license information';
-- 
cgit v1.2.3