From e8b5a4f91c8a6e230a6cfe13c43dc9ddce31e253 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sat, 28 Jul 2012 12:02:06 +0200
Subject: fix E_STRICT errors FS#2427

This commit fixes all E_STRICT messages shown when running the test
suite. There might be more problems not covered by tests, yet.

For compatibility reasons with plugins, E_STRICT errors are still
supressed.
---
 lib/plugins/action.php              | 2 +-
 lib/plugins/popularity/action.php   | 2 +-
 lib/plugins/safefnrecode/action.php | 2 +-
 lib/plugins/testing/action.php      | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/action.php b/lib/plugins/action.php
index 885bd7c96..a2ad969d7 100644
--- a/lib/plugins/action.php
+++ b/lib/plugins/action.php
@@ -17,7 +17,7 @@ class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
      /**
       * Registers a callback function for a given event
       */
-      function register($controller) {
+      function register(Doku_Event_Handler $controller) {
         trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
       }
 }
diff --git a/lib/plugins/popularity/action.php b/lib/plugins/popularity/action.php
index bf11efba6..1c7a2f65d 100644
--- a/lib/plugins/popularity/action.php
+++ b/lib/plugins/popularity/action.php
@@ -18,7 +18,7 @@ class action_plugin_popularity extends Dokuwiki_Action_Plugin {
     /**
      * Register its handlers with the dokuwiki's event controller
      */
-    function register(&$controller) {
+    function register(Doku_Event_Handler $controller) {
         $controller->register_hook('INDEXER_TASKS_RUN', 'AFTER',  $this, '_autosubmit', array());
     }
 
diff --git a/lib/plugins/safefnrecode/action.php b/lib/plugins/safefnrecode/action.php
index 5d3eaae3a..aae11c437 100644
--- a/lib/plugins/safefnrecode/action.php
+++ b/lib/plugins/safefnrecode/action.php
@@ -13,7 +13,7 @@ require_once DOKU_PLUGIN.'action.php';
 
 class action_plugin_safefnrecode extends DokuWiki_Action_Plugin {
 
-    public function register(Doku_Event_Handler &$controller) {
+    public function register(Doku_Event_Handler $controller) {
 
        $controller->register_hook('INDEXER_TASKS_RUN', 'BEFORE', $this, 'handle_indexer_tasks_run');
 
diff --git a/lib/plugins/testing/action.php b/lib/plugins/testing/action.php
index e829847b6..a242ab0b7 100644
--- a/lib/plugins/testing/action.php
+++ b/lib/plugins/testing/action.php
@@ -7,7 +7,8 @@
  * @author Tobias Sarnowski <tobias@trustedco.de>
  */
 class action_plugin_testing extends DokuWiki_Action_Plugin {
-    function register(&$controller) {
+
+    function register(Doku_Event_Handler $controller) {
         $controller->register_hook('DOKUWIKI_STARTED', 'AFTER', $this, 'dokuwikiStarted');
     }
 
-- 
cgit v1.2.3


From ebe6179c634de8874fe940ae1c5fe9792018d616 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 28 Jul 2012 13:03:27 +0100
Subject: fixed some RTL issues in mediamanager (FS#2433 and others)

---
 lib/tpl/dokuwiki/css/_media_fullscreen.css | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 9054ab26f..2811f2935 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -53,6 +53,9 @@
     margin: 0 10px 10px 0;
     position: relative;
 }
+[dir=rtl] #mediamanager__page .panelContent {
+    text-align: right;
+}
 
 #mediamanager__page .file .panelHeader,
 #mediamanager__page .file .panelContent {
@@ -107,9 +110,17 @@
     padding: 0;
     list-style: none;
 }
+[dir=rtl] #mediamanager__page .namespaces ul {
+    margin-left: 0;
+    margin-right: .2em;
+}
 #mediamanager__page .namespaces ul ul {
     margin-left: 1em;
 }
+[dir=rtl] #mediamanager__page .namespaces ul ul {
+    margin-left: 0;
+    margin-right: 1em;
+}
 #mediamanager__page .namespaces ul ul li {
     margin: 0;
 }
@@ -398,6 +409,10 @@
     text-align: left;
     border-color: __background__;
 }
+[dir=rtl] #mediamanager__diff td,
+[dir=rtl] #mediamanager__diff th {
+    text-align: right;
+}
 
 #mediamanager__diff th {
     font-weight: normal;
@@ -432,10 +447,6 @@
 #mediamanager__diff .imageDiff {
     position: relative;
 }
-#mediamanager__diff .imageDiff .image1,
-#mediamanager__diff .imageDiff .image2 {
-    width: 97%;
-}
 #mediamanager__diff .imageDiff .image2 {
     position: absolute;
     top: 0;
@@ -451,6 +462,10 @@
     overflow: hidden;
 }
 
+#mediamanager__diff .imageDiff.portions img {
+    float: left;
+}
+
 #mediamanager__diff .imageDiff img {
     width: 100%;
     max-width: none;
-- 
cgit v1.2.3


From 87f69c198897d8015cfb24120265d076a9b47f70 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 28 Jul 2012 13:31:36 +0100
Subject: fixed icons in buttons not showing in IE8 and below (FS#2568)

---
 lib/tpl/dokuwiki/css/basic.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index d683603ae..f33b21fbe 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -194,6 +194,10 @@ object {
     max-width: 100%;
     height: auto;
 }
+/* IE8 and below won't display the images otherwise */
+button img {
+    max-width: none;
+}
 
 hr {
     border-top: solid __border__;
-- 
cgit v1.2.3


From ff10b2405470c8c9c90a18830dafb641cdee70fe Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 28 Jul 2012 13:32:23 +0100
Subject: improved toolbar appearing to load slowly

---
 lib/scripts/edit.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/scripts/edit.js b/lib/scripts/edit.js
index 33a8f61b5..5a5e829bd 100644
--- a/lib/scripts/edit.js
+++ b/lib/scripts/edit.js
@@ -40,6 +40,8 @@ function createToolButton(icon,label,key,id,classname){
         icon = DOKU_BASE + 'lib/images/toolbar/' + icon;
     }
     $ico.attr('src', icon);
+    $ico.attr('width', 16);
+    $ico.attr('height', 16);
     $btn.append($ico);
 
     // we have to return a DOM object (for compatibility reasons)
-- 
cgit v1.2.3


From c4a2059c6e88bf3055f0ba3f8e079f10c950e1b0 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 28 Jul 2012 16:04:18 +0100
Subject: added link icons back into RTL styles for old default template
 (FS#2524)

---
 lib/tpl/default/rtl.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index 8b2837874..fbc22f304 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -54,15 +54,16 @@ div.dokuwiki li ol {
 
 div.dokuwiki a.urlextern,
 div.dokuwiki a.interwiki,
+div.dokuwiki a.mediafile,
 div.dokuwiki a.windows,
 div.dokuwiki a.mail {
-  /* should work but doesn't - so we just disable icons here*/
-  /*
   background-position: right 1px;
   padding-right: 16px;
-  */
-  background-image: none !important;
-  padding: 0px 0px 0px 0px;
+  padding-left: 0;
+}
+
+div.dokuwiki a.mediafile {
+  padding-right: 18px;
 }
 
 div.dokuwiki div.secedit input.button {
-- 
cgit v1.2.3


From 00c2d4a9d8fcb38b6a2294749b395d528952fde5 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 28 Jul 2012 20:51:59 +0100
Subject: fixed some RTL+IE7 bugs, mainly background icons and search form
 (FS#2569)

---
 lib/plugins/acl/style.css       | 4 ++++
 lib/tpl/default/rtl.css         | 1 +
 lib/tpl/dokuwiki/css/_links.css | 1 +
 lib/tpl/dokuwiki/css/design.css | 7 +++++++
 4 files changed, 13 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index 2eee4f41c..7044254a5 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -74,6 +74,7 @@ div#acl_manager .aclgroup {
 [dir=rtl] div#acl_manager .aclgroup {
     background: transparent url(pix/group.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
 }
 
 div#acl_manager .acluser {
@@ -83,6 +84,7 @@ div#acl_manager .acluser {
 [dir=rtl] div#acl_manager .acluser {
     background: transparent url(pix/user.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
 }
 
 div#acl_manager .aclpage {
@@ -92,6 +94,7 @@ div#acl_manager .aclpage {
 [dir=rtl] div#acl_manager .aclpage {
     background: transparent url(pix/page.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
 }
 
 div#acl_manager .aclns {
@@ -101,6 +104,7 @@ div#acl_manager .aclns {
 [dir=rtl] div#acl_manager .aclns {
     background: transparent url(pix/ns.png) right 1px no-repeat;
     padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
 }
 
 div#acl_manager label.disabled {
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
index fbc22f304..f16ba101b 100644
--- a/lib/tpl/default/rtl.css
+++ b/lib/tpl/default/rtl.css
@@ -60,6 +60,7 @@ div.dokuwiki a.mail {
   background-position: right 1px;
   padding-right: 16px;
   padding-left: 0;
+  display: inline-block; /* needed for IE7 */
 }
 
 div.dokuwiki a.mediafile {
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index 22502f6a9..e53ba45e5 100644
--- a/lib/tpl/dokuwiki/css/_links.css
+++ b/lib/tpl/dokuwiki/css/_links.css
@@ -70,4 +70,5 @@
 [dir=rtl] .dokuwiki a.mediafile {
     background-position: right center;
     padding: 0 18px 0 0;
+    display: inline-block; /* needed for IE7 */
 }
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index d1a00ce0a..8a3f20729 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -103,6 +103,10 @@
     padding-left: 0;
     padding-right: 20px;
 }
+[dir=rtl] #IE7 #dokuwiki__usertools a.action {
+    display: inline-block;
+}
+
 
 #dokuwiki__header .mobileTools {
     display: none; /* hide mobile tools dropdown to only show in mobile view */
@@ -176,6 +180,9 @@
     font-size: 0.875em;
     position: relative;
 }
+[dir=rtl] #IE7 #dokuwiki__sitetools form.search {
+    min-height: 1px;
+}
 #dokuwiki__sitetools form.search input.edit {
     width: 18em;
     padding: .35em 22px .35em .1em;
-- 
cgit v1.2.3


From faa7bcaae749311237124cce9f20e92fe7e25291 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 31 Jul 2012 23:18:35 +0100
Subject: fixed objects not showing properly (FS#2572)

---
 lib/tpl/dokuwiki/css/basic.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index f33b21fbe..4942de001 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -188,11 +188,11 @@ img {
     color: #666;
     background-color: transparent;
     font-style: italic;
+    height: auto;
 }
 img,
 object {
     max-width: 100%;
-    height: auto;
 }
 /* IE8 and below won't display the images otherwise */
 button img {
-- 
cgit v1.2.3


From 24d494984899eca69df2a5e50d941007500ba545 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Aug 2012 12:52:25 +0100
Subject: added some missing spaces (to popularity and revert plugins)

---
 lib/plugins/popularity/admin.php | 2 +-
 lib/plugins/revert/admin.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index a04e98a66..364075903 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -135,7 +135,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
             $form .= '<label for="autosubmit">'
                 .'<input type="checkbox" name="autosubmit" id="autosubmit" '
                 .($this->helper->isAutosubmitEnabled() ? 'checked' : '' )
-                .'/>' . $this->getLang('autosubmit') .'<br />'
+                .'/> ' . $this->getLang('autosubmit') .'<br />'
                 .'</label>'
                 .'<input type="hidden" name="do" value="admin" />'
                 .'<input type="hidden" name="page" value="popularity" />';
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index ff5fa69ba..958cf5acf 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -64,7 +64,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
         echo '<form action="" method="post"><div class="no">';
         echo '<label>'.$this->getLang('filter').': </label>';
         echo '<input type="text" name="filter" class="edit" value="'.hsc($_REQUEST['filter']).'" />';
-        echo '<input type="submit" class="button" value="'.$lang['btn_search'].'" />';
+        echo ' <input type="submit" class="button" value="'.$lang['btn_search'].'" />';
         echo ' <span>'.$this->getLang('note1').'</span>';
         echo '</div></form><br /><br />';
     }
@@ -134,7 +134,7 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
             echo ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) ? '<li class="minor">' : '<li>';
             echo '<div class="li">';
             echo '<input type="checkbox" name="revert[]" value="'.hsc($recent['id']).'" checked="checked" id="revert__'.$cnt.'" />';
-            echo '<label for="revert__'.$cnt.'">'.$date.'</label> ';
+            echo ' <label for="revert__'.$cnt.'">'.$date.'</label> ';
 
             echo '<a href="'.wl($recent['id'],"do=diff").'">';
             $p = array();
-- 
cgit v1.2.3


From 63e967bdfd6d3bd52960647f8490dfd9678353f9 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 5 Aug 2012 13:04:35 +0100
Subject: html validity fixes (removed name and align in some plugins)

---
 lib/plugins/acl/admin.php    | 10 +++++-----
 lib/plugins/acl/style.css    |  8 ++++++++
 lib/plugins/config/admin.php |  2 +-
 lib/scripts/media.js         |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index a0d2e430e..64d6ff3ca 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -191,7 +191,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '</div>'.NL;
 
         echo '<div class="footnotes"><div class="fn">'.NL;
-        echo '<sup><a id="fn__1" class="fn_bot" name="fn__1" href="#fnt__1">1)</a></sup>'.NL;
+        echo '<sup><a id="fn__1" class="fn_bot" href="#fnt__1">1)</a></sup>'.NL;
         echo $this->getLang('p_include');
         echo '</div></div>';
 
@@ -602,7 +602,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         echo '<tr>';
         echo '<th>'.$this->getLang('where').'</th>';
         echo '<th>'.$this->getLang('who').'</th>';
-        echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" name="fnt__1" href="#fn__1">1)</a></sup></th>';
+        echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" href="#fn__1">1)</a></sup></th>';
         echo '<th>'.$lang['btn_delete'].'</th>';
         echo '</tr>';
         foreach($this->acl as $where => $set){
@@ -630,7 +630,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                 echo $this->_html_checkboxes($perm,$ispage,'acl['.$where.']['.$who.']');
                 echo '</td>';
 
-                echo '<td align="center">';
+                echo '<td class="check">';
                 echo '<input type="checkbox" name="del['.hsc($where).'][]" value="'.hsc($who).'" />';
                 echo '</td>';
                 echo '</tr>';
@@ -638,7 +638,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         echo '<tr>';
-        echo '<th align="right" colspan="4">';
+        echo '<th class="action" colspan="4">';
         echo '<input type="submit" value="'.$lang['btn_update'].'" name="cmd[update]" class="button" />';
         echo '</th>';
         echo '</tr>';
@@ -746,7 +746,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
             }
 
             //build code
-            $ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
+            $ret .= '<label for="pbox'.$label.'"'.$class.'>';
             $ret .= '<input '.buildAttributes($atts).' />&#160;';
             $ret .= $this->getLang('acl_perm'.$perm);
             $ret .= '</label>'.NL;
diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index 7044254a5..f4277c341 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -67,6 +67,14 @@ div#acl_manager table.inline {
     margin: 0;
 }
 
+#acl_manager table .check {
+    text-align: center;
+}
+
+#acl_manager table .action {
+    text-align: right;
+}
+
 div#acl_manager .aclgroup {
     background: transparent url(pix/group.png) 0px 1px no-repeat;
     padding: 1px 0px 1px 18px;
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index c5f7ee532..bc2d88322 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -351,7 +351,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
     }
 
     function _print_h1($id, $text) {
-      ptln('<h1><a name="'.$id.'" id="'.$id.'">'.$text.'</a></h1>');
+      ptln('<h1 id="'.$id.'">'.$text.'</h1>');
     }
 
 
diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 841baa93f..1872f2c61 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -497,7 +497,7 @@ var dw_mediamanager = {
                 var maxWidth = widthFull - (widthOtherResizable + minWidthNonResizable);
                 $resizables.resizable( "option", "maxWidth", maxWidth );
 
-                // width of file panel in % = 100% - width of resizables in % 
+                // width of file panel in % = 100% - width of resizables in %
                 // this calculates with 99.99 and not 100 to overcome rounding errors
                 var relWidthNonResizable = 99.99 - (100 * widthResizables / widthFull);
                 // set width of file panel
@@ -699,7 +699,7 @@ var dw_mediamanager = {
         event.preventDefault();
 
         $link = jQuery(this);
-        id = $link.attr('name').substr(2);
+        id = $link.attr('id').substr(2);
 
         if(!opener){
             // if we don't run in popup display example
-- 
cgit v1.2.3


From 80a47290a7a01f2a320d09d387eea690ce1f62b4 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 6 Aug 2012 20:34:51 +0200
Subject: do not recompress already minified js FS#2574

---
 lib/exe/js.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index f84c07709..634e21207 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -102,8 +102,12 @@ function js_out(){
 
     // load files
     foreach($files as $file){
+        $ismin = (substr($file,-7) == '.min.js');
+
         echo "\n\n/* XXXXXXXXXX begin of ".str_replace(DOKU_INC, '', $file) ." XXXXXXXXXX */\n\n";
+        if($ismin) echo "\n/* BEGIN NOCOMPRESS */\n";
         js_load($file);
+        if($ismin) echo "\n/* END NOCOMPRESS */\n";
         echo "\n\n/* XXXXXXXXXX end of " . str_replace(DOKU_INC, '', $file) . " XXXXXXXXXX */\n\n";
     }
 
@@ -262,7 +266,18 @@ function js_compress($s){
         if($ch == '/' && $s{$i+1} == '*' && $s{$i+2} != '@'){
             $endC = strpos($s,'*/',$i+2);
             if($endC === false) trigger_error('Found invalid /*..*/ comment', E_USER_ERROR);
-            $i = $endC + 2;
+
+            // check if this is a NOCOMPRESS comment
+            if(substr($s, $i, $endC+2-$i) == '/* BEGIN NOCOMPRESS */'){
+                $endNC = strpos($s, '/* END NOCOMPRESS */', $endC+2);
+                if($endNC === false) trigger_error('Found invalid NOCOMPRESS comment', E_USER_ERROR);
+
+                // verbatim copy contents, trimming but putting it on its own line
+                $result .= "\n".trim(substr($s, $i + 22, $endNC - ($i + 22)))."\n"; // BEGIN comment = 22 chars
+                $i = $endNC + 20; // END comment = 20 chars
+            }else{
+                $i = $endC + 2;
+            }
             continue;
         }
 
-- 
cgit v1.2.3


From c51e95703cc34aca498b87ae89f78034a7cb8a54 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Thu, 23 Aug 2012 10:47:10 +0200
Subject: allow selects in block forms

---
 lib/tpl/dokuwiki/css/_forms.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index fb07e989a..3c7172226 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -36,6 +36,7 @@
     text-align: right;
 }
 
+.dokuwiki label.block select,
 .dokuwiki label.block input.edit {
   width: 50%;
 }
-- 
cgit v1.2.3


From 64273335d1bae12b2fe7d9664e1665d6e69d47af Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 24 Aug 2012 09:43:50 +0200
Subject: more $INPUT use FS#2577

---
 lib/exe/ajax.php          | 24 +++++++++++++-----------
 lib/plugins/acl/admin.php | 46 +++++++++++++++++++++++++---------------------
 lib/plugins/acl/ajax.php  | 11 +++++++----
 3 files changed, 45 insertions(+), 36 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 945091f34..496b2f1a1 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -162,7 +162,8 @@ function ajax_lock(){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function ajax_draftdel(){
-    $id = cleanID($_REQUEST['id']);
+    global $INPUT;
+    $id = cleanID($INPUT->str('id'));
     if(empty($id)) return;
 
     $client = $_SERVER['REMOTE_USER'];
@@ -218,11 +219,11 @@ function ajax_medialist(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function ajax_mediadetails(){
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf;
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf, $INPUT;
     $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
-    if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
+    if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
     if (isset($IMG)) $image = $IMG;
     if (isset($JUMPTO)) $image = $JUMPTO;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
@@ -237,25 +238,26 @@ function ajax_mediadetails(){
  */
 function ajax_mediadiff(){
     global $NS;
+    global $INPUT;
 
-    if ($_REQUEST['image']) $image = cleanID($_REQUEST['image']);
+    if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
     $NS = $_POST['ns'];
-    $auth = auth_quickaclcheck("$ns:*");
+    $auth = auth_quickaclcheck("$NS:*");
     media_diff($image, $NS, $auth, true);
 }
 
 function ajax_mediaupload(){
-    global $NS, $MSG;
+    global $NS, $MSG, $INPUT;
 
     if ($_FILES['qqfile']['tmp_name']) {
-        $id = ((empty($_POST['mediaid'])) ? $_FILES['qqfile']['name'] : $_POST['mediaid']);
-    } elseif (isset($_GET['qqfile'])) {
-        $id = $_GET['qqfile'];
+        $id = $INPUT->post->str('mediaid', $_FILES['qqfile']['name']);
+    } elseif ($INPUT->get->has('qqfile')) {
+        $id = $INPUT->get->str('qqfile');
     }
 
     $id = cleanID($id);
 
-    $NS = $_REQUEST['ns'];
+    $NS = $INPUT->str('ns');
     $ns = $NS.':'.getNS($id);
 
     $AUTH = auth_quickaclcheck("$ns:*");
@@ -264,7 +266,7 @@ function ajax_mediaupload(){
     if ($_FILES['qqfile']['error']) unset($_FILES['qqfile']);
 
     if ($_FILES['qqfile']['tmp_name']) $res = media_upload($NS, $AUTH, $_FILES['qqfile']);
-    if (isset($_GET['qqfile'])) $res = media_upload_xhr($NS, $AUTH);
+    if ($INPUT->get->has('qqfile')) $res = media_upload_xhr($NS, $AUTH);
 
     if ($res) $result = array('success' => true,
         'link' => media_managerURL(array('ns' => $ns, 'image' => $NS.':'.$id), '&'),
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 64d6ff3ca..1197892f2 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -56,22 +56,23 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         global $ID;
         global $auth;
         global $config_cascade;
+        global $INPUT;
 
         // fresh 1:1 copy without replacements
         $AUTH_ACL = file($config_cascade['acl']['default']);
 
 
         // namespace given?
-        if($_REQUEST['ns'] == '*'){
+        if($INPUT->str('ns') == '*'){
             $this->ns = '*';
         }else{
-            $this->ns = cleanID($_REQUEST['ns']);
+            $this->ns = cleanID($INPUT->str('ns'));
         }
 
-        if ($_REQUEST['current_ns']) {
-            $this->current_item = array('id' => cleanID($_REQUEST['current_ns']), 'type' => 'd');
-        } elseif ($_REQUEST['current_id']) {
-            $this->current_item = array('id' => cleanID($_REQUEST['current_id']), 'type' => 'f');
+        if ($INPUT->str('current_ns')) {
+            $this->current_item = array('id' => cleanID($INPUT->str('current_ns')), 'type' => 'd');
+        } elseif ($INPUT->str('current_id')) {
+            $this->current_item = array('id' => cleanID($INPUT->str('current_id')), 'type' => 'f');
         } elseif ($this->ns) {
             $this->current_item = array('id' => $this->ns, 'type' => 'd');
         } else {
@@ -79,24 +80,25 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         }
 
         // user or group choosen?
-        $who = trim($_REQUEST['acl_w']);
-        if($_REQUEST['acl_t'] == '__g__' && $who){
+        $who = trim($INPUT->str('acl_w'));
+        if($INPUT->str('acl_t') == '__g__' && $who){
             $this->who = '@'.ltrim($auth->cleanGroup($who),'@');
-        }elseif($_REQUEST['acl_t'] == '__u__' && $who){
+        }elseif($INPUT->str('acl_t') == '__u__' && $who){
             $this->who = ltrim($who,'@');
             if($this->who != '%USER%' && $this->who != '%GROUP%'){ #keep wildcard as is
                 $this->who = $auth->cleanUser($this->who);
             }
-        }elseif($_REQUEST['acl_t'] &&
-                $_REQUEST['acl_t'] != '__u__' &&
-                $_REQUEST['acl_t'] != '__g__'){
-            $this->who = $_REQUEST['acl_t'];
+        }elseif($INPUT->str('acl_t') &&
+                $INPUT->str('acl_t') != '__u__' &&
+                $INPUT->str('acl_t') != '__g__'){
+            $this->who = $INPUT->str('acl_t');
         }elseif($who){
             $this->who = $who;
         }
 
         // handle modifications
-        if(isset($_REQUEST['cmd']) && checkSecurityToken()){
+        if($INPUT->has('cmd') && checkSecurityToken()){
+            $cmd = $INPUT->extract('cmd')->str('cmd');
 
             // scope for modifications
             if($this->ns){
@@ -109,19 +111,21 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                 $scope = $ID;
             }
 
-            if(isset($_REQUEST['cmd']['save']) && $scope && $this->who && isset($_REQUEST['acl'])){
+            if($cmd == 'save' && $scope && $this->who && $INPUT->has('acl')){
                 // handle additions or single modifications
                 $this->_acl_del($scope, $this->who);
-                $this->_acl_add($scope, $this->who, (int) $_REQUEST['acl']);
-            }elseif(isset($_REQUEST['cmd']['del']) && $scope && $this->who){
+                $this->_acl_add($scope, $this->who, $INPUT->int('acl'));
+            }elseif($cmd == 'del' && $scope && $this->who){
                 // handle single deletions
                 $this->_acl_del($scope, $this->who);
-            }elseif(isset($_REQUEST['cmd']['update'])){
+            }elseif($cmd == 'update'){
+                $acl = $INPUT->arr('acl');
+
                 // handle update of the whole file
-                foreach((array) $_REQUEST['del'] as $where => $names){
+                foreach($INPUT->arr('del') as $where => $names){
                     // remove all rules marked for deletion
                     foreach($names as $who)
-                        unset($_REQUEST['acl'][$where][$who]);
+                        unset($acl[$where][$who]);
                 }
                 // prepare lines
                 $lines = array();
@@ -134,7 +138,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
                     }
                 }
                 // re-add all rules
-                foreach((array) $_REQUEST['acl'] as $where => $opt){
+                foreach($acl as $where => $opt){
                     foreach($opt as $who => $perm){
                         if ($who[0]=='@') {
                             if ($who!='@ALL') {
diff --git a/lib/plugins/acl/ajax.php b/lib/plugins/acl/ajax.php
index 3a5d89c08..10e18af97 100644
--- a/lib/plugins/acl/ajax.php
+++ b/lib/plugins/acl/ajax.php
@@ -11,6 +11,10 @@ require_once(DOKU_INC.'inc/init.php');
 //close session
 session_write_close();
 
+global $conf;
+global $ID;
+global $INPUT;
+
 //fix for Opera XMLHttpRequests
 $postData = http_get_raw_post_data();
 if(!count($_POST) && !empty($postData)){
@@ -22,20 +26,19 @@ if(!checkSecurityToken()) die('CRSF Attack');
 
 $ID    = getID();
 
+/** @var $acl admin_plugin_acl */
 $acl = plugin_load('admin','acl');
 $acl->handle();
 
-$ajax = $_REQUEST['ajax'];
+$ajax = $INPUT->str('ajax');
 header('Content-Type: text/html; charset=utf-8');
 
 if($ajax == 'info'){
     $acl->_html_info();
 }elseif($ajax == 'tree'){
-    global $conf;
-    global $ID;
 
     $dir = $conf['datadir'];
-    $ns  = $_REQUEST['ns'];
+    $ns  = $INPUT->str('ns');
     if($ns == '*'){
         $ns ='';
     }
-- 
cgit v1.2.3


From 0edda900aa7730d677390edffa0bdd7cab736e1d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 26 Aug 2012 16:02:48 +0200
Subject: replace deprecated split calls FS#2583

---
 lib/plugins/config/settings/config.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 29d21f8a3..8c48018d7 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -548,7 +548,7 @@ if (!class_exists('setting_email')) {
         if ($value == $input) return false;
 
         if ($this->_multiple) {
-            $mails = array_filter(array_map('trim', split(',', $input)));
+            $mails = array_filter(array_map('trim', explode(',', $input)));
         } else {
             $mails = array($input);
         }
-- 
cgit v1.2.3


From 5b838199e985590c6d716cd6add1973fcfd0d54c Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 26 Aug 2012 16:20:57 +0200
Subject: do not intialize media manager JS if not needed FS#2578

---
 lib/scripts/media.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 1872f2c61..074c7b95f 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -31,6 +31,7 @@ var dw_mediamanager = {
         var $content, $tree;
         $content = jQuery('#media__content');
         $tree    = jQuery('#media__tree');
+        if(!$tree.length) return;
 
         dw_mediamanager.prepare_content($content);
 
-- 
cgit v1.2.3


From ef72e4a3c6fc9a52facc6bb79015a1cf6083a8e2 Mon Sep 17 00:00:00 2001
From: Miroslav Svoboda <msv@email.cz>
Date: Sun, 26 Aug 2012 16:58:36 +0200
Subject: Czech language update

---
 lib/plugins/config/lang/cs/lang.php | 105 ++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 52 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/cs/lang.php b/lib/plugins/config/lang/cs/lang.php
index 091604aea..d2ec5035a 100644
--- a/lib/plugins/config/lang/cs/lang.php
+++ b/lib/plugins/config/lang/cs/lang.php
@@ -43,26 +43,27 @@ $lang['_template_sufix']       = 'Nastavení šablon';
 $lang['_msg_setting_undefined'] = 'Chybí metadata položky.';
 $lang['_msg_setting_no_class'] = 'Chybí třída položky.';
 $lang['_msg_setting_no_default'] = 'Chybí výchozí hodnota položky.';
-$lang['fmode']                 = 'Přístupová práva pro vytváření souborů';
-$lang['dmode']                 = 'Přístupová práva pro vytváření adresářů';
+$lang['title']                 = 'Název celé wiki';
+$lang['start']                 = 'Název úvodní stránky';
 $lang['lang']                  = 'Jazyk';
+$lang['template']              = 'Šablona';
+$lang['license']               = 'Pod jakou licencí má být tento obsah publikován?';
+$lang['savedir']               = 'Adresář pro ukládání dat';
 $lang['basedir']               = 'Kořenový adresář (např. <code>/dokuwiki/</code>). Pro autodetekci nechte prázdné.';
 $lang['baseurl']               = 'Kořenové URL (např. <code>http://www.yourserver.com</code>). Pro autodetekci nechte prázdné.';
-$lang['savedir']               = 'Adresář pro ukládání dat';
 $lang['cookiedir']             = 'Cesta pro cookie. Není-li vyplněno, použije se kořenové URL.';
-$lang['start']                 = 'Název úvodní stránky';
-$lang['title']                 = 'Název celé wiki';
-$lang['template']              = 'Šablona';
-$lang['license']               = 'Pod jakou licencí má být tento obsah publikován?';
-$lang['fullpath']              = 'Ukazovat plnou cestu ke stránkám v patičce';
+$lang['dmode']                 = 'Přístupová práva pro vytváření adresářů';
+$lang['fmode']                 = 'Přístupová práva pro vytváření souborů';
+$lang['allowdebug']            = 'Povolit debugování. <b>Vypněte, pokud to nepotřebujete!</b>';
 $lang['recent']                = 'Nedávné změny';
+$lang['recent_days']           = 'Jak staré nedávných změny uchovávat (ve dnech)';
 $lang['breadcrumbs']           = 'Počet odkazů na navštívené stránky';
 $lang['youarehere']            = 'Hierarchická "drobečková" navigace';
+$lang['fullpath']              = 'Ukazovat plnou cestu ke stránkám v patičce';
 $lang['typography']            = 'Provádět typografické nahrazování';
-$lang['htmlok']                = 'Povolit vložené HTML';
-$lang['phpok']                 = 'Povolit vložené PHP';
 $lang['dformat']               = 'Formát data (viz PHP funkci <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Podpis';
+$lang['showuseras']            = 'Co se má přesně zobrazit, když se ukazuje uživatel, který naposledy editoval stránku';
 $lang['toptoclevel']           = 'Nejvyšší úroveň, kterou začít automaticky generovaný obsah';
 $lang['tocminheads']           = 'Nejnižší počet hlavních nadpisů, aby se vygeneroval obsah';
 $lang['maxtoclevel']           = 'Maximální počet úrovní v automaticky generovaném obsahu';
@@ -70,15 +71,13 @@ $lang['maxseclevel']           = 'Nejnižší úroveň pro editaci i po sekcích
 $lang['camelcase']             = 'Používat CamelCase v odkazech';
 $lang['deaccent']              = 'Čistit názvy stránek';
 $lang['useheading']            = 'Používat první nadpis jako název stránky';
-$lang['refcheck']              = 'Kontrolovat odkazy na média (před vymazáním)';
-$lang['refshow']               = 'Počet zobrazených odkazů na média';
-$lang['allowdebug']            = 'Povolit debugování. <b>Vypněte, pokud to nepotřebujete!</b>';
-$lang['usewordblock']          = 'Blokovat spam za použití seznamu známých spamových slov';
-$lang['indexdelay']            = 'Časová prodleva před indexací (v sekundách)';
-$lang['relnofollow']           = 'Používat rel="nofollow" na externí odkazy';
-$lang['mailguard']             = 'Metoda "zamaskování" emailových adres';
-$lang['iexssprotect']          = 'Zkontrolovat nahrané soubory vůči možnému škodlivému JavaScriptu či HTML';
-$lang['showuseras']            = 'Co se má přesně zobrazit, když se ukazuje uživatel, který naposledy editoval stránku';
+$lang['sneaky_index']          = 'Ve výchozím nastavení DokuWiki zobrazuje v indexu všechny
+jmenné prostory. Zapnutím této volby se skryjí ty jmenné prostory,
+k nimž uživatel nemá právo pro čtení, což může ale způsobit, že
+vnořené jmenné prostory, k nimž právo má, budou přesto skryty.
+To může mít za následek, že index bude při některých
+nastaveních ACL nepoužitelný.';
+$lang['hidepages']             = 'Skrýt stránky odpovídající vzoru (regulární výrazy)';
 $lang['useacl']                = 'Používat přístupová práva (ACL)';
 $lang['autopasswd']            = 'Generovat hesla automaticky';
 $lang['authtype']              = 'Metoda autentizace';
@@ -87,63 +86,65 @@ $lang['defaultgroup']          = 'Výchozí skupina';
 $lang['superuser']             = 'Superuživatel - skupina nebo uživatel s plnými právy pro přístup ke všem stránkách bez ohledu na nastavení ACL';
 $lang['manager']               = 'Manažer - skupina nebo uživatel s přístupem k některým správcovským funkcím';
 $lang['profileconfirm']        = 'Potvrdit změny v profilu zadáním hesla';
+$lang['rememberme']            = 'Povolit trvaté přihlašovací cookies (zapamatuj si mě)';
 $lang['disableactions']        = 'Vypnout DokuWiki akce';
 $lang['disableactions_check']  = 'Zkontrolovat';
 $lang['disableactions_subscription'] = 'Přihlásit se/Odhlásit se ze seznamu pro odběr změn';
 $lang['disableactions_wikicode'] = 'Prohlížet zdrojové kódy/Export wiki textu';
 $lang['disableactions_other']  = 'Další akce (oddělené čárkou)';
-$lang['sneaky_index']          = 'Ve výchozím nastavení DokuWiki zobrazuje v indexu všechny
-jmenné prostory. Zapnutím této volby se skryjí ty jmenné prostory,
-k nimž uživatel nemá právo pro čtení, což může ale způsobit, že
-vnořené jmenné prostory, k nimž právo má, budou přesto skryty.
-To může mít za následek, že index bude při některých
-nastaveních ACL nepoužitelný.';
 $lang['auth_security_timeout'] = 'Časový limit pro autentikaci (v sekundách)';
 $lang['securecookie']          = 'Má prohlížeč posílat cookies nastavené přes HTTPS opět jen přes HTTPS? Vypněte tuto volbu, pokud chcete, aby bylo pomocí SSL zabezpečeno pouze přihlašování do wiki, ale obsah budete prohlížet nezabezpečeně.';
+$lang['usewordblock']          = 'Blokovat spam za použití seznamu známých spamových slov';
+$lang['relnofollow']           = 'Používat rel="nofollow" na externí odkazy';
+$lang['indexdelay']            = 'Časová prodleva před indexací (v sekundách)';
+$lang['mailguard']             = 'Metoda "zamaskování" emailových adres';
+$lang['iexssprotect']          = 'Zkontrolovat nahrané soubory vůči možnému škodlivému JavaScriptu či HTML';
+$lang['usedraft']              = 'Během editace ukládat koncept automaticky';
+$lang['htmlok']                = 'Povolit vložené HTML';
+$lang['phpok']                 = 'Povolit vložené PHP';
+$lang['locktime']              = 'Maximální životnost zámkových souborů (v sekundách)';
+$lang['cachetime']             = 'Maximální životnost cache (v sekundách)';
+$lang['target____wiki']        = 'Cílové okno pro interní odkazy';
+$lang['target____interwiki']   = 'Cílové okno pro interwiki odkazy';
+$lang['target____extern']      = 'Cílové okno pro externí odkazy';
+$lang['target____media']       = 'Cílové okno pro odkazy na média';
+$lang['target____windows']     = 'Cílové okno pro odkazy na windows sdílení';
+$lang['refcheck']              = 'Kontrolovat odkazy na média (před vymazáním)';
+$lang['refshow']               = 'Počet zobrazených odkazů na média';
+$lang['gdlib']                 = 'Verze GD knihovny';
+$lang['im_convert']            = 'Cesta k nástroji convert z balíku ImageMagick';
+$lang['jpg_quality']           = 'Kvalita komprese JPEG (0-100)';
+$lang['fetchsize']             = 'Maximální velikost souboru (v bajtech), co ještě fetch.php bude stahovat z externích zdrojů';
+$lang['subscribers']           = 'Možnost přihlásit se k odběru novinek stránky';
+$lang['subscribe_time']        = 'Časový interval v sekundách, ve kterém jsou posílány změny a souhrny změn. Interval by neměl být kratší než čas uvedený v recent_days.';
+$lang['notify']                = 'Posílat oznámení o změnách na následující emailovou adresu';
+$lang['registernotify']        = 'Posílat informace o nově registrovaných uživatelích na tuto mailovou adresu';
+$lang['mailfrom']              = 'E-mailová adresa, která se bude používat pro automatické maily';
+$lang['mailprefix']            = 'Předpona předmětu e-mailu, která se bude používat pro automatické maily';
+$lang['sitemap']               = 'Generovat Google sitemap (interval ve dnech)';
+$lang['rss_type']              = 'Typ XML kanálu';
+$lang['rss_linkto']            = 'XML kanál odkazuje na';
+$lang['rss_content']           = 'Co zobrazovat v položkách XML kanálu?';
+$lang['rss_update']            = 'Interval aktualizace XML kanálu (v sekundách)';
+$lang['rss_show_summary']      = 'XML kanál ukazuje souhrn v titulku';
 $lang['updatecheck']           = 'Kontrolovat aktualizace a bezpečnostní varování? DokuWiki potřebuje pro tuto funkci přístup k update.dokuwiki.org';
 $lang['userewrite']            = 'Používat "pěkná" URL';
 $lang['useslash']              = 'Používat lomítko jako oddělovač jmenných prostorů v URL';
-$lang['usedraft']              = 'Během editace ukládat koncept automaticky';
 $lang['sepchar']               = 'Znak pro oddělování slov v názvech stránek';
 $lang['canonical']             = 'Používat plně kanonická URL';
 $lang['fnencode']              = 'Metoda pro kódování ne-ASCII názvů souborů';
 $lang['autoplural']            = 'Kontrolovat plurálové tvary v odkazech';
 $lang['compression']           = 'Metoda komprese pro staré verze';
-$lang['cachetime']             = 'Maximální životnost cache (v sekundách)';
-$lang['locktime']              = 'Maximální životnost zámkových souborů (v sekundách)';
-$lang['fetchsize']             = 'Maximální velikost souboru (v bajtech), co ještě fetch.php bude stahovat z externích zdrojů';
-$lang['notify']                = 'Posílat oznámení o změnách na následující emailovou adresu';
-$lang['registernotify']        = 'Posílat informace o nově registrovaných uživatelích na tuto mailovou adresu';
-$lang['mailfrom']              = 'E-mailová adresa, která se bude používat pro automatické maily';
-$lang['mailprefix']            = 'Předpona předmětu e-mailu, která se bude používat pro automatické maily';
 $lang['gzip_output']           = 'Používat pro xhtml Content-Encoding gzip';
-$lang['gdlib']                 = 'Verze GD knihovny';
-$lang['im_convert']            = 'Cesta k nástroji convert z balíku ImageMagick';
-$lang['jpg_quality']           = 'Kvalita komprese JPEG (0-100)';
-$lang['subscribers']           = 'Možnost přihlásit se k odběru novinek stránky';
-$lang['subscribe_time']        = 'Časový interval v sekundách, ve kterém jsou posílány změny a souhrny změn. Interval by neměl být kratší než čas uvedený v recent_days.';
 $lang['compress']              = 'Zahustit CSS a JavaScript výstup';
 $lang['cssdatauri']            = 'Velikost [v bajtech] obrázků odkazovaných v CSS souborech, které budou pro ušetření HTTP požadavku vestavěny do stylu. Tato technika nefunguje v IE 7 a starším. Doporučená hodnota je mezi <code>400</code> a <code>600</code> bajty. Pro vypnutí nastavte na <code>0</code>.';
-$lang['hidepages']             = 'Skrýt stránky odpovídající vzoru (regulární výrazy)';
 $lang['send404']               = 'Posílat "HTTP 404/Page Not Found" pro neexistují stránky';
-$lang['sitemap']               = 'Generovat Google sitemap (interval ve dnech)';
 $lang['broken_iua']            = 'Je na vašem systému funkce ignore_user_abort porouchaná? To může způsobovat nefunkčnost vyhledávacího indexu. O kombinaci IIS+PHP/CGI je známo, že nefunguje správně. Viz <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> pro více informací.';
 $lang['xsendfile']             = 'Používat X-Sendfile hlavničky pro download statických souborů z webserveru? Je však požadována podpora této funkce na straně Vašeho webserveru.';
 $lang['renderer_xhtml']        = 'Vykreslovací jádro pro hlavní (xhtml) výstup wiki';
 $lang['renderer__core']        = '%s (jádro DokuWiki)';
 $lang['renderer__plugin']      = '%s (plugin)';
-$lang['rememberme']            = 'Povolit trvaté přihlašovací cookies (zapamatuj si mě)';
-$lang['rss_type']              = 'Typ XML kanálu';
-$lang['rss_linkto']            = 'XML kanál odkazuje na';
-$lang['rss_content']           = 'Co zobrazovat v položkách XML kanálu?';
-$lang['rss_update']            = 'Interval aktualizace XML kanálu (v sekundách)';
-$lang['recent_days']           = 'Jak staré nedávných změny uchovávat (ve dnech)';
-$lang['rss_show_summary']      = 'XML kanál ukazuje souhrn v titulku';
-$lang['target____wiki']        = 'Cílové okno pro interní odkazy';
-$lang['target____interwiki']   = 'Cílové okno pro interwiki odkazy';
-$lang['target____extern']      = 'Cílové okno pro externí odkazy';
-$lang['target____media']       = 'Cílové okno pro odkazy na média';
-$lang['target____windows']     = 'Cílové okno pro odkazy na windows sdílení';
+$lang['dnslookups']            = 'DokuWiki zjišťuje DNS jména pro vzdálené IP adresy uživatelů, kteří editují stránky. Pokud máte pomalý, nebo nefunkční DNS server, nebo nepotřebujete tuto funkci, tak tuto volbu zrušte.';
 $lang['proxy____host']         = 'Název proxy serveru';
 $lang['proxy____port']         = 'Proxy port';
 $lang['proxy____user']         = 'Proxy uživatelské jméno';
-- 
cgit v1.2.3


From 940dbfe468f779c7c88783a4cecb82c4dc97143b Mon Sep 17 00:00:00 2001
From: Gerrit <klapinklapin@gmail.com>
Date: Sun, 26 Aug 2012 17:02:19 +0200
Subject: Dutch language update

---
 lib/plugins/acl/lang/nl/lang.php         |  1 +
 lib/plugins/config/lang/nl/lang.php      | 33 ++++++++++++++++----------------
 lib/plugins/plugin/lang/nl/lang.php      |  3 ++-
 lib/plugins/popularity/lang/nl/lang.php  |  1 +
 lib/plugins/revert/lang/nl/lang.php      |  1 +
 lib/plugins/usermanager/lang/nl/lang.php |  1 +
 6 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/nl/lang.php b/lib/plugins/acl/lang/nl/lang.php
index cb0765505..567eb46dc 100644
--- a/lib/plugins/acl/lang/nl/lang.php
+++ b/lib/plugins/acl/lang/nl/lang.php
@@ -18,6 +18,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['admin_acl']             = 'Toegangsrechten';
 $lang['acl_group']             = 'Groep';
diff --git a/lib/plugins/config/lang/nl/lang.php b/lib/plugins/config/lang/nl/lang.php
index e0c9d7d7c..85dc2c4c7 100644
--- a/lib/plugins/config/lang/nl/lang.php
+++ b/lib/plugins/config/lang/nl/lang.php
@@ -15,6 +15,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['menu']                  = 'Configuratie-instellingen';
 $lang['error']                 = 'De instellingen zijn niet gewijzigd wegens een incorrecte waarde, kijk je wijzigingen na en sla dan opnieuw op.<br />Je kunt de incorrecte waarde(s) herkennen aan de rode rand.';
@@ -59,14 +60,14 @@ $lang['cookiedir']             = 'Cookie pad. Laat leeg om de basis URL te gebru
 $lang['dmode']                 = 'Directory-aanmaak-modus (directory creation mode)';
 $lang['fmode']                 = 'Bestandaanmaak-modus (file creation mode)';
 $lang['allowdebug']            = 'Debug toestaan <b>uitzetten indien niet noodzakelijk!</b>';
-$lang['recent']                = 'Recente wijzigingen';
+$lang['recent']                = 'Het aantal regels in Recente wijzigingen';
 $lang['recent_days']           = 'Hoeveel recente wijzigingen bewaren (dagen)';
-$lang['breadcrumbs']           = 'Aantal broodkruimels';
-$lang['youarehere']            = 'Hierarchische broodkruimels';
+$lang['breadcrumbs']           = 'Aantal broodkruimels. Zet dit op 0 om uit te schakelen.';
+$lang['youarehere']            = 'Gebruik hierarchische broodkruimels (waarschijnlijk wil je dan de optie hierboven uitschakelen)';
 $lang['fullpath']              = 'Volledig pad van pagina\'s in de footer weergeven';
 $lang['typography']            = 'Breng typografische wijzigingen aan';
 $lang['dformat']               = 'Datum formaat (zie de PHP <a href="http://www.php.net/strftime">strftime</a> functie)';
-$lang['signature']             = 'Ondertekening';
+$lang['signature']             = 'Tekst die ingevoegd wordt met de Handtekening-knop in het bewerkvenster.';
 $lang['showuseras']            = 'Hoe de gebruiker die de pagina het laatst wijzigde weergeven';
 $lang['toptoclevel']           = 'Bovenste niveau voor inhoudsopgave';
 $lang['tocminheads']           = 'Minimum aantal koppen dat bepaald of een index gemaakt wordt';
@@ -76,12 +77,12 @@ $lang['camelcase']             = 'CamelCase gebruiken voor links';
 $lang['deaccent']              = 'Paginanamen ontdoen van vreemde tekens';
 $lang['useheading']            = 'Eerste kopje voor paginanaam gebruiken';
 $lang['sneaky_index']          = 'Met de standaardinstellingen zal DokuWiki alle namespaces laten zien in de index. Het inschakelen van deze optie zorgt ervoor dat de namespaces waar de gebruiker geen leestoegang tot heeft, verborgen worden. Dit kan resulteren in het verbergen van subnamespaces waar de gebruiker wel toegang to heeft. Dit kan de index onbruikbaar maken met bepaalde ACL-instellingen.';
-$lang['hidepages']             = 'Verberg deze pagina\'s (regular expressions)';
+$lang['hidepages']             = 'Verberg deze pagina\'s in zoekresultaten, de index en andere automatische indexen (regular expressions)';
 $lang['useacl']                = 'Gebruik access control lists';
 $lang['autopasswd']            = 'Zelf wachtwoorden genereren';
 $lang['authtype']              = 'Authenticatiemechanisme';
 $lang['passcrypt']             = 'Encryptie-methode voor wachtwoord ';
-$lang['defaultgroup']          = 'Standaardgroep';
+$lang['defaultgroup']          = 'Standaardgroep, alle nieuwe gebruikers worden hierin geplaatst';
 $lang['superuser']             = 'Superuser - een groep of gebruiker of kommalijst (gebruiker1,@groep1,gebruiker2) met volledige toegang tot alle pagina\'s en functies, ongeacht de ACL instellingen';
 $lang['manager']               = 'Beheerder - een groep of gebruiker of kommalijst (gebruiker1,@groep1,gebruiker2) met toegang tot bepaalde beheersfunctionaliteit';
 $lang['profileconfirm']        = 'Bevestig profielwijzigingen met wachtwoord';
@@ -110,19 +111,19 @@ $lang['target____interwiki']   = 'Doelvenster voor interwiki-links';
 $lang['target____extern']      = 'Doelvenster voor externe links';
 $lang['target____media']       = 'Doelvenster voor medialinks';
 $lang['target____windows']     = 'Doelvenster voor windows links';
-$lang['mediarevisions']        = 'Media revisies activeren?';
-$lang['refcheck']              = 'Controleer verwijzingen naar media';
+$lang['mediarevisions']        = 'Mediarevisies activeren?';
+$lang['refcheck']              = 'Controleer of er verwijzingen bestaan naar een mediabestand voor het wijderen';
 $lang['refshow']               = 'Aantal te tonen mediaverwijzingen';
 $lang['gdlib']                 = 'Versie GD Lib ';
 $lang['im_convert']            = 'Path naar ImageMagick\'s convert tool';
 $lang['jpg_quality']           = 'JPG compressiekwaliteit (0-100)';
-$lang['fetchsize']             = 'Maximum grootte (bytes) die fetch.php mag downloaden van buiten';
+$lang['fetchsize']             = 'Maximum grootte (bytes) die fetch.php mag downloaden van externe URLs, bijv. voor cachen of herschalen van externe afbeeldingen.';
 $lang['subscribers']           = 'Ondersteuning pagina-inschrijving aanzetten';
 $lang['subscribe_time']        = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"';
-$lang['notify']                = 'Stuur e-mailnotificaties naar dit adres';
-$lang['registernotify']        = 'Stuur informatie over nieuw aangemelde gebruikers naar dit e-mailadres';
-$lang['mailfrom']              = 'E-mailadres voor automatische e-mail';
-$lang['mailprefix']            = 'Te gebruiken voorvoegsel voor onderwerp automatische email';
+$lang['notify']                = 'Stuur altijd e-mailnotificaties naar dit adres';
+$lang['registernotify']        = 'Stuur altijd informatie over nieuw geregistreerde gebruikers naar dit e-mailadres';
+$lang['mailfrom']              = 'E-mailadres van afzender voor automatische e-mail';
+$lang['mailprefix']            = 'Te gebruiken voorvoegsel voor onderwerp automatische email. Leeglaten gebruik de wikititel.';
 $lang['htmlmail']              = 'Zend multipart HTML e-mail. Dit ziet er beter uit, maar is groter. Uitschakelen betekent e-mail in platte tekst.';
 $lang['sitemap']               = 'Genereer Google sitemap (dagen). 0 betekent uitschakelen.';
 $lang['rss_type']              = 'XML feed type';
@@ -143,7 +144,7 @@ $lang['gzip_output']           = 'Gebruik gzip Content-Encoding voor xhtml';
 $lang['compress']              = 'Compacte CSS en javascript output';
 $lang['cssdatauri']            = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! <code>400</code> tot <code>600</code> is een geschikte omvang. Stel de omvang in op <code>0</code> om deze functionaliteit uit te schakelen.';
 $lang['send404']               = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s';
-$lang['broken_iua']            = 'Is de ignore_user_abort functie onbruikbaar op uw systeem? Dit kan een onbruikbare zoekindex tot gevolg hebben. IIS+PHP/CGI staat hier bekend om. Zie <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> voor meer informatie.';
+$lang['broken_iua']            = 'Is de ignore_user_abort functie onbruikbaar op uw systeem? Dit kan een onbruikbare zoekindex tot gevolg hebben. IIS+PHP/CGI staat hier bekend om. Zie <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">Bug 852</a> voor meer informatie.';
 $lang['xsendfile']             = 'Gebruik de X-Sendfile header om de webserver statische content te laten versturen? De webserver moet dit wel ondersteunen.';
 $lang['renderer_xhtml']        = 'Weergavesysteem voor de standaard (xhtml) wiki-uitvoer';
 $lang['renderer__core']        = '%s (dokuwiki core)';
@@ -191,9 +192,9 @@ $lang['compression_o_0']       = 'geen';
 $lang['compression_o_gz']      = 'gzip';
 $lang['compression_o_bz2']     = 'bz2';
 $lang['xsendfile_o_0']         = 'niet gebruiken';
-$lang['xsendfile_o_1']         = 'Eigen lighttpd header (voor release 1.5)';
+$lang['xsendfile_o_1']         = 'Merkgebonden lighttpd header (voor release 1.5)';
 $lang['xsendfile_o_2']         = 'Standaard X-Sendfile header';
-$lang['xsendfile_o_3']         = 'Propritary Nginx X-Accel-Redirect header';
+$lang['xsendfile_o_3']         = 'Merkgebonden Nginx X-Accel-Redirect header';
 $lang['showuseras_o_loginname'] = 'Loginnaam';
 $lang['showuseras_o_username'] = 'Volledige naam';
 $lang['showuseras_o_email']    = 'E-mailadres (onherkenbaar gemaakt volgens mailguard-instelling)';
diff --git a/lib/plugins/plugin/lang/nl/lang.php b/lib/plugins/plugin/lang/nl/lang.php
index 0599c3184..10db78411 100644
--- a/lib/plugins/plugin/lang/nl/lang.php
+++ b/lib/plugins/plugin/lang/nl/lang.php
@@ -13,6 +13,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['menu']                  = 'Plugins beheren';
 $lang['download']              = 'Download en installeer een nieuwe plugin';
@@ -58,4 +59,4 @@ $lang['enabled']               = 'Plugin %s ingeschakeld.';
 $lang['notenabled']            = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.';
 $lang['disabled']              = 'Plugin %s uitgeschakeld.';
 $lang['notdisabled']           = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.';
-$lang['packageinstalled']      = 'Plugin package (%d plugin%s: %s) succesvol geïnstalleerd.';
+$lang['packageinstalled']      = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.';
diff --git a/lib/plugins/popularity/lang/nl/lang.php b/lib/plugins/popularity/lang/nl/lang.php
index e5e94aab4..b32ad9eb6 100644
--- a/lib/plugins/popularity/lang/nl/lang.php
+++ b/lib/plugins/popularity/lang/nl/lang.php
@@ -12,6 +12,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['name']                  = 'Populariteitsfeedback (kan even duren om in te laden)';
 $lang['submit']                = 'Verstuur';
diff --git a/lib/plugins/revert/lang/nl/lang.php b/lib/plugins/revert/lang/nl/lang.php
index 32e14c2c4..0a2880105 100644
--- a/lib/plugins/revert/lang/nl/lang.php
+++ b/lib/plugins/revert/lang/nl/lang.php
@@ -13,6 +13,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['menu']                  = 'Herstelmanager';
 $lang['filter']                = 'Zoek naar bekladde pagina\'s';
diff --git a/lib/plugins/usermanager/lang/nl/lang.php b/lib/plugins/usermanager/lang/nl/lang.php
index b00ab22e0..8f30ce3ea 100644
--- a/lib/plugins/usermanager/lang/nl/lang.php
+++ b/lib/plugins/usermanager/lang/nl/lang.php
@@ -13,6 +13,7 @@
  * @author Timon Van Overveldt <timonvo@gmail.com>
  * @author Jeroen
  * @author Ricardo Guijt <ricardoguijt@gmail.com>
+ * @author Gerrit <klapinklapin@gmail.com>
  */
 $lang['menu']                  = 'Gebruikersmanager';
 $lang['noauth']                = '(gebruikersauthenticatie niet beschikbaar)';
-- 
cgit v1.2.3


From 77d444775d6fc918bc5be095a9dfef18443c1844 Mon Sep 17 00:00:00 2001
From: Otto Vainio <otto@valjakko.net>
Date: Sun, 26 Aug 2012 17:03:58 +0200
Subject: Finish language update

---
 lib/plugins/config/lang/fi/lang.php | 104 ++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 47 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php
index f75a18ecd..9e067b277 100644
--- a/lib/plugins/config/lang/fi/lang.php
+++ b/lib/plugins/config/lang/fi/lang.php
@@ -29,6 +29,8 @@ $lang['_anti_spam']            = 'Anti-Spam asetukset';
 $lang['_editing']              = 'Sivumuokkauksen asetukset';
 $lang['_links']                = 'Linkkien asetukset';
 $lang['_media']                = 'Media-asetukset';
+$lang['_notifications']        = 'Ilmoitusasetukset';
+$lang['_syndication']          = 'Syöteasetukset';
 $lang['_advanced']             = 'Lisäasetukset';
 $lang['_network']              = 'Verkkoasetukset';
 $lang['_plugin_sufix']         = 'liitännäisen asetukset';
@@ -36,26 +38,29 @@ $lang['_template_sufix']       = 'Sivumallin asetukset';
 $lang['_msg_setting_undefined'] = 'Ei asetusten metadataa.';
 $lang['_msg_setting_no_class'] = 'Ei asetusluokkaa.';
 $lang['_msg_setting_no_default'] = 'Ei oletusarvoa';
-$lang['fmode']                 = 'Tiedoston luontioikeudet';
-$lang['dmode']                 = 'Hakemiston luontioikeudet';
+$lang['title']                 = 'Wikin nimi';
+$lang['start']                 = 'Alkusivun nimi';
 $lang['lang']                  = 'Kieli';
+$lang['template']              = 'Sivumalli';
+$lang['tagline']               = 'Slogan (jos sivupohja tukee sitä)';
+$lang['sidebar']               = 'Sivupalkin sivun nimi (jos sivupohja tukee sitä), tyhjä kenttä kytkee sivupalkin pois';
+$lang['license']               = 'Millä lisenssillä sisältö pitäisi julkaista?';
+$lang['savedir']               = 'Hakemisto tietojen tallennukseen.';
 $lang['basedir']               = 'Perushakemisto';
 $lang['baseurl']               = 'Perus URL';
-$lang['savedir']               = 'Hakemisto tietojen tallennukseen.';
 $lang['cookiedir']             = 'Cookien path. Jätä tyhjäksi käyttääksesi baseurl arvoa';
-$lang['start']                 = 'Alkusivun nimi';
-$lang['title']                 = 'Wikin nimi';
-$lang['template']              = 'Sivumalli';
-$lang['license']               = 'Millä lisenssillä sisältö pitäisi julkaista?';
-$lang['fullpath']              = 'Näytä sivun koko polku sivun alareunassa';
+$lang['dmode']                 = 'Hakemiston luontioikeudet';
+$lang['fmode']                 = 'Tiedoston luontioikeudet';
+$lang['allowdebug']            = 'Salli debuggaus <b>pois, jos ei tarvita!</b>';
 $lang['recent']                = 'Viime muutokset';
+$lang['recent_days']           = 'Montako edellistä muutosta säilytetään (päiviä)';
 $lang['breadcrumbs']           = 'Leivänmurujen määrä';
 $lang['youarehere']            = 'Hierarkkiset leivänmurut';
+$lang['fullpath']              = 'Näytä sivun koko polku sivun alareunassa';
 $lang['typography']            = 'Tee typografiset korvaukset';
-$lang['htmlok']                = 'Salli upotettu HTML';
-$lang['phpok']                 = 'Salli upotettu PHP';
 $lang['dformat']               = 'Päivämäärän muoto (katso PHPn <a href="http://www.php.net/strftime">strftime</a> funktiota)';
 $lang['signature']             = 'Allekirjoitus';
+$lang['showuseras']            = 'Mitä näytetään, kun kerrotaan viimeisen editoijan tiedot';
 $lang['toptoclevel']           = 'Ylätason sisällysluettelo';
 $lang['tocminheads']           = 'Pienin otsikkorivien määrä, jotta sisällysluettelo tehdään';
 $lang['maxtoclevel']           = 'Sisällysluettelon suurin syvyys';
@@ -63,15 +68,8 @@ $lang['maxseclevel']           = 'Kappale-editoinnin suurin syvyys.';
 $lang['camelcase']             = 'Käytä CamelCase linkkejä';
 $lang['deaccent']              = 'Siivoa sivun nimet';
 $lang['useheading']            = 'Käytä ensimmäistä otsikkoriviä sivun nimenä.';
-$lang['refcheck']              = 'Mediaviitteen tarkistus';
-$lang['refshow']               = 'Montako mediaviitettä näytetään';
-$lang['allowdebug']            = 'Salli debuggaus <b>pois, jos ei tarvita!</b>';
-$lang['usewordblock']          = 'Estä spam sanalistan avulla';
-$lang['indexdelay']            = 'Aikaraja indeksoinnille (sek)';
-$lang['relnofollow']           = 'Käytä rel="nofollow" ulkoisille linkeille';
-$lang['mailguard']             = 'Häivytä email osoite';
-$lang['iexssprotect']          = 'Tarkista lähetetyt tiedostot pahojen javascript- ja html-koodien varalta';
-$lang['showuseras']            = 'Mitä näytetään, kun kerrotaan viimeisen editoijan tiedot';
+$lang['sneaky_index']          = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla';
+$lang['hidepages']             = 'Piilota seuraavat sivut (säännönmukainen lauseke)';
 $lang['useacl']                = 'Käytä käyttöoikeuksien hallintaa';
 $lang['autopasswd']            = 'Luo salasana automaattisesti';
 $lang['authtype']              = 'Autentikointijärjestelmä';
@@ -80,59 +78,71 @@ $lang['defaultgroup']          = 'Oletusryhmä';
 $lang['superuser']             = 'Pääkäyttäjä. Ryhmä tai käyttäjä, jolla on täysi oikeus kaikkiin sivuihin ja toimintoihin käyttöoikeuksista huolimatta';
 $lang['manager']               = 'Ylläpitäjä. Ryhmä tai käyttäjä, jolla on pääsy joihinkin ylläpitotoimintoihin';
 $lang['profileconfirm']        = 'Vahvista profiilin päivitys salasanan avulla';
+$lang['rememberme']            = 'Salli pysyvät kirjautumis-cookiet (muista minut)';
 $lang['disableactions']        = 'Estä DokuWiki-toimintojen käyttö';
 $lang['disableactions_check']  = 'Tarkista';
 $lang['disableactions_subscription'] = 'Tilaa/Peruuta tilaus';
 $lang['disableactions_wikicode'] = 'Näytä lähdekoodi/Vie raakana';
 $lang['disableactions_other']  = 'Muut toiminnot (pilkulla erotettuna)';
-$lang['sneaky_index']          = 'Oletuksena DokuWiki näyttää kaikki nimiavaruudet index-näkymäsä. Tämä asetus piilottaa ne, joihin käyttäjällä ei ole lukuoikeuksia. Tämä voi piilottaa joitakin sallittuja alinimiavaruuksia. Tästä johtuen index-näkymä voi olla käyttökelvoton joillakin ACL-asetuksilla';
 $lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)';
 $lang['securecookie']          = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhteydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.';
+$lang['remote']                = 'Kytke käyttöön remote API system. Tämä antaa muille sovelluksille mahdollisuuden käyttää wikiä käyttämällä XML-RPC, tai muuta mekanismiä.';
+$lang['remoteuser']            = 'Salli remote API käyttö vain pilkulla erotetuille ryhmille tai käyttäjille. Tyhjä kenttä sallii kaikkien käyttää.';
+$lang['usewordblock']          = 'Estä spam sanalistan avulla';
+$lang['relnofollow']           = 'Käytä rel="nofollow" ulkoisille linkeille';
+$lang['indexdelay']            = 'Aikaraja indeksoinnille (sek)';
+$lang['mailguard']             = 'Häivytä email osoite';
+$lang['iexssprotect']          = 'Tarkista lähetetyt tiedostot pahojen javascript- ja html-koodien varalta';
+$lang['usedraft']              = 'Tallenna vedos muokkaustilassa automaattisesti ';
+$lang['htmlok']                = 'Salli upotettu HTML';
+$lang['phpok']                 = 'Salli upotettu PHP';
+$lang['locktime']              = 'Lukitustiedostojen maksimi-ikä (sek)';
+$lang['cachetime']             = 'Välimuisti-tiedostojen maksimi-ikä (sek)';
+$lang['target____wiki']        = 'Kohdeikkuna sisäisissä linkeissä';
+$lang['target____interwiki']   = 'Kohdeikkuna interwiki-linkeissä';
+$lang['target____extern']      = 'Kohdeikkuna ulkoisissa linkeissä';
+$lang['target____media']       = 'Kohdeikkuna media-linkeissä';
+$lang['target____windows']     = 'Kohdeikkuna Windows-linkeissä';
+$lang['mediarevisions']        = 'Käytä versiohallintaa medioille.';
+$lang['refcheck']              = 'Mediaviitteen tarkistus';
+$lang['refshow']               = 'Montako mediaviitettä näytetään';
+$lang['gdlib']                 = 'GD Lib versio';
+$lang['im_convert']            = 'ImageMagick-muunnostyökalun polku';
+$lang['jpg_quality']           = 'JPG pakkauslaatu (0-100)';
+$lang['fetchsize']             = 'Suurin koko (bytejä), jonka fetch.php voi ladata ulkopuolisesta lähteestä';
+$lang['subscribers']           = 'Salli tuki sivujen tilaamiselle';
+$lang['subscribe_time']        = 'Aika jonka jälkeen tilauslinkit ja yhteenveto lähetetään (sek). Tämän pitäisi olla pienempi, kuin recent_days aika.';
+$lang['notify']                = 'Lähetä muutosilmoitukset tähän osoitteeseen';
+$lang['registernotify']        = 'Lähetä ilmoitus uusista rekisteröitymisistä tähän osoitteeseen';
+$lang['mailfrom']              = 'Sähköpostiosoite automaattisia postituksia varten';
+$lang['mailprefix']            = 'Etuliite automaattisesti lähetettyihin dähköposteihin';
+$lang['htmlmail']              = 'Lähetä muotoiltuja, mutta isompia HTML multipart posteja. Kytke pois, käyttääksesi vain tekstimuotoisia posteja.';
+$lang['sitemap']               = 'Luo Google sitemap (päiviä)';
+$lang['rss_type']              = 'XML-syötteen tyyppi';
+$lang['rss_linkto']            = 'XML-syöte kytkeytyy';
+$lang['rss_content']           = 'Mitä XML-syöte näyttää?';
+$lang['rss_update']            = 'XML-syötteen päivitystahti (sek)';
+$lang['rss_show_summary']      = 'XML-syöte näyttää yhteenvedon otsikossa';
+$lang['rss_media']             = 'Millaisia muutoksia XML syötteen tulisi sisältää?';
 $lang['updatecheck']           = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys update.dokuwiki.orgiin.';
 $lang['userewrite']            = 'Käytä siivottuja URLeja';
 $lang['useslash']              = 'Käytä kauttaviivaa nimiavaruuksien erottimena URL-osoitteissa';
-$lang['usedraft']              = 'Tallenna vedos muokkaustilassa automaattisesti ';
 $lang['sepchar']               = 'Sivunimen sanaerotin';
 $lang['canonical']             = 'Käytä kanonisoituja URLeja';
 $lang['fnencode']              = 'Muita kuin ASCII merkkejä sisältävien tiedostonimien koodaustapa.';
 $lang['autoplural']            = 'Etsi monikkomuotoja linkeistä';
 $lang['compression']           = 'Attic-tiedostojen pakkausmenetelmä';
-$lang['cachetime']             = 'Välimuisti-tiedostojen maksimi-ikä (sek)';
-$lang['locktime']              = 'Lukitustiedostojen maksimi-ikä (sek)';
-$lang['fetchsize']             = 'Suurin koko (bytejä), jonka fetch.php voi ladata ulkopuolisesta lähteestä';
-$lang['notify']                = 'Lähetä muutosilmoitukset tähän osoitteeseen';
-$lang['registernotify']        = 'Lähetä ilmoitus uusista rekisteröitymisistä tähän osoitteeseen';
-$lang['mailfrom']              = 'Sähköpostiosoite automaattisia postituksia varten';
-$lang['mailprefix']            = 'Etuliite automaattisesti lähetettyihin dähköposteihin';
 $lang['gzip_output']           = 'Käytä gzip "Content-Encoding"-otsaketta xhtml-tiedostojen lähettämiseen';
-$lang['gdlib']                 = 'GD Lib versio';
-$lang['im_convert']            = 'ImageMagick-muunnostyökalun polku';
-$lang['jpg_quality']           = 'JPG pakkauslaatu (0-100)';
-$lang['subscribers']           = 'Salli tuki sivujen tilaamiselle';
-$lang['subscribe_time']        = 'Aika jonka jälkeen tilauslinkit ja yhteenveto lähetetään (sek). Tämän pitäisi olla pienempi, kuin recent_days aika.';
 $lang['compress']              = 'Pakkaa CSS ja javascript';
 $lang['cssdatauri']            = 'Maksimikoko tavuina jossa kuvat joihin viitataan CSS-tiedostoista olisi sisällytettynä suoraan tyylitiedostoon jotta HTTP-kyselyjen kaistaa saataisiin kutistettua. Tämä tekniikka ei toimi IE versiossa aikasempi kuin 8! <code>400:sta</code> <code>600:aan</code> tavua on hyvä arvo. Aseta <code>0</code> kytkeäksesi ominaisuuden pois.';
-$lang['hidepages']             = 'Piilota seuraavat sivut (säännönmukainen lauseke)';
 $lang['send404']               = 'Lähetä "HTTP 404/Page Not Found" puuttuvista sivuista';
-$lang['sitemap']               = 'Luo Google sitemap (päiviä)';
 $lang['broken_iua']            = 'Onko "ignore_user_abort" toiminto rikki järjestelmässäsi? Tämä voi aiheuttaa toimimattoman index-näkymän.
 IIS+PHP/CGI on tunnetusti rikki. Katso <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> lisätietoja varten.';
 $lang['xsendfile']             = 'Käytä X-Sendfile otsikkoa, kun web-palvelin lähettää staattisia tiedostoja? Palvelimesi pitää tukea tätä.';
 $lang['renderer_xhtml']        = 'Renderöinti, jota käytetään wikin pääasialliseen (xhtml) tulostukseen';
 $lang['renderer__core']        = '%s (dokuwiki core)';
 $lang['renderer__plugin']      = '%s (liitännäinen)';
-$lang['rememberme']            = 'Salli pysyvät kirjautumis-cookiet (muista minut)';
-$lang['rss_type']              = 'XML-syötteen tyyppi';
-$lang['rss_linkto']            = 'XML-syöte kytkeytyy';
-$lang['rss_content']           = 'Mitä XML-syöte näyttää?';
-$lang['rss_update']            = 'XML-syötteen päivitystahti (sek)';
-$lang['recent_days']           = 'Montako edellistä muutosta säilytetään (päiviä)';
-$lang['rss_show_summary']      = 'XML-syöte näyttää yhteenvedon otsikossa';
-$lang['target____wiki']        = 'Kohdeikkuna sisäisissä linkeissä';
-$lang['target____interwiki']   = 'Kohdeikkuna interwiki-linkeissä';
-$lang['target____extern']      = 'Kohdeikkuna ulkoisissa linkeissä';
-$lang['target____media']       = 'Kohdeikkuna media-linkeissä';
-$lang['target____windows']     = 'Kohdeikkuna Windows-linkeissä';
+$lang['dnslookups']            = 'Dokuwiki etsii vastapuolen koneen nimen IP osoitteen perusteella käyttäjille, jotka muokkaavat sivua. Jos sinulla on hidas tai toimimaton DNS palvelin, tai et halua tätä ominaisuutta, voit kytkeä sen pois.';
 $lang['proxy____host']         = 'Proxy-palvelimen nimi';
 $lang['proxy____port']         = 'Proxy portti';
 $lang['proxy____user']         = 'Proxy käyttäjän nimi';
-- 
cgit v1.2.3


From bf99c56fad56f9252f0a978d3b9e91a5a4579ad2 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 26 Aug 2012 22:16:27 +0100
Subject: made tabs RTL-aware

---
 lib/tpl/dokuwiki/css/_media_fullscreen.css | 10 ++++++++++
 lib/tpl/dokuwiki/css/_tabs.css             | 13 +++++++++++++
 2 files changed, 23 insertions(+)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 2811f2935..9f15d7bcb 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -87,6 +87,10 @@
 
 /*____________ namespaces panel ____________*/
 
+[dir=rtl] #mediamanager__page .namespaces {
+    text-align: right;
+}
+
 #mediamanager__page .namespaces h2 {
     font-size: 1em;
     display: inline-block;
@@ -103,6 +107,9 @@
 *+html #mediamanager__page .namespaces h2 {
     display: inline;
 }
+[dir=rtl] #mediamanager__page .namespaces h2 {
+    margin-right: 10px;
+}
 
 #mediamanager__page .namespaces ul {
     margin-left: .2em;
@@ -176,6 +183,9 @@
     padding: 0;
     margin: 0;
 }
+[dir=rtl] #mediamanager__page .filelist ul {
+    margin-right: 10px;
+}
 
 #mediamanager__page .filelist .panelContent ul li:hover {
     background-color: __background_alt__;
diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css
index de544fd2b..1dffa8f7b 100644
--- a/lib/tpl/dokuwiki/css/_tabs.css
+++ b/lib/tpl/dokuwiki/css/_tabs.css
@@ -13,6 +13,9 @@
     margin: 0;
     list-style: none;
 }
+[dir=rtl] .dokuwiki ul.tabs li {
+    float: right;
+}
 
 .dokuwiki ul.tabs li strong,
 .dokuwiki ul.tabs li a {
@@ -23,6 +26,16 @@
     color: __text__;
     border-radius: .5em .5em 0 0;
 }
+[dir=rtl] .dokuwiki ul.tabs li strong,
+[dir=rtl] .dokuwiki ul.tabs li a {
+    float: right;
+    margin: 0 0 0 .3em;
+}
+*+html[dir=rtl] .dokuwiki ul.tabs li strong,
+*+html[dir=rtl] .dokuwiki ul.tabs li a {
+    float: none;
+    display: inline-block;
+}
 .dokuwiki ul.tabs li strong {
     font-weight: normal;
 }
-- 
cgit v1.2.3


From d836931ddf7db7f96da56cb7f6b4183cb139afe7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 26 Aug 2012 23:57:37 +0100
Subject: fixed quicksearch overlay being cut off in IE7 (FS#2581)

---
 lib/tpl/dokuwiki/css/design.css  | 3 ++-
 lib/tpl/dokuwiki/css/plugins.css | 0
 lib/tpl/dokuwiki/css/rtl.css     | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 lib/tpl/dokuwiki/css/plugins.css
 create mode 100644 lib/tpl/dokuwiki/css/rtl.css

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 8a3f20729..12ec80687 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -180,8 +180,9 @@
     font-size: 0.875em;
     position: relative;
 }
-[dir=rtl] #IE7 #dokuwiki__sitetools form.search {
+#IE7 #dokuwiki__sitetools form.search {
     min-height: 1px;
+    z-index: 21;
 }
 #dokuwiki__sitetools form.search input.edit {
     width: 18em;
diff --git a/lib/tpl/dokuwiki/css/plugins.css b/lib/tpl/dokuwiki/css/plugins.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3


From e10c99f4364d7caf985936fb23fe5630f699c8bc Mon Sep 17 00:00:00 2001
From: Mark <mc.prins@gmail.com>
Date: Mon, 27 Aug 2012 13:32:29 +0200
Subject: update the url to the latest one used in the manager FIX for FS#2463
 <https://bugs.dokuwiki.org/index.php?do=details&task_id=2463>

---
 lib/plugins/plugin/classes/ap_manage.class.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/classes/ap_manage.class.php b/lib/plugins/plugin/classes/ap_manage.class.php
index 12480e922..28579cbe9 100644
--- a/lib/plugins/plugin/classes/ap_manage.class.php
+++ b/lib/plugins/plugin/classes/ap_manage.class.php
@@ -141,9 +141,18 @@ class ap_manage {
                 break;
 
             case 'update' :
+                $url = $data[0];
                 $date = date('r');
-                if (!$fp = @fopen($file, 'a')) return;
-                fwrite($fp, "updated=$date\n");
+                if (!$fp = @fopen($file, 'r+')) return;
+                $buffer = "";
+                while (($line = fgets($fp)) !== false) {
+                    $urlFound = strpos($line,"url");
+                    if($urlFound !== false) $line="url=$url\n";
+                    $buffer .= $line;
+                }
+                $buffer .= "updated=$date\n";
+                fseek($fp, 0);
+                fwrite($fp, $buffer);
                 fclose($fp);
                 break;
         }
-- 
cgit v1.2.3


From ccde6bdb157feb12f49179992c01e6b5d0cc997c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=A5=E5=90=91=E5=B0=8F=E9=83=8E?=
 <syaoranhinata@gmail.com>
Date: Fri, 7 Sep 2012 00:07:25 +0200
Subject: Traditional Chinese language update

---
 lib/plugins/acl/lang/zh-tw/help.txt          |   5 +-
 lib/plugins/acl/lang/zh-tw/lang.php          |  15 ++--
 lib/plugins/config/lang/zh-tw/intro.txt      |   6 +-
 lib/plugins/config/lang/zh-tw/lang.php       | 104 ++++++++++++++-------------
 lib/plugins/plugin/lang/zh-tw/lang.php       |  19 ++---
 lib/plugins/popularity/lang/zh-tw/lang.php   |   1 +
 lib/plugins/revert/lang/zh-tw/lang.php       |   1 +
 lib/plugins/usermanager/lang/zh-tw/intro.txt |   2 +-
 lib/plugins/usermanager/lang/zh-tw/lang.php  |   7 +-
 9 files changed, 83 insertions(+), 77 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/zh-tw/help.txt b/lib/plugins/acl/lang/zh-tw/help.txt
index bc1bddb00..d5d031059 100644
--- a/lib/plugins/acl/lang/zh-tw/help.txt
+++ b/lib/plugins/acl/lang/zh-tw/help.txt
@@ -1,12 +1,11 @@
 === 快速指南: ===
 
-你可以用這個頁面為維基中的命名空間或頁面增加或移除權限。
+你可以用這個頁面為維基中的分類空間或頁面增加或移除權限。
 
-左方面板顯示了所有命名空間和頁面。
+左方面板顯示了所有分類空間和頁面。
 
 上方表格允許你觀看及修改選取的使用者或群組的權限。
 
 下方表格顯示了目前所有的存取控制表 (ACL)，你可以用它快速刪除或更改多項規則。
 
 閱讀 [[doku>acl|official documentation on ACL]] 可以幫助你完整地了解 DokuWiki 存取控制的運作。
-
diff --git a/lib/plugins/acl/lang/zh-tw/lang.php b/lib/plugins/acl/lang/zh-tw/lang.php
index 085537864..ff115df18 100644
--- a/lib/plugins/acl/lang/zh-tw/lang.php
+++ b/lib/plugins/acl/lang/zh-tw/lang.php
@@ -11,25 +11,26 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
 $lang['admin_acl']             = '管理存取控制表 (ACL)';
 $lang['acl_group']             = '群組';
 $lang['acl_user']              = '使用者';
 $lang['acl_perms']             = '設定權限於';
 $lang['page']                  = '頁面';
-$lang['namespace']             = '命名空間';
+$lang['namespace']             = '分類空間';
 $lang['btn_select']            = '選擇';
 $lang['p_user_id']             = '使用者 <b class="acluser">%s</b> 目前在頁面 <b class="aclpage">%s</b> 擁有以下權限：<i>%s</i>。';
-$lang['p_user_ns']             = '使用者 <b class=\"acluser\">%s</b> 目前在命名空間 <b class=\"aclns\">%s</b> 擁有以下權限：<i>%s</i>。';
+$lang['p_user_ns']             = '使用者 <b class=\"acluser\">%s</b> 目前在分類空間 <b class=\"aclns\">%s</b> 擁有以下權限：<i>%s</i>。';
 $lang['p_group_id']            = '群組 <b class="aclgroup">%s</b> 的成員目前在頁面 <b class="aclpage">%s</b> 擁有以下權限：<i>%s</i>。';
-$lang['p_group_ns']            = '群組 <b class=\"aclgroup\">%s</b> 的成員目前在命名空間 <b class=\"aclns\">%s</b> 擁有以下權限：<i>%s</i>。';
+$lang['p_group_ns']            = '群組 <b class=\"aclgroup\">%s</b> 的成員目前在分類空間 <b class=\"aclns\">%s</b> 擁有以下權限：<i>%s</i>。';
 $lang['p_choose_id']           = '請在上方表格<b>輸入使用者或群組</b>以檢視或編輯頁面 <b class="aclpage">%s</b> 的權限設定。';
-$lang['p_choose_ns']           = '請在上方表格<b>輸入使用者或群組</b>以檢視或編輯命名空間 <b class=\"aclns\">%s</b> 的權限設定。';
-$lang['p_inherited']           = '注意：這些權限並未明確指定，而是從群組或上層的命名空間繼承而來。';
+$lang['p_choose_ns']           = '請在上方表格<b>輸入使用者或群組</b>以檢視或編輯分類空間 <b class=\"aclns\">%s</b> 的權限設定。';
+$lang['p_inherited']           = '注意：這些權限並未明確指定，而是從群組或上層的分類空間繼承而來。';
 $lang['p_isadmin']             = '注意：選取的群組或使用者擁有完整權限，因為它被設定為超級使用者。';
-$lang['p_include']             = '較高的權限亦包含了較低的權限。新增、上傳與刪除權限只能設定在命名空間，不能設定在頁面。';
+$lang['p_include']             = '較高的權限亦包含了較低的權限。新增、上傳與刪除權限只能設定在分類空間，不能設定在頁面。';
 $lang['current']               = '目前的存取控制規則';
-$lang['where']                 = '頁面/命名空間';
+$lang['where']                 = '頁面/分類空間';
 $lang['who']                   = '使用者/群組';
 $lang['perm']                  = '權限';
 $lang['acl_perm0']             = '無';
diff --git a/lib/plugins/config/lang/zh-tw/intro.txt b/lib/plugins/config/lang/zh-tw/intro.txt
index c257947d9..4cacfc43f 100644
--- a/lib/plugins/config/lang/zh-tw/intro.txt
+++ b/lib/plugins/config/lang/zh-tw/intro.txt
@@ -1,7 +1,7 @@
-====== 配置管理器 ======
+====== 設定管理器 ======
 
-使用本頁控制您的 Dokuwiki 設定。每個獨立設定的相關訊息可參閱 [[doku>config]]。配置管理器的更多訊息請參閱 [[doku>plugin:config]]。
+使用本頁控制您的 Dokuwiki 設定。每個獨立設定的相關訊息可參閱 [[doku>config]]。設定管理器的更多訊息請參閱 [[doku>plugin:config]]。
 
 淡紅色背景的項目是被保護的，不能通過這個管理器更改。藍色背景的項目是系統的預設值，白色背景的項目是您更改過的。藍色和白色的設定項目都可以更改。
 
-離開本頁之前不要忘記點擊最下面的 **儲存** 按鈕，否則您的修改將不會生效。
+離開本頁之前不要忘記點擊最下面的 **儲存** 按鈕，否則您的修改將不會生效。
\ No newline at end of file
diff --git a/lib/plugins/config/lang/zh-tw/lang.php b/lib/plugins/config/lang/zh-tw/lang.php
index dd5f287b9..204b2b229 100644
--- a/lib/plugins/config/lang/zh-tw/lang.php
+++ b/lib/plugins/config/lang/zh-tw/lang.php
@@ -9,17 +9,18 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
-$lang['menu']                  = '系統配置設定';
+$lang['menu']                  = '系統設定';
 $lang['error']                 = '設定因為不合法的值而未更新，請檢查您的更改並重新送出。
 <br />不正確的值會被紅色方框包住。';
 $lang['updated']               = '成功地更新設定。';
 $lang['nochoice']              = '(無其他可用選項)';
 $lang['locked']                = '設定檔無法更新，若非故意，請確認本地檔名及權限正確。';
-$lang['danger']                = '危險：改變此選項可能使您無法存取維基及配置選單。';
+$lang['danger']                = '危險：改變此選項可能使您無法存取維基及設定選單。';
 $lang['warning']               = '警告：改變此選項可能導致不可預期的行為。';
 $lang['security']              = '安全性警告：改變此選項可能造成安全風險。';
-$lang['_configuration_manager'] = '配置管理';
+$lang['_configuration_manager'] = '設定管理器';
 $lang['_header_dokuwiki']      = 'DokuWiki 設定';
 $lang['_header_plugin']        = '插件設定';
 $lang['_header_template']      = '樣板設定';
@@ -38,26 +39,27 @@ $lang['_template_sufix']       = '樣板設定';
 $lang['_msg_setting_undefined'] = '設定的後設數據不存在。';
 $lang['_msg_setting_no_class'] = '設定的分類不存在。';
 $lang['_msg_setting_no_default'] = '無預設值';
-$lang['fmode']                 = '檔案建立模式';
-$lang['dmode']                 = '目錄建立模式';
+$lang['title']                 = '維基標題';
+$lang['start']                 = '開始頁面的名稱';
 $lang['lang']                  = '語系';
+$lang['template']              = '樣板';
+$lang['license']               = '您希望您的內容為何種授權方式？';
+$lang['savedir']               = '儲存資料的目錄';
 $lang['basedir']               = '根目錄';
 $lang['baseurl']               = '根路徑 (URL)';
-$lang['savedir']               = '儲存資料的目錄';
 $lang['cookiedir']             = 'Cookie 路徑。設定空白則使用 baseurl。';
-$lang['start']                 = '開始頁面的名稱';
-$lang['title']                 = '維基標題';
-$lang['template']              = '樣板';
-$lang['license']               = '您希望您的內容為何種授權方式？';
-$lang['fullpath']              = '顯示完整的路徑於頁面底部';
+$lang['dmode']                 = '目錄建立模式';
+$lang['fmode']                 = '檔案建立模式';
+$lang['allowdebug']            = '允許除錯 <b>(不需要請停用！)</b>';
 $lang['recent']                = '最近更新';
+$lang['recent_days']           = '儲存多少天內的變更';
 $lang['breadcrumbs']           = '導覽鏈數量';
 $lang['youarehere']            = '顯示階層式導覽鏈';
+$lang['fullpath']              = '顯示完整的路徑於頁面底部';
 $lang['typography']            = '進行字元替換';
-$lang['htmlok']                = '允許嵌入式 HTML';
-$lang['phpok']                 = '允許嵌入式 PHP';
 $lang['dformat']               = '日期格式 (參見 PHP 的 <a href="http://www.php.net/strftime">strftime</a> 函數)';
 $lang['signature']             = '簽名';
+$lang['showuseras']            = '將最後編輯頁面的使用者顯示為：';
 $lang['toptoclevel']           = '目錄表的最上層級';
 $lang['tocminheads']           = '決定是否建立目錄表的最少標題數量';
 $lang['maxtoclevel']           = '目錄表顯示的最大層級';
@@ -65,15 +67,8 @@ $lang['maxseclevel']           = '可編輯段落的最大層級';
 $lang['camelcase']             = '對連結使用 CamelCase';
 $lang['deaccent']              = '清理頁面名稱';
 $lang['useheading']            = '使用第一個標題作為頁面名稱';
-$lang['refcheck']              = '媒體連結檢查';
-$lang['refshow']               = '媒體連結的顯示數量';
-$lang['allowdebug']            = '允許除錯 <b>(不需要請停用！)</b>';
-$lang['usewordblock']          = '根據字詞表阻擋垃圾訊息';
-$lang['indexdelay']            = '建立索引前的延遲時間 (秒)';
-$lang['relnofollow']           = '外部連結使用 rel="nofollow"';
-$lang['mailguard']             = '混淆 E-mail 位址';
-$lang['iexssprotect']          = '檢查上傳的檔案中是否隱含惡意的 JavaScript 或 HTML 碼';
-$lang['showuseras']            = '將最後編輯頁面的使用者顯示為：';
+$lang['sneaky_index']          = '預設情況下，DokuWiki 會在索引頁會顯示所有分類空間。啟用此選項會隱藏用戶沒有閱讀權限的頁面，但也可能將能閱讀的子頁面一併隱藏。在特定 ACL 設定下，這可能導致索引無法使用。';
+$lang['hidepages']             = '隱藏匹配的界面 (正規式)';
 $lang['useacl']                = '使用存取控制名單';
 $lang['autopasswd']            = '自動產生密碼';
 $lang['authtype']              = '認證後台管理方式';
@@ -82,58 +77,65 @@ $lang['defaultgroup']          = '預設群組';
 $lang['superuser']             = '超級用戶 - 不論 ACL 如何設定，都能訪問所有頁面與功能的用戶組/用戶';
 $lang['manager']               = '管理員 - 能訪問相應管理功能的用戶组/用戶';
 $lang['profileconfirm']        = '修改個人資料時需要確認密碼';
+$lang['rememberme']            = '允許自動登入 (記住我)';
 $lang['disableactions']        = '停用的 DokuWiki 動作';
 $lang['disableactions_check']  = '檢查';
 $lang['disableactions_subscription'] = '訂閱/取消訂閱';
 $lang['disableactions_wikicode'] = '檢視原始碼/匯出原始檔';
 $lang['disableactions_other']  = '其他功能 (逗號分隔)';
-$lang['sneaky_index']          = '預設情況下，DokuWiki 會在索引頁會顯示所有命名空間。啟用此選項會隱藏用戶沒有閱讀權限的頁面，但也可能將能閱讀的子頁面一併隱藏。在特定 ACL 設定下，這可能導致索引無法使用。';
 $lang['auth_security_timeout'] = '安全認證的計時 (秒)';
 $lang['securecookie']          = 'HTTPS 頁面設定的 cookie 是否只能由瀏覽器經 HTTPS 傳送？取消此選項後，只有登入維基會被 SSL 保護而瀏覽時不會。';
-$lang['updatecheck']           = '檢查更新與安全性警告？DokuWiki 需要聯繫 update.dokuwiki.org 才能使用此功能。';
-$lang['userewrite']            = '使用好看的 URL';
-$lang['useslash']              = '在 URL 中使用斜線作為命名空間的分隔字元';
+$lang['usewordblock']          = '根據字詞表阻擋垃圾訊息';
+$lang['relnofollow']           = '外部連結使用 rel="nofollow"';
+$lang['indexdelay']            = '建立索引前的延遲時間 (秒)';
+$lang['mailguard']             = '混淆 E-mail 位址';
+$lang['iexssprotect']          = '檢查上傳的檔案中是否隱含惡意的 JavaScript 或 HTML 碼';
 $lang['usedraft']              = '編輯時自動儲存草稿';
-$lang['sepchar']               = '頁面名稱中單字的分隔字元';
-$lang['canonical']             = '使用最典型的 URL';
-$lang['fnencode']              = '非 ASCII 文件名稱的編輯方法。';
-$lang['autoplural']            = '檢查複數形式的連結 (英文)';
-$lang['compression']           = 'attic 文件的壓縮方式';
-$lang['cachetime']             = '緩存的最大存在時間 (秒)';
+$lang['htmlok']                = '允許嵌入式 HTML';
+$lang['phpok']                 = '允許嵌入式 PHP';
 $lang['locktime']              = '檔案的最大鎖定時間 (秒)';
+$lang['cachetime']             = '緩存的最大存在時間 (秒)';
+$lang['target____wiki']        = '內部連結的目標視窗';
+$lang['target____interwiki']   = '跨維基連結的目標視窗';
+$lang['target____extern']      = '外部連結的目標視窗';
+$lang['target____media']       = '媒體連結的目標視窗';
+$lang['target____windows']     = 'Windows 連結的目標視窗';
+$lang['refcheck']              = '媒體連結檢查';
+$lang['refshow']               = '媒體連結的顯示數量';
+$lang['gdlib']                 = 'GD Lib 版本';
+$lang['im_convert']            = 'ImageMagick 的轉換工具路徑';
+$lang['jpg_quality']           = 'JPG 壓縮品質(0-100)';
 $lang['fetchsize']             = 'fetch.php 可以從外部下載的最大檔案尺寸 (bytes)';
+$lang['subscribers']           = '啟用頁面訂閱';
+$lang['subscribe_time']        = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。';
 $lang['notify']                = '寄送變更通知信到這個 E-mail 位址';
 $lang['registernotify']        = '寄送新使用者註冊資訊到這個 E-mail 位址';
 $lang['mailfrom']              = '自動發送郵件時使用的郵件地址';
 $lang['mailprefix']            = '自動發送郵件時使用的標題前綴';
+$lang['sitemap']               = '產生 Google 站台地圖 (天)';
+$lang['rss_type']              = 'XML feed 類型';
+$lang['rss_linkto']            = 'XML feed 連結到';
+$lang['rss_content']           = 'XML feed 項目中顯示什麼呢？';
+$lang['rss_update']            = 'XML feed 更新間隔時間 (秒)';
+$lang['rss_show_summary']      = '於標題中顯示簡要的 XML feed';
+$lang['rss_media']             = '在 XML feed 中應列出哪些變更？';
+$lang['updatecheck']           = '檢查更新與安全性警告？DokuWiki 需要聯繫 update.dokuwiki.org 才能使用此功能。';
+$lang['userewrite']            = '使用好看的 URL';
+$lang['useslash']              = '在 URL 中使用斜線作為分類空間的分隔字元';
+$lang['sepchar']               = '頁面名稱中單字的分隔字元';
+$lang['canonical']             = '使用最典型的 URL';
+$lang['fnencode']              = '非 ASCII 文件名稱的編輯方法。';
+$lang['autoplural']            = '檢查複數形式的連結 (英文)';
+$lang['compression']           = 'attic 文件的壓縮方式';
 $lang['gzip_output']           = '對 xhtml 使用 gzip 內容編碼';
-$lang['gdlib']                 = 'GD Lib 版本';
-$lang['im_convert']            = 'ImageMagick 的轉換工具路徑';
-$lang['jpg_quality']           = 'JPG 壓縮品質(0-100)';
-$lang['subscribers']           = '啟用頁面訂閱';
-$lang['subscribe_time']        = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。';
 $lang['compress']              = '壓縮 CSS 與 JavaScript 的輸出';
 $lang['cssdatauri']            = 'CSS 中所引用的圖片假如小於該數字大小(bytes)，將會被直接嵌入 CSS 中來減少 HTTP Request 的發送。此功能在 IE 7 及之下版本不支援。推薦使用 <code>400</code> 到 <code>600</code> 之間。設定為<code>0</code> 則停用。';
-$lang['hidepages']             = '隱藏匹配的界面 (正規式)';
 $lang['send404']               = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"';
-$lang['sitemap']               = '產生 Google 站台地圖 (天)';
 $lang['broken_iua']            = 'ignore_user_abort 功能失效了？這有可能導致搜索索引不可用。IIS+PHP/CGI 已損壞。請參閱 <a href=\"http://bugs.splitbrain.org/?do=details&task_id=852\">Bug 852</a> 獲取更多信息。';
 $lang['xsendfile']             = '使用 X-Sendfile 頭讓服務器發送狀態文件？您的服務器需要支持該功能。';
 $lang['renderer_xhtml']        = '主要維基輸出 (xhtml) 的的渲染器';
 $lang['renderer__core']        = '%s (dokuwiki 核心)';
 $lang['renderer__plugin']      = '%s (插件)';
-$lang['rememberme']            = '允許自動登入 (記住我)';
-$lang['rss_type']              = 'XML feed 類型';
-$lang['rss_linkto']            = 'XML feed 連結到';
-$lang['rss_content']           = 'XML feed 項目中顯示什麼呢？';
-$lang['rss_update']            = 'XML feed 更新間隔時間 (秒)';
-$lang['recent_days']           = '儲存多少天內的變更';
-$lang['rss_show_summary']      = '於標題中顯示簡要的 XML feed';
-$lang['target____wiki']        = '內部連結的目標視窗';
-$lang['target____interwiki']   = '跨維基連結的目標視窗';
-$lang['target____extern']      = '外部連結的目標視窗';
-$lang['target____media']       = '媒體連結的目標視窗';
-$lang['target____windows']     = 'Windows 連結的目標視窗';
 $lang['proxy____host']         = 'Proxy 伺服器名稱';
 $lang['proxy____port']         = 'Proxy 連接埠';
 $lang['proxy____user']         = 'Proxy 使用者名稱';
diff --git a/lib/plugins/plugin/lang/zh-tw/lang.php b/lib/plugins/plugin/lang/zh-tw/lang.php
index 54234212d..8fa3efb0a 100644
--- a/lib/plugins/plugin/lang/zh-tw/lang.php
+++ b/lib/plugins/plugin/lang/zh-tw/lang.php
@@ -9,6 +9,7 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
 $lang['menu']                  = '管理插件 (Plugins)';
 $lang['download']              = '下載與安裝插件';
@@ -20,8 +21,8 @@ $lang['btn_settings']          = '設定';
 $lang['btn_download']          = '下載';
 $lang['btn_enable']            = '儲存';
 $lang['url']                   = 'URL';
-$lang['installed']             = '安裝:';
-$lang['lastupdate']            = '上次更新:';
+$lang['installed']             = '安裝：';
+$lang['lastupdate']            = '上次更新：';
 $lang['source']                = '來源：';
 $lang['unknown']               = '未知';
 $lang['updating']              = '更新中 ...';
@@ -34,17 +35,17 @@ $lang['downloading']           = '下載中 ...';
 $lang['downloaded']            = '插件 %s 已成功地安裝';
 $lang['downloads']             = '以下的插件已成功地安裝:';
 $lang['download_none']         = '找不到插件，或在下載與安裝時發生了未知的問題';
-$lang['plugin']                = '插件:';
+$lang['plugin']                = '插件：';
 $lang['components']            = '元件';
 $lang['noinfo']                = '此插件沒有回傳任何資訊，可能是無效的';
-$lang['name']                  = '名稱:';
-$lang['date']                  = '日期:';
-$lang['type']                  = '類型:';
-$lang['desc']                  = '描述:';
-$lang['author']                = '作者:';
+$lang['name']                  = '名稱：';
+$lang['date']                  = '日期：';
+$lang['type']                  = '類型：';
+$lang['desc']                  = '描述：';
+$lang['author']                = '作者：';
 $lang['www']                   = '網頁:';
 $lang['error']                 = '一個未知的錯誤發生。';
-$lang['error_download']        = '無法下載插件檔案: %s';
+$lang['error_download']        = '無法下載插件檔案： %s';
 $lang['error_badurl']          = 'URL 可能有問題 - 從 URL 中無法得知文件名';
 $lang['error_dircreate']       = '無法建立暫存目錄來接收下載的內容';
 $lang['error_decompress']      = '插件管理器無法解壓下載的文件。這可能是由於下載出現錯誤，遇到這種情況，請您再次嘗試;或者是壓縮格式無法識別，遇到這種情況，您需要手動下載並安裝該插件。';
diff --git a/lib/plugins/popularity/lang/zh-tw/lang.php b/lib/plugins/popularity/lang/zh-tw/lang.php
index 3ced0ee5a..3d19ce53a 100644
--- a/lib/plugins/popularity/lang/zh-tw/lang.php
+++ b/lib/plugins/popularity/lang/zh-tw/lang.php
@@ -9,6 +9,7 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
 $lang['name']                  = '人氣回饋（載入可能需要一些時間）';
 $lang['submit']                = '發送資料';
diff --git a/lib/plugins/revert/lang/zh-tw/lang.php b/lib/plugins/revert/lang/zh-tw/lang.php
index a853ccd2e..64da648cd 100644
--- a/lib/plugins/revert/lang/zh-tw/lang.php
+++ b/lib/plugins/revert/lang/zh-tw/lang.php
@@ -9,6 +9,7 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
 $lang['menu']                  = '還原管理';
 $lang['filter']                = '搜索包含垃圾訊息的頁面';
diff --git a/lib/plugins/usermanager/lang/zh-tw/intro.txt b/lib/plugins/usermanager/lang/zh-tw/intro.txt
index 8f9488d7d..32ccf6fad 100644
--- a/lib/plugins/usermanager/lang/zh-tw/intro.txt
+++ b/lib/plugins/usermanager/lang/zh-tw/intro.txt
@@ -1 +1 @@
-====== 帳號管理員 ======
+====== 帳號管理器 ======
diff --git a/lib/plugins/usermanager/lang/zh-tw/lang.php b/lib/plugins/usermanager/lang/zh-tw/lang.php
index 5cb20aae8..23b4fdac6 100644
--- a/lib/plugins/usermanager/lang/zh-tw/lang.php
+++ b/lib/plugins/usermanager/lang/zh-tw/lang.php
@@ -10,8 +10,9 @@
  * @author Cheng-Wei Chien <e.cwchien@gmail.com>
  * @author Danny Lin <danny0838@pchome.com.tw>
  * @author Shuo-Ting Jian <shoting@gmail.com>
+ * @author syaoranhinata@gmail.com
  */
-$lang['menu']                  = '帳號管理員';
+$lang['menu']                  = '帳號管理器';
 $lang['noauth']                = '(帳號認證尚未開放)';
 $lang['nosupport']             = '(尚不支援帳號管理)';
 $lang['badauth']               = '錯誤的認證機制';
@@ -35,8 +36,8 @@ $lang['filter']                = '篩選條件(Filter)';
 $lang['summary']               = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。';
 $lang['nonefound']             = '找不到帳號。共有 %d 個帳號。';
 $lang['delete_ok']             = '已刪除 %d 個帳號';
-$lang['delete_fail']           = '%d 個帳號刪除失敗';
-$lang['update_ok']             = '成功更新該帳號';
+$lang['delete_fail']           = '%d 個帳號刪除失敗。';
+$lang['update_ok']             = '已更新該帳號';
 $lang['update_fail']           = '更新該帳號時失敗';
 $lang['update_exists']         = '變更帳號名稱 (%s) 失敗，因為有同名帳號存在（其他修改已套用）。';
 $lang['start']                 = '開始';
-- 
cgit v1.2.3


From 520297b4c53378c860c5d98970270653fdf91b52 Mon Sep 17 00:00:00 2001
From: Jukka Inkeri <jukka@awot.fi>
Date: Fri, 7 Sep 2012 00:08:57 +0200
Subject: Finish language update

---
 lib/plugins/config/lang/fi/lang.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/fi/lang.php b/lib/plugins/config/lang/fi/lang.php
index 9e067b277..f3c57d10e 100644
--- a/lib/plugins/config/lang/fi/lang.php
+++ b/lib/plugins/config/lang/fi/lang.php
@@ -29,8 +29,7 @@ $lang['_anti_spam']            = 'Anti-Spam asetukset';
 $lang['_editing']              = 'Sivumuokkauksen asetukset';
 $lang['_links']                = 'Linkkien asetukset';
 $lang['_media']                = 'Media-asetukset';
-$lang['_notifications']        = 'Ilmoitusasetukset';
-$lang['_syndication']          = 'Syöteasetukset';
+$lang['_notifications']        = 'Ilmoitus-asetukset';
 $lang['_advanced']             = 'Lisäasetukset';
 $lang['_network']              = 'Verkkoasetukset';
 $lang['_plugin_sufix']         = 'liitännäisen asetukset';
@@ -42,8 +41,8 @@ $lang['title']                 = 'Wikin nimi';
 $lang['start']                 = 'Alkusivun nimi';
 $lang['lang']                  = 'Kieli';
 $lang['template']              = 'Sivumalli';
-$lang['tagline']               = 'Slogan (jos sivupohja tukee sitä)';
-$lang['sidebar']               = 'Sivupalkin sivun nimi (jos sivupohja tukee sitä), tyhjä kenttä kytkee sivupalkin pois';
+$lang['tagline']               = 'Apuotsikko - slogan sivustonimen yhteysteen (jos template käyttää)';
+$lang['sidebar']               = 'Sivupalkin sivunimi (jos template tukee sitä), tyhjä arvo poistaa sivupalkin';
 $lang['license']               = 'Millä lisenssillä sisältö pitäisi julkaista?';
 $lang['savedir']               = 'Hakemisto tietojen tallennukseen.';
 $lang['basedir']               = 'Perushakemisto';
@@ -86,8 +85,6 @@ $lang['disableactions_wikicode'] = 'Näytä lähdekoodi/Vie raakana';
 $lang['disableactions_other']  = 'Muut toiminnot (pilkulla erotettuna)';
 $lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)';
 $lang['securecookie']          = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhteydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.';
-$lang['remote']                = 'Kytke käyttöön remote API system. Tämä antaa muille sovelluksille mahdollisuuden käyttää wikiä käyttämällä XML-RPC, tai muuta mekanismiä.';
-$lang['remoteuser']            = 'Salli remote API käyttö vain pilkulla erotetuille ryhmille tai käyttäjille. Tyhjä kenttä sallii kaikkien käyttää.';
 $lang['usewordblock']          = 'Estä spam sanalistan avulla';
 $lang['relnofollow']           = 'Käytä rel="nofollow" ulkoisille linkeille';
 $lang['indexdelay']            = 'Aikaraja indeksoinnille (sek)';
@@ -103,7 +100,7 @@ $lang['target____interwiki']   = 'Kohdeikkuna interwiki-linkeissä';
 $lang['target____extern']      = 'Kohdeikkuna ulkoisissa linkeissä';
 $lang['target____media']       = 'Kohdeikkuna media-linkeissä';
 $lang['target____windows']     = 'Kohdeikkuna Windows-linkeissä';
-$lang['mediarevisions']        = 'Käytä versiohallintaa medioille.';
+$lang['mediarevisions']        = 'Otetaan käyttään Media-versiointi';
 $lang['refcheck']              = 'Mediaviitteen tarkistus';
 $lang['refshow']               = 'Montako mediaviitettä näytetään';
 $lang['gdlib']                 = 'GD Lib versio';
@@ -116,14 +113,12 @@ $lang['notify']                = 'Lähetä muutosilmoitukset tähän osoitteesee
 $lang['registernotify']        = 'Lähetä ilmoitus uusista rekisteröitymisistä tähän osoitteeseen';
 $lang['mailfrom']              = 'Sähköpostiosoite automaattisia postituksia varten';
 $lang['mailprefix']            = 'Etuliite automaattisesti lähetettyihin dähköposteihin';
-$lang['htmlmail']              = 'Lähetä muotoiltuja, mutta isompia HTML multipart posteja. Kytke pois, käyttääksesi vain tekstimuotoisia posteja.';
 $lang['sitemap']               = 'Luo Google sitemap (päiviä)';
 $lang['rss_type']              = 'XML-syötteen tyyppi';
 $lang['rss_linkto']            = 'XML-syöte kytkeytyy';
 $lang['rss_content']           = 'Mitä XML-syöte näyttää?';
 $lang['rss_update']            = 'XML-syötteen päivitystahti (sek)';
 $lang['rss_show_summary']      = 'XML-syöte näyttää yhteenvedon otsikossa';
-$lang['rss_media']             = 'Millaisia muutoksia XML syötteen tulisi sisältää?';
 $lang['updatecheck']           = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys update.dokuwiki.orgiin.';
 $lang['userewrite']            = 'Käytä siivottuja URLeja';
 $lang['useslash']              = 'Käytä kauttaviivaa nimiavaruuksien erottimena URL-osoitteissa';
@@ -142,7 +137,6 @@ $lang['xsendfile']             = 'Käytä X-Sendfile otsikkoa, kun web-palvelin
 $lang['renderer_xhtml']        = 'Renderöinti, jota käytetään wikin pääasialliseen (xhtml) tulostukseen';
 $lang['renderer__core']        = '%s (dokuwiki core)';
 $lang['renderer__plugin']      = '%s (liitännäinen)';
-$lang['dnslookups']            = 'Dokuwiki etsii vastapuolen koneen nimen IP osoitteen perusteella käyttäjille, jotka muokkaavat sivua. Jos sinulla on hidas tai toimimaton DNS palvelin, tai et halua tätä ominaisuutta, voit kytkeä sen pois.';
 $lang['proxy____host']         = 'Proxy-palvelimen nimi';
 $lang['proxy____port']         = 'Proxy portti';
 $lang['proxy____user']         = 'Proxy käyttäjän nimi';
-- 
cgit v1.2.3


From 0e65a4846cba3dee39cbd53b702a833788e6fec0 Mon Sep 17 00:00:00 2001
From: Gerardo Zamudio <gerardo@gerardozamudio.net>
Date: Fri, 7 Sep 2012 00:14:27 +0200
Subject: Spanish language update

---
 lib/plugins/acl/lang/es/lang.php         |   1 +
 lib/plugins/config/lang/es/lang.php      | 106 +++++++++++++++++--------------
 lib/plugins/plugin/lang/es/lang.php      |   1 +
 lib/plugins/popularity/lang/es/lang.php  |   1 +
 lib/plugins/revert/lang/es/lang.php      |   1 +
 lib/plugins/usermanager/lang/es/lang.php |   1 +
 6 files changed, 63 insertions(+), 48 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index ee50a7530..8aed3c504 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -22,6 +22,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index 66d075d6b..b940f13cd 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -22,6 +22,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['menu']                  = 'Parámetros de configuración';
 $lang['error']                 = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario. <br /> Los valores incorrectos se mostrarán con un marco rojo alrededor.';
@@ -43,6 +44,8 @@ $lang['_anti_spam']            = 'Parámetros Anti-Spam';
 $lang['_editing']              = 'Parámetros de Edición';
 $lang['_links']                = 'Parámetros de Enlaces';
 $lang['_media']                = 'Parámetros de Medios';
+$lang['_notifications']        = 'Configuración de notificaciones';
+$lang['_syndication']          = 'Configuración de sindicación';
 $lang['_advanced']             = 'Parámetros Avanzados';
 $lang['_network']              = 'Parámetros de Red';
 $lang['_plugin_sufix']         = 'Parámetros de Plugins';
@@ -50,26 +53,29 @@ $lang['_template_sufix']       = 'Parámetros de Plantillas';
 $lang['_msg_setting_undefined'] = 'Sin parámetros de metadata.';
 $lang['_msg_setting_no_class'] = 'Sin clase establecida.';
 $lang['_msg_setting_no_default'] = 'Sin valor por defecto.';
-$lang['fmode']                 = 'Modo de creación de ficheros';
-$lang['dmode']                 = 'Modo de creación de directorios';
+$lang['title']                 = 'Título del wiki';
+$lang['start']                 = 'Nombre de la página inicial';
 $lang['lang']                  = 'Idioma';
+$lang['template']              = 'Plantilla';
+$lang['tagline']               = 'Lema (si la plantilla lo soporta)';
+$lang['sidebar']               = 'Nombre de la barra lateral (si la plantilla lo soporta), un campo vacío la desactiva';
+$lang['license']               = '¿Bajo qué licencia será liberado tu contenido?';
+$lang['savedir']               = 'Directorio para guardar los datos';
 $lang['basedir']               = 'Directorio de base';
 $lang['baseurl']               = 'URL de base';
-$lang['savedir']               = 'Directorio para guardar los datos';
 $lang['cookiedir']             = 'Ruta para las Cookie. Dejar en blanco para usar la ruta básica.';
-$lang['start']                 = 'Nombre de la página inicial';
-$lang['title']                 = 'Título del wiki';
-$lang['template']              = 'Plantilla';
-$lang['license']               = '¿Bajo qué licencia será liberado tu contenido?';
-$lang['fullpath']              = 'Mostrar ruta completa en el pie de página';
+$lang['dmode']                 = 'Modo de creación de directorios';
+$lang['fmode']                 = 'Modo de creación de ficheros';
+$lang['allowdebug']            = 'Permitir debug <b>deshabilítelo si no lo necesita!</b>';
 $lang['recent']                = 'Cambios recientes';
+$lang['recent_days']           = 'Cuántos cambios recientes mantener (días)';
 $lang['breadcrumbs']           = 'Número de pasos de traza';
 $lang['youarehere']            = 'Traza jerárquica';
+$lang['fullpath']              = 'Mostrar ruta completa en el pie de página';
 $lang['typography']            = 'Realizar reemplazos tipográficos';
-$lang['htmlok']                = 'Permitir HTML embebido';
-$lang['phpok']                 = 'Permitir PHP embebido';
 $lang['dformat']               = 'Formato de fecha (ver la función de PHP <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Firma';
+$lang['showuseras']            = 'Qué ver al mostrar el último usuario que editó una página';
 $lang['toptoclevel']           = 'Nivel superior para la tabla de contenidos';
 $lang['tocminheads']           = 'La cantidad mínima de titulares que determina si el TOC es construido';
 $lang['maxtoclevel']           = 'Máximo nivel para la tabla de contenidos';
@@ -77,16 +83,8 @@ $lang['maxseclevel']           = 'Máximo nivel para edición de sección';
 $lang['camelcase']             = 'Usar CamelCase para enlaces';
 $lang['deaccent']              = 'Nombres de páginas "limpios"';
 $lang['useheading']            = 'Usar el primer encabezado para nombres de páginas';
-$lang['refcheck']              = 'Control de referencia a medios';
-$lang['refshow']               = 'Número de referencias a medios a mostrar';
-$lang['allowdebug']            = 'Permitir debug <b>deshabilítelo si no lo necesita!</b>';
-$lang['mediarevisions']        = '¿Habilitar Mediarevisions?';
-$lang['usewordblock']          = 'Bloquear spam usando una lista de palabras';
-$lang['indexdelay']            = 'Intervalo de tiempo antes de indexar (segundos)';
-$lang['relnofollow']           = 'Usar rel="nofollow" en enlaces externos';
-$lang['mailguard']             = 'Ofuscar direcciones de correo electrónico';
-$lang['iexssprotect']          = 'Comprobar posible código malicioso (JavaScript ó HTML) en archivos subidos';
-$lang['showuseras']            = 'Qué ver al mostrar el último usuario que editó una página';
+$lang['sneaky_index']          = 'Por defecto, DokuWiki mostrará todos los namespaces en el index. Habilitando esta opción los ocultará si el usuario no tiene permisos de lectura. Los sub-namespaces pueden resultar inaccesibles. El index puede hacerse poco usable dependiendo de las configuraciones ACL.';
+$lang['hidepages']             = 'Ocultar páginas con coincidencias (expresiones regulares)';
 $lang['useacl']                = 'Usar listas de control de acceso (ACL)';
 $lang['autopasswd']            = 'Autogenerar contraseñas';
 $lang['authtype']              = 'Método de Autenticación';
@@ -95,58 +93,70 @@ $lang['defaultgroup']          = 'Grupo por defecto';
 $lang['superuser']             = 'Super-usuario - grupo ó usuario con acceso total a todas las páginas y funciones, configuraciones ACL';
 $lang['manager']               = 'Manager - grupo o usuario con acceso a ciertas tareas de mantenimiento';
 $lang['profileconfirm']        = 'Confirmar cambios en perfil con contraseña';
+$lang['rememberme']            = 'Permitir cookies para acceso permanente (recordarme)';
 $lang['disableactions']        = 'Deshabilitar acciones DokuWiki';
 $lang['disableactions_check']  = 'Controlar';
 $lang['disableactions_subscription'] = 'Suscribirse/Cancelar suscripción';
 $lang['disableactions_wikicode'] = 'Ver la fuente/Exportar en formato raw';
 $lang['disableactions_other']  = 'Otras acciones (separadas por coma)';
-$lang['sneaky_index']          = 'Por defecto, DokuWiki mostrará todos los namespaces en el index. Habilitando esta opción los ocultará si el usuario no tiene permisos de lectura. Los sub-namespaces pueden resultar inaccesibles. El index puede hacerse poco usable dependiendo de las configuraciones ACL.';
 $lang['auth_security_timeout'] = 'Tiempo de Autenticación (en segundos), por motivos de seguridad';
 $lang['securecookie']          = 'Las cookies establecidas por HTTPS, ¿el naveagdor solo puede enviarlas por HTTPS? Inhabilite esta opción cuando solo se asegure con SSL la entrada, pero no la navegación de su wiki.';
+$lang['remote']                = 'Activar el sistema API remoto. Esto permite a otras aplicaciones acceder al wiki a traves de XML-RPC u otros mecanismos.';
+$lang['remoteuser']            = 'Restringir el acceso remoto por API a los grupos o usuarios separados por comas que se dan aquí. Dejar en blanco para dar acceso a todo el mundo.';
+$lang['usewordblock']          = 'Bloquear spam usando una lista de palabras';
+$lang['relnofollow']           = 'Usar rel="nofollow" en enlaces externos';
+$lang['indexdelay']            = 'Intervalo de tiempo antes de indexar (segundos)';
+$lang['mailguard']             = 'Ofuscar direcciones de correo electrónico';
+$lang['iexssprotect']          = 'Comprobar posible código malicioso (JavaScript ó HTML) en archivos subidos';
+$lang['usedraft']              = 'Guardar automáticamente un borrador mientras se edita';
+$lang['htmlok']                = 'Permitir HTML embebido';
+$lang['phpok']                 = 'Permitir PHP embebido';
+$lang['locktime']              = 'Edad máxima para archivos de bloqueo (segundos)';
+$lang['cachetime']             = 'Edad máxima para caché (segundos)';
+$lang['target____wiki']        = 'Ventana para enlaces internos';
+$lang['target____interwiki']   = 'Ventana para enlaces interwikis';
+$lang['target____extern']      = 'Ventana para enlaces externos';
+$lang['target____media']       = 'Ventana para enlaces a medios';
+$lang['target____windows']     = 'Ventana para enlaces a ventanas';
+$lang['mediarevisions']        = '¿Habilitar Mediarevisions?';
+$lang['refcheck']              = 'Control de referencia a medios';
+$lang['refshow']               = 'Número de referencias a medios a mostrar';
+$lang['gdlib']                 = 'Versión de GD Lib';
+$lang['im_convert']            = 'Ruta a la herramienta de conversión de ImageMagick';
+$lang['jpg_quality']           = 'Calidad de compresión de JPG (0-100)';
+$lang['fetchsize']             = 'Tamaño máximo (bytes) que fetch.php puede descargar de sitios externos';
+$lang['subscribers']           = 'Habilitar soporte para suscripción a páginas';
+$lang['subscribe_time']        = 'Tiempo después que alguna lista de suscripción fue enviada (seg); Debe ser menor que el tiempo especificado en días recientes.';
+$lang['notify']                = 'Enviar notificación de cambios a esta dirección de correo electrónico';
+$lang['registernotify']        = 'Enviar información cuando se registran nuevos usuarios a esta dirección de correo electrónico';
+$lang['mailfrom']              = 'Dirección de correo electrónico para emails automáticos';
+$lang['mailprefix']            = 'Asunto por defecto que se utilizará en mails automáticos.';
+$lang['htmlmail']              = 'Enviar correos electronicos en HTML con mejor aspecto pero mayor peso. Desactivar para enviar correos electronicos en texto plano.';
+$lang['sitemap']               = 'Generar sitemap de Google (días)';
+$lang['rss_type']              = 'Tipo de resumen (feed) XML';
+$lang['rss_linkto']            = 'Feed XML enlaza a';
+$lang['rss_content']           = '¿Qué mostrar en los items del archivo XML?';
+$lang['rss_update']            = 'Intervalo de actualización de feed XML (segundos)';
+$lang['rss_show_summary']      = 'Feed XML muestra el resumen en el título';
+$lang['rss_media']             = '¿Qué tipo de cambios deberían aparecer en el feed XML?';
 $lang['updatecheck']           = '¿Comprobar actualizaciones y advertencias de seguridad? Esta característica requiere que DokuWiki se conecte a update.dokuwiki.org.';
 $lang['userewrite']            = 'Usar URLs bonitas';
 $lang['useslash']              = 'Usar barra (/) como separador de espacios de nombres en las URLs';
-$lang['usedraft']              = 'Guardar automáticamente un borrador mientras se edita';
 $lang['sepchar']               = 'Separador de palabras en nombres de páginas';
 $lang['canonical']             = 'Usar URLs totalmente canónicas';
 $lang['fnencode']              = 'Método para codificar nombres de archivo no-ASCII.';
 $lang['autoplural']            = 'Controlar plurales en enlaces';
 $lang['compression']           = 'Método de compresión para archivos en el ático';
-$lang['cachetime']             = 'Edad máxima para caché (segundos)';
-$lang['locktime']              = 'Edad máxima para archivos de bloqueo (segundos)';
-$lang['fetchsize']             = 'Tamaño máximo (bytes) que fetch.php puede descargar de sitios externos';
-$lang['notify']                = 'Enviar notificación de cambios a esta dirección de correo electrónico';
-$lang['registernotify']        = 'Enviar información cuando se registran nuevos usuarios a esta dirección de correo electrónico';
-$lang['mailfrom']              = 'Dirección de correo electrónico para emails automáticos';
-$lang['mailprefix']            = 'Asunto por defecto que se utilizará en mails automáticos.';
 $lang['gzip_output']           = 'Usar gzip Content-Encoding para xhtml';
-$lang['gdlib']                 = 'Versión de GD Lib';
-$lang['im_convert']            = 'Ruta a la herramienta de conversión de ImageMagick';
-$lang['jpg_quality']           = 'Calidad de compresión de JPG (0-100)';
-$lang['subscribers']           = 'Habilitar soporte para suscripción a páginas';
-$lang['subscribe_time']        = 'Tiempo después que alguna lista de suscripción fue enviada (seg); Debe ser menor que el tiempo especificado en días recientes.';
 $lang['compress']              = 'Compactar la salida de CSS y javascript';
 $lang['cssdatauri']            = 'Tamaño en bytes hasta el cual las imágenes referenciadas en archivos CSS deberían ir incrustadas en la hoja de estilos para reducir el número de cabeceras de petición HTTP. ¡Esta técnica no funcionará en IE < 8! De <code>400</code> a <code>600</code> bytes es un valor adecuado. Establezca <code>0</code> para deshabilitarlo.';
-$lang['hidepages']             = 'Ocultar páginas con coincidencias (expresiones regulares)';
 $lang['send404']               = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes';
-$lang['sitemap']               = 'Generar sitemap de Google (días)';
 $lang['broken_iua']            = '¿Se ha roto (broken) la función ignore_user_abort en su sistema? Esto puede causar que no funcione el index de búsqueda. Se sabe que IIS+PHP/CGI está roto. Vea <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a>para más información.';
 $lang['xsendfile']             = '¿Utilizar la cabecera X-Sendfile para permitirle al servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.';
 $lang['renderer_xhtml']        = 'Visualizador a usar para salida (xhtml) principal del wiki';
 $lang['renderer__core']        = '%s (núcleo dokuwiki)';
 $lang['renderer__plugin']      = '%s (plugin)';
-$lang['rememberme']            = 'Permitir cookies para acceso permanente (recordarme)';
-$lang['rss_type']              = 'Tipo de resumen (feed) XML';
-$lang['rss_linkto']            = 'Feed XML enlaza a';
-$lang['rss_content']           = '¿Qué mostrar en los items del archivo XML?';
-$lang['rss_update']            = 'Intervalo de actualización de feed XML (segundos)';
-$lang['recent_days']           = 'Cuántos cambios recientes mantener (días)';
-$lang['rss_show_summary']      = 'Feed XML muestra el resumen en el título';
-$lang['target____wiki']        = 'Ventana para enlaces internos';
-$lang['target____interwiki']   = 'Ventana para enlaces interwikis';
-$lang['target____extern']      = 'Ventana para enlaces externos';
-$lang['target____media']       = 'Ventana para enlaces a medios';
-$lang['target____windows']     = 'Ventana para enlaces a ventanas';
+$lang['dnslookups']            = 'DokuWiki buscara los hostnames para usuarios editando las páginas con IP remota. Si usted tiene un servidor DNS bastante lento o que no funcione, favor de desactivar esta opción.';
 $lang['proxy____host']         = 'Nombre del servidor Proxy';
 $lang['proxy____port']         = 'Puerto del servidor Proxy';
 $lang['proxy____user']         = 'Nombre de usuario para el servidor Proxy';
diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php
index ac548245b..db91b73c6 100644
--- a/lib/plugins/plugin/lang/es/lang.php
+++ b/lib/plugins/plugin/lang/es/lang.php
@@ -22,6 +22,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['menu']                  = 'Administración de Plugins';
 $lang['download']              = 'Descargar e instalar un nuevo plugin';
diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index 752fb7da4..2be2d4a04 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -19,6 +19,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['name']                  = 'Retroinformación (Feedback) plugin Popularity';
 $lang['submit']                = 'Enviar datos';
diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php
index e235015d4..3fb02be8e 100644
--- a/lib/plugins/revert/lang/es/lang.php
+++ b/lib/plugins/revert/lang/es/lang.php
@@ -20,6 +20,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['menu']                  = 'Restaurador';
 $lang['filter']                = 'Buscar páginas con spam';
diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index c12b77b3d..b616857a2 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -21,6 +21,7 @@
  * @author emezeta <emezeta@infoprimo.com>
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
+ * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
  */
 $lang['menu']                  = 'Administración de usuarios';
 $lang['noauth']                = '(la autenticación de usuarios no está disponible)';
-- 
cgit v1.2.3


From 05be3a57144498a28e918684364813560623a898 Mon Sep 17 00:00:00 2001
From: Olivier Duval <zorky00@gmail.com>
Date: Fri, 7 Sep 2012 12:22:53 +0200
Subject: French language update

---
 lib/plugins/acl/lang/fr/lang.php         | 1 +
 lib/plugins/config/lang/fr/lang.php      | 2 ++
 lib/plugins/plugin/lang/fr/lang.php      | 1 +
 lib/plugins/popularity/lang/fr/lang.php  | 1 +
 lib/plugins/revert/lang/fr/lang.php      | 1 +
 lib/plugins/usermanager/lang/fr/lang.php | 1 +
 6 files changed, 7 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/fr/lang.php b/lib/plugins/acl/lang/fr/lang.php
index 7db8ae4ac..b1b3188be 100644
--- a/lib/plugins/acl/lang/fr/lang.php
+++ b/lib/plugins/acl/lang/fr/lang.php
@@ -23,6 +23,7 @@
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
 $lang['acl_group']             = 'Groupe';
diff --git a/lib/plugins/config/lang/fr/lang.php b/lib/plugins/config/lang/fr/lang.php
index 591e9f2fb..af2217af5 100644
--- a/lib/plugins/config/lang/fr/lang.php
+++ b/lib/plugins/config/lang/fr/lang.php
@@ -18,6 +18,7 @@
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['menu']                  = 'Paramètres de configuration';
 $lang['error']                 = 'Paramètres non modifiés en raison d\'une valeur non valide, vérifiez vos réglages et réessayez. <br />Les valeurs erronées sont entourées d\'une bordure rouge.';
@@ -95,6 +96,7 @@ $lang['disableactions_other']  = 'Autres actions (séparées par des virgules)';
 $lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)';
 $lang['securecookie']          = 'Les cookies mis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Ne désactivez cette option que si la connexion à votre wiki est sécurisée avec SSL mais que la navigation sur le wiki n\'est pas sécurisée.';
 $lang['remote']                = 'Active l\'API système distante. Ceci autorise d\'autres applications à accéder au wiki via XML-RPC ou d\'autres mécanismes.';
+$lang['remoteuser']            = 'Restreindre l\'accès à l\'API par une liste de groupes ou d\'utilisateurs séparés par une virgule. Laisser vide pour donner l\'accès à n\'importe qui.';
 $lang['usewordblock']          = 'Bloquer le spam selon les mots utilisés';
 $lang['relnofollow']           = 'Utiliser rel="nofollow" sur les liens extérieurs';
 $lang['indexdelay']            = 'Délai avant l\'indexation (en secondes)';
diff --git a/lib/plugins/plugin/lang/fr/lang.php b/lib/plugins/plugin/lang/fr/lang.php
index bf7a3739a..31d524cc6 100644
--- a/lib/plugins/plugin/lang/fr/lang.php
+++ b/lib/plugins/plugin/lang/fr/lang.php
@@ -18,6 +18,7 @@
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['menu']                  = 'Gestion des modules externes';
 $lang['download']              = 'Télécharger et installer un nouveau module';
diff --git a/lib/plugins/popularity/lang/fr/lang.php b/lib/plugins/popularity/lang/fr/lang.php
index f235fd0fa..904987079 100644
--- a/lib/plugins/popularity/lang/fr/lang.php
+++ b/lib/plugins/popularity/lang/fr/lang.php
@@ -15,6 +15,7 @@
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['name']                  = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)';
 $lang['submit']                = 'Envoyer les données';
diff --git a/lib/plugins/revert/lang/fr/lang.php b/lib/plugins/revert/lang/fr/lang.php
index 75c8bab68..253e0c96e 100644
--- a/lib/plugins/revert/lang/fr/lang.php
+++ b/lib/plugins/revert/lang/fr/lang.php
@@ -16,6 +16,7 @@
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['menu']                  = 'Gestionnaire de réversions';
 $lang['filter']                = 'Trouver les pages spammées ';
diff --git a/lib/plugins/usermanager/lang/fr/lang.php b/lib/plugins/usermanager/lang/fr/lang.php
index 882312820..d84ff65c3 100644
--- a/lib/plugins/usermanager/lang/fr/lang.php
+++ b/lib/plugins/usermanager/lang/fr/lang.php
@@ -17,6 +17,7 @@
  * @author schplurtz@laposte.net
  * @author skimpax@gmail.com
  * @author Yannick Aure <yannick.aure@gmail.com>
+ * @author Olivier DUVAL <zorky00@gmail.com>
  */
 $lang['menu']                  = 'Gestion des utilisateurs';
 $lang['noauth']                = '(authentification utilisateur non disponible)';
-- 
cgit v1.2.3


From cd2f903b3e35c080dc9c1aa0c9f7383573dcae31 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Fri, 7 Sep 2012 21:10:44 +0200
Subject: Correct and add some PHPDoc comments, initialize some variables

---
 lib/exe/indexer.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index e149770c0..1ccede923 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -175,6 +175,7 @@ function sendDigest() {
     }
     $subscriptions = subscription_find($ID, array('style' => '(digest|list)',
                                                   'escaped' => true));
+    /** @var auth_basic $auth */
     global $auth;
     global $lang;
     global $conf;
-- 
cgit v1.2.3


From 10295f78866be6074f00369aa219c67d867ad610 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sat, 8 Sep 2012 10:50:41 +0200
Subject: Replace language-dependent selector in the mediamanager js FS#2573

---
 lib/scripts/media.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 074c7b95f..a85b2ed0f 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -435,7 +435,7 @@ var dw_mediamanager = {
                 dw_mediamanager.$resizables().resizable('destroy');
 
                 if (update_list) {
-                    dw_mediamanager.list.call(jQuery('input[value="Apply"]')[0]);
+                    dw_mediamanager.list.call(jQuery('#mediamanager__page form.options input[type="submit"]')[0]);
                 }
 
                 $content.html(data);
-- 
cgit v1.2.3


From ad739841082515fdacb61ae6b7abcde1dcd9ce1f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 8 Sep 2012 12:17:08 +0100
Subject: RTL improvements (mainly on media manager, FS#2569)

---
 lib/tpl/default/_mediamanager.css          | 51 +++++++++++++++++++++++++++---
 lib/tpl/default/_tabs.css                  | 13 ++++++++
 lib/tpl/default/media.css                  | 11 +++++++
 lib/tpl/dokuwiki/css/_edit.css             |  3 ++
 lib/tpl/dokuwiki/css/_media_fullscreen.css | 10 +++++-
 5 files changed, 83 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
index 8c605f69a..2ce345e40 100644
--- a/lib/tpl/default/_mediamanager.css
+++ b/lib/tpl/default/_mediamanager.css
@@ -36,6 +36,10 @@
     min-height: 20px;
     overflow: hidden;
 }
+[dir=rtl] #mediamanager__page .panelContent {
+    text-align: right;
+}
+
 
 #mediamanager__page .panelContent {
     overflow-y: auto;
@@ -62,6 +66,10 @@
 
 /*____________ Namespaces tree ____________*/
 
+[dir=rtl] #mediamanager__page .namespaces {
+    text-align: right;
+}
+
 #mediamanager__page .namespaces h2 {
     font-size: 1em;
     display: inline-block;
@@ -78,14 +86,32 @@
 *+html #mediamanager__page .namespaces h2 {
     display: inline;
 }
+[dir=rtl] #mediamanager__page .namespaces h2 {
+    margin-right: 10px;
+}
 
 #mediamanager__page .namespaces ul {
     margin-left: .2em;
+    margin-bottom: 0;
+    padding: 0;
     list-style: none;
 }
+[dir=rtl] #mediamanager__page .namespaces ul {
+    margin-left: 0;
+    margin-right: .2em;
+}
+
 #mediamanager__page .namespaces ul ul {
     margin-left: 1em;
 }
+[dir=rtl] #mediamanager__page .namespaces ul ul {
+    margin-left: 0;
+    margin-right: 1em;
+}
+#mediamanager__page .namespaces ul ul li {
+    margin: 0;
+}
+
 
 #mediamanager__page .namespaces ul .selected {
     background-color: __highlight__;
@@ -143,6 +169,9 @@
     padding: 0;
     margin: 0;
 }
+[dir=rtl] #mediamanager__page .filelist ul.tabs {
+    margin-right: 10px;
+}
 
 #mediamanager__page .filelist .panelContent ul li:hover {
     background-color: __background_alt__;
@@ -179,6 +208,10 @@
     position: relative;
     line-height: 1.2;
 }
+[dir=rtl] #mediamanager__page .filelist .thumbs li {
+    margin-right: 0;
+    margin-left: 6px;
+}
 * html #mediamanager__page .filelist .thumbs li,
 *+html #mediamanager__page .filelist .thumbs li {
     display: inline;
@@ -201,6 +234,7 @@
 #mediamanager__page .filelist .thumbs li .date {
     display: block;
     overflow: hidden;
+    text-overflow: ellipsis;
     width: 90px;
     white-space: nowrap;
 }
@@ -253,6 +287,7 @@
 #mediamanager__page .filelist .rows li .filesize,
 #mediamanager__page .filelist .rows li .date {
     overflow: hidden;
+    text-overflow: ellipsis;
     float: left;
     margin-left: 1%;
     white-space: nowrap;
@@ -325,6 +360,9 @@
 #mediamanager__page form.meta label span {
     display: block;
 }
+[dir=rtl] #mediamanager__page form.meta label span {
+    text-align: right;
+}
 
 #mediamanager__page form.meta input {
     width: 50%;
@@ -373,6 +411,10 @@
     vertical-align: top;
     text-align: left;
 }
+[dir=rtl] #mediamanager__diff td,
+[dir=rtl] #mediamanager__diff th {
+    text-align: right;
+}
 
 #mediamanager__diff th {
     font-weight: normal;
@@ -405,10 +447,6 @@
 #mediamanager__diff .imageDiff {
     position: relative;
 }
-#mediamanager__diff .imageDiff .image1,
-#mediamanager__diff .imageDiff .image2 {
-    width: 97%;
-}
 #mediamanager__diff .imageDiff .image2 {
     position: absolute;
     top: 0;
@@ -426,7 +464,12 @@
     overflow: hidden;
 }
 
+#mediamanager__diff .imageDiff.portions img {
+    float: left;
+}
+
 #mediamanager__diff .imageDiff img {
     width: 100%;
+    max-width: none;
 }
 
diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css
index 8bfb676a0..a39b43441 100644
--- a/lib/tpl/default/_tabs.css
+++ b/lib/tpl/default/_tabs.css
@@ -10,6 +10,9 @@
     margin: 0;
     list-style: none;
 }
+[dir=rtl] .dokuwiki ul.tabs li {
+    float: right;
+}
 
 .dokuwiki ul.tabs li strong,
 .dokuwiki ul.tabs li a {
@@ -20,6 +23,16 @@
     color: __text__;
     border-radius: .5em .5em 0 0;
 }
+[dir=rtl] .dokuwiki ul.tabs li strong,
+[dir=rtl] .dokuwiki ul.tabs li a {
+    float: right;
+    margin: 0 0 0 .3em;
+}
+*+html[dir=rtl] .dokuwiki ul.tabs li strong,
+*+html[dir=rtl] .dokuwiki ul.tabs li a {
+    float: none;
+    display: inline-block;
+}
 .dokuwiki ul.tabs li strong {
     font-weight: normal;
 }
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 37369fe2f..640ad3162 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -42,18 +42,29 @@
     float: left;
     padding: 0.5em 0.3em 0 0;
 }
+[dir=rtl] #media__tree img {
+    float: right;
+    padding: 0.5em 0 0 0.3em;
+}
 
 #media__tree ul {
     list-style-type: none;
     list-style-image: none;
     margin-left: 1.5em;
 }
+[dir=rtl] #media__tree ul {
+    margin-left: 0;
+    margin-right: 1.5em;
+}
 
 #media__tree li {
     clear: left;
     list-style-type: none;
     list-style-image: none;
 }
+[dir=rtl] #media__tree li {
+    clear: right;
+}
 *+html #media__tree li,
 * html #media__tree li {
     border: 1px solid __background__;
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 374ddeb96..e4182774e 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -26,6 +26,9 @@
 #tool__bar {
     float: left;
 }
+[dir=rtl] #tool__bar {
+    float: right;
+}
 
 /* buttons inside of toolbar */
 .dokuwiki div.toolbar button.toolbutton {
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 9f15d7bcb..f795c6d65 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -158,6 +158,10 @@
     line-height: 1;
     padding-left: 3px;
 }
+[dir=rtl] #mediamanager__page .panelHeader ul li {
+    margin-right: 0;
+    margin-left: .5em;
+}
 
 #mediamanager__page .panelHeader ul li.listType {
     padding-left: 30px;
@@ -183,7 +187,7 @@
     padding: 0;
     margin: 0;
 }
-[dir=rtl] #mediamanager__page .filelist ul {
+[dir=rtl] #mediamanager__page .filelist ul.tabs {
     margin-right: 10px;
 }
 
@@ -222,6 +226,10 @@
     position: relative;
     line-height: 1.2;
 }
+[dir=rtl] #mediamanager__page .filelist .thumbs li {
+    margin-right: 0;
+    margin-left: 6px;
+}
 * html #mediamanager__page .filelist .thumbs li,
 *+html #mediamanager__page .filelist .thumbs li {
     display: inline;
-- 
cgit v1.2.3


From 356d9c9ea239fe5fe0ac5ecc2c294e768f672059 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 8 Sep 2012 15:02:28 +0200
Subject: Replacing $_REQUEST variables with $INPUT wrapper, init.php

---
 lib/exe/ajax.php | 47 +++++++++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 496b2f1a1..9989269cf 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -14,10 +14,10 @@ session_write_close();
 header('Content-Type: text/html; charset=utf-8');
 
 //call the requested function
-if(isset($_POST['call'])){
-    $call = $_POST['call'];
-}else if(isset($_GET['call'])){
-    $call = $_GET['call'];
+if($INPUT->post->has('call')){
+    $call = $INPUT->post->str('call');
+}else if($INPUT->get->has('call')){
+    $call = $INPUT->get->str('call');
 }else{
     exit;
 }
@@ -43,9 +43,10 @@ if(function_exists($callfn)){
 function ajax_qsearch(){
     global $conf;
     global $lang;
+    global $INPUT;
 
-    $query = $_POST['q'];
-    if(empty($query)) $query = $_GET['q'];
+    $query = $INPUT->post->str('q');
+    if(empty($query)) $query = $INPUT->get->str('q');
     if(empty($query)) return;
 
     $query = urldecode($query);
@@ -81,9 +82,10 @@ function ajax_qsearch(){
 function ajax_suggestions() {
     global $conf;
     global $lang;
+    global $INPUT;
 
-    $query = cleanID($_POST['q']);
-    if(empty($query)) $query = cleanID($_GET['q']);
+    $query = cleanID($INPUT->post->str('q'));
+    if(empty($query)) $query = cleanID($INPUT->get->str('q'));
     if(empty($query)) return;
 
     $data = array();
@@ -121,8 +123,9 @@ function ajax_lock(){
     global $lang;
     global $ID;
     global $INFO;
+    global $INPUT;
 
-    $ID = cleanID($_POST['id']);
+    $ID = cleanID($INPUT->post->str('id'));
     if(empty($ID)) return;
 
     $INFO = pageinfo();
@@ -137,15 +140,15 @@ function ajax_lock(){
         echo 1;
     }
 
-    if($conf['usedraft'] && $_POST['wikitext']){
+    if($conf['usedraft'] && $INPUT->post->str('wikitext')){
         $client = $_SERVER['REMOTE_USER'];
         if(!$client) $client = clientIP(true);
 
         $draft = array('id'     => $ID,
-                'prefix' => substr($_POST['prefix'], 0, -1),
-                'text'   => $_POST['wikitext'],
-                'suffix' => $_POST['suffix'],
-                'date'   => (int) $_POST['date'],
+                'prefix' => substr($INPUT->post->str('prefix'), 0, -1),
+                'text'   => $INPUT->post->str('wikitext'),
+                'suffix' => $INPUT->post->str('suffix'),
+                'date'   => $INPUT->post->int('date'),
                 'client' => $client,
                 );
         $cname = getCacheName($draft['client'].$ID,'.draft');
@@ -180,9 +183,10 @@ function ajax_draftdel(){
  */
 function ajax_medians(){
     global $conf;
+    global $INPUT;
 
     // wanted namespace
-    $ns  = cleanID($_POST['ns']);
+    $ns  = cleanID($INPUT->post->str('ns'));
     $dir  = utf8_encodeFN(str_replace(':','/',$ns));
 
     $lvl = count(explode(':',$ns));
@@ -203,9 +207,10 @@ function ajax_medians(){
 function ajax_medialist(){
     global $conf;
     global $NS;
+    global $INPUT;
 
-    $NS = cleanID($_POST['ns']);
-    if ($_POST['do'] == 'media') {
+    $NS = cleanID($INPUT->post->str('ns'));
+    if ($INPUT->post->str('do') == 'media') {
         tpl_mediaFileList();
     } else {
         tpl_mediaContent(true);
@@ -241,7 +246,7 @@ function ajax_mediadiff(){
     global $INPUT;
 
     if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
-    $NS = $_POST['ns'];
+    $NS = $INPUT->post->str('ns');
     $auth = auth_quickaclcheck("$NS:*");
     media_diff($image, $NS, $auth, true);
 }
@@ -310,9 +315,10 @@ function dir_delete($path) {
  */
 function ajax_index(){
     global $conf;
+    global $INPUT;
 
     // wanted namespace
-    $ns  = cleanID($_POST['idx']);
+    $ns  = cleanID($INPUT->post->str('idx'));
     $dir  = utf8_encodeFN(str_replace(':','/',$ns));
 
     $lvl = count(explode(':',$ns));
@@ -333,8 +339,9 @@ function ajax_index(){
 function ajax_linkwiz(){
     global $conf;
     global $lang;
+    global $INPUT;
 
-    $q  = ltrim(trim($_POST['q']),':');
+    $q  = ltrim(trim($INPUT->post->str('q')),':');
     $id = noNS($q);
     $ns = getNS($q);
 
-- 
cgit v1.2.3


From 5373d8473e7ebb71c7d2b85a36a511358343d1ac Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 8 Sep 2012 15:03:03 +0200
Subject: Replacing $_REQUEST variables with $INPUT wrapper, fetch.php

---
 lib/exe/fetch.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index 150812b55..e8f189256 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -152,12 +152,12 @@ function sendFile($file,$mime,$dl,$cache){
  * @returns array(STATUS, STATUSMESSAGE)
  */
 function checkFileStatus(&$media, &$file, $rev='') {
-  global $MIME, $EXT, $CACHE;
+  global $MIME, $EXT, $CACHE, $INPUT;
 
   //media to local file
   if(preg_match('#^(https?)://#i',$media)){
     //check hash
-    if(substr(md5(auth_cookiesalt().$media),0,6) != $_REQUEST['hash']){
+    if(substr(md5(auth_cookiesalt().$media),0,6) != $INPUT->str('hash')){
       return array( 412, 'Precondition Failed');
     }
     //handle external images
-- 
cgit v1.2.3


From 392c9b52ffb053f893462033bbc4b42ea2b81eba Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 8 Sep 2012 15:04:01 +0200
Subject: Replacing $_REQUEST variables with $INPUT wrapper, config/admin.php

---
 lib/plugins/config/admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index bc2d88322..0d314d2e6 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -38,10 +38,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
      * handle user request
      */
     function handle() {
-      global $ID;
+      global $ID, $INPUT;
 
       if (!$this->_restore_session()) return $this->_close_session();
-      if (!isset($_REQUEST['save']) || ($_REQUEST['save'] != 1)) return $this->_close_session();
+      if ($INPUT->int('save') != 1) return $this->_close_session();
       if (!checkSecurityToken()) return $this->_close_session();
 
       if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
@@ -49,7 +49,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       // don't go any further if the configuration is locked
       if ($this->_config->_locked) return $this->_close_session();
 
-      $this->_input = $_REQUEST['config'];
+      $this->_input = $INPUT->arr('config');
 
       while (list($key) = each($this->_config->setting)) {
         $input = isset($this->_input[$key]) ? $this->_input[$key] : NULL;
-- 
cgit v1.2.3


From b41885e3906c7acab7e2c3e33e49d17b2489956c Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 8 Sep 2012 15:04:37 +0200
Subject: Replacing $_REQUEST variables with $INPUT wrapper, plugin manager

---
 lib/plugins/plugin/classes/ap_download.class.php | 3 ++-
 lib/plugins/plugin/classes/ap_enable.class.php   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/plugin/classes/ap_download.class.php b/lib/plugins/plugin/classes/ap_download.class.php
index 2d5ead400..d1b518d9d 100644
--- a/lib/plugins/plugin/classes/ap_download.class.php
+++ b/lib/plugins/plugin/classes/ap_download.class.php
@@ -8,8 +8,9 @@ class ap_download extends ap_manage {
      */
     function process() {
         global $lang;
+        global $INPUT;
 
-        $plugin_url = $_REQUEST['url'];
+        $plugin_url = $INPUT->str('url');
         $this->download($plugin_url, $this->overwrite);
         return '';
     }
diff --git a/lib/plugins/plugin/classes/ap_enable.class.php b/lib/plugins/plugin/classes/ap_enable.class.php
index 35450a907..a25c7ede8 100644
--- a/lib/plugins/plugin/classes/ap_enable.class.php
+++ b/lib/plugins/plugin/classes/ap_enable.class.php
@@ -6,9 +6,11 @@ class ap_enable extends ap_manage {
 
     function process() {
         global $plugin_protected;
+        global $INPUT;
+
         $count_enabled = $count_disabled = 0;
 
-        $this->enabled = isset($_REQUEST['enabled']) ? $_REQUEST['enabled'] : array();
+        $this->enabled = $INPUT->arr('enabled');
 
         foreach ($this->manager->plugin_list as $plugin) {
             if (in_array($plugin, $plugin_protected)) continue;
-- 
cgit v1.2.3


From f21e024ada9202d47fcdc85730a44af5ea259d1c Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 8 Sep 2012 15:05:39 +0200
Subject: Replacing $_REQUEST variables with $INPUT wrapper, popularity plugin

---
 lib/plugins/popularity/admin.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/popularity/admin.php b/lib/plugins/popularity/admin.php
index 364075903..474a09ef9 100644
--- a/lib/plugins/popularity/admin.php
+++ b/lib/plugins/popularity/admin.php
@@ -50,15 +50,17 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
      * handle user request
      */
     function handle() {
+        global $INPUT;
+
         //Send the data
-        if ( isset($_REQUEST['data']) ){
-            $this->sentStatus = $this->helper->sendData( $_REQUEST['data'] );
+        if ( $INPUT->has('data') ){
+            $this->sentStatus = $this->helper->sendData( $INPUT->str('data') );
             if ( $this->sentStatus === '' ){
                 //Update the last time we sent the data
                 touch ( $this->helper->popularityLastSubmitFile );
             }
             //Deal with the autosubmit option
-            $this->_enableAutosubmit( isset($_REQUEST['autosubmit']) );
+            $this->_enableAutosubmit( $INPUT->has('autosubmit') );
         }
     }
 
@@ -78,7 +80,9 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
      * Output HTML form
      */
     function html() {
-        if ( ! isset($_REQUEST['data']) ){
+        global $INPUT;
+
+        if ( ! $INPUT->has('data') ){
             echo $this->locale_xhtml('intro');
 
             //If there was an error the last time we tried to autosubmit, warn the user
@@ -106,7 +110,7 @@ class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
                 //If we failed to submit the data, try directly with the browser
                 echo $this->getLang('submissionFailed') . $this->sentStatus . '<br />';
                 echo $this->getLang('submitDirectly');
-                echo $this->buildForm('browser', $_REQUEST['data']);
+                echo $this->buildForm('browser', $INPUT->str('data'));
             }
         }
     }
-- 
cgit v1.2.3


From fbfbbe8a285a488c3feab53f47a9216fdd999a42 Mon Sep 17 00:00:00 2001
From: Hakan Sandell <sandell.hakan@gmail.com>
Date: Sat, 8 Sep 2012 15:06:21 +0200
Subject: Replacing $_REQUEST variables with $INPUT wrapper, usermanager plugin

---
 lib/plugins/usermanager/admin.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 2bb0a863d..30b65debb 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -553,12 +553,13 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
      */
     function _retrieveUser($clean=true) {
         global $auth;
+        global $INPUT;
 
-        $user[0] = ($clean) ? $auth->cleanUser($_REQUEST['userid']) : $_REQUEST['userid'];
-        $user[1] = $_REQUEST['userpass'];
-        $user[2] = $_REQUEST['username'];
-        $user[3] = $_REQUEST['usermail'];
-        $user[4] = explode(',',$_REQUEST['usergroups']);
+        $user[0] = ($clean) ? $auth->cleanUser($INPUT->str('userid')) : $INPUT->str('userid');
+        $user[1] = $INPUT->str('userpass');
+        $user[2] = $INPUT->str('username');
+        $user[3] = $INPUT->str('usermail');
+        $user[4] = explode(',',$INPUT->str('usergroups'));
 
         $user[4] = array_map('trim',$user[4]);
         if($clean) $user[4] = array_map(array($auth,'cleanGroup'),$user[4]);
@@ -584,9 +585,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
     }
 
     function _retrieveFilter() {
+        global $INPUT;
 
-        $t_filter = $_REQUEST['filter'];
-        if (!is_array($t_filter)) return array();
+        $t_filter = $INPUT->arr('filter');
 
         // messy, but this way we ensure we aren't getting any additional crap from malicious users
         $filter = array();
-- 
cgit v1.2.3


From e9e762792aaa754e29c2ecbbd088b60f75b7d674 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 9 Sep 2012 00:39:37 +0200
Subject: Add more tolerance in js resize of the media manager FS#2369

This adds more tolerance to the width calculations of the media manager
panes which avoids that the right pane is displayed below the other
panes.
---
 lib/scripts/media.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index a85b2ed0f..8f3c00c88 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -495,12 +495,12 @@ var dw_mediamanager = {
                 // set max width of resizable column
                 var widthOtherResizable = widthResizables - jQuery(this).width();
                 var minWidthNonResizable = parseFloat($filePanel.css("min-width"));
-                var maxWidth = widthFull - (widthOtherResizable + minWidthNonResizable);
+                var maxWidth = widthFull - (widthOtherResizable + minWidthNonResizable) - 1;
                 $resizables.resizable( "option", "maxWidth", maxWidth );
 
                 // width of file panel in % = 100% - width of resizables in %
-                // this calculates with 99.99 and not 100 to overcome rounding errors
-                var relWidthNonResizable = 99.99 - (100 * widthResizables / widthFull);
+                // this calculates with 99.9 and not 100 to overcome rounding errors
+                var relWidthNonResizable = 99.9 - (100 * widthResizables / widthFull);
                 // set width of file panel
                 $filePanel.width(relWidthNonResizable+'%');
 
-- 
cgit v1.2.3


From 8628c4fa004048e67f75cd638b6be0b26fe3132c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 9 Sep 2012 13:07:50 +0100
Subject: updated (and added missing) info.txt files

---
 lib/plugins/acl/plugin.info.txt          | 2 +-
 lib/plugins/config/plugin.info.txt       | 2 +-
 lib/plugins/info/plugin.info.txt         | 2 +-
 lib/plugins/popularity/plugin.info.txt   | 2 +-
 lib/plugins/revert/plugin.info.txt       | 2 +-
 lib/plugins/safefnrecode/plugin.info.txt | 2 +-
 lib/plugins/testing/plugin.info.txt      | 2 +-
 lib/plugins/usermanager/plugin.info.txt  | 4 ++--
 lib/tpl/default/template.info.txt        | 7 +++++++
 lib/tpl/dokuwiki/template.info.txt       | 6 +++---
 10 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 lib/tpl/default/template.info.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt
index f108a2390..db033ebe5 100644
--- a/lib/plugins/acl/plugin.info.txt
+++ b/lib/plugins/acl/plugin.info.txt
@@ -1,6 +1,6 @@
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2011-04-16
+date   2012-09-06
 name   ACL Manager
 desc   Manage Page Access Control Lists
 url    http://dokuwiki.org/plugin:acl
diff --git a/lib/plugins/config/plugin.info.txt b/lib/plugins/config/plugin.info.txt
index ace4889b6..a5fd77abc 100644
--- a/lib/plugins/config/plugin.info.txt
+++ b/lib/plugins/config/plugin.info.txt
@@ -1,6 +1,6 @@
 author Christopher Smith
 email  chris@jalakai.co.uk
-date   2007-08-05
+date   2012-09-08
 name   Configuration Manager
 desc   Manage Dokuwiki's Configuration Settings
 url    http://dokuwiki.org/plugin:config
diff --git a/lib/plugins/info/plugin.info.txt b/lib/plugins/info/plugin.info.txt
index 2432225f1..b78482e8d 100644
--- a/lib/plugins/info/plugin.info.txt
+++ b/lib/plugins/info/plugin.info.txt
@@ -1,6 +1,6 @@
 author Andreas Gohr
 email andi@splitbrain.org
-date 2008-09-12
+date 2012-02-04
 name Info Plugin
 desc Displays information about various DokuWiki internals
 url http://dokuwiki.org/plugin:info
diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt
index 16b148f41..871259ee9 100644
--- a/lib/plugins/popularity/plugin.info.txt
+++ b/lib/plugins/popularity/plugin.info.txt
@@ -1,7 +1,7 @@
 base    popularity
 author  Andreas Gohr
 email   andi@splitbrain.org
-date    2011-08-18
+date    2012-09-08
 name    Popularity Feedback Plugin
 desc    Send anonymous data about your wiki to the developers.
 url     http://www.dokuwiki.org/plugin:popularity
diff --git a/lib/plugins/revert/plugin.info.txt b/lib/plugins/revert/plugin.info.txt
index 5bb6f3413..bb8d7614e 100644
--- a/lib/plugins/revert/plugin.info.txt
+++ b/lib/plugins/revert/plugin.info.txt
@@ -1,6 +1,6 @@
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2008-12-10
+date   2012-08-05
 name   Revert Manager
 desc   Allows you to mass revert recent edits
 url    http://dokuwiki.org/plugin:revert
diff --git a/lib/plugins/safefnrecode/plugin.info.txt b/lib/plugins/safefnrecode/plugin.info.txt
index b1600060c..2b42399b0 100644
--- a/lib/plugins/safefnrecode/plugin.info.txt
+++ b/lib/plugins/safefnrecode/plugin.info.txt
@@ -1,7 +1,7 @@
 base   safefnrecode
 author Andreas Gohr
 email  andi@splitbrain.org
-date   2011-04-03
+date   2011-04-06
 name   safefnrecode plugin
 desc   Changes existing page and foldernames for the change in the safe filename encoding
 url    http://www.dokuwiki.org/plugin:safefnrecode
diff --git a/lib/plugins/testing/plugin.info.txt b/lib/plugins/testing/plugin.info.txt
index a514d7774..3d353b4d8 100644
--- a/lib/plugins/testing/plugin.info.txt
+++ b/lib/plugins/testing/plugin.info.txt
@@ -1,6 +1,6 @@
 base   testing
 author Tobias Sarnowski
 email  tobias@trustedco.de
-date   2012-04-24
+date   2012-04-26
 name   Testing Plugin
 desc   Used to test the test framework. Should always be disabled.
diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt
index 7ec5fafd5..b09e549bf 100644
--- a/lib/plugins/usermanager/plugin.info.txt
+++ b/lib/plugins/usermanager/plugin.info.txt
@@ -1,6 +1,6 @@
 author Chris Smith
 email  chris@jalakai.co.uk
-date   2008-09-17
+date   2012-09-08
 name   User Manager
-desc   Manage users 
+desc   Manage users
 url    http://dokuwiki.org/plugin:usermanager
diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt
new file mode 100644
index 000000000..3b7741ed5
--- /dev/null
+++ b/lib/tpl/default/template.info.txt
@@ -0,0 +1,7 @@
+base     default
+author   Andreas Gohr
+email    andi@splitbrain.org
+date     2012-09-08
+name     DokuWiki Default Template
+desc     The template that comes with DokuWiki
+url      http://www.dokuwiki.org/template:default
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index 3f904c6c8..dfac2ef4e 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
 base     dokuwiki
-author   Anika Henke, Andreas Gohr, Clarence Lee
-email    andi@splitbrain.org
-date     2012-03-24
+author   Anika Henke
+email    anika@selfthinker.org
+date     2012-09-08
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki
-- 
cgit v1.2.3


From 0c2e484f96dbcda5e5d13f3d278a925f9a401fc7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 9 Sep 2012 13:31:39 +0100
Subject: added missing info.txt parameters, added plugin plugin's info.txt,
 adjusted old default  template's description

---
 lib/plugins/acl/plugin.info.txt         | 1 +
 lib/plugins/config/plugin.info.txt      | 1 +
 lib/plugins/info/plugin.info.txt        | 1 +
 lib/plugins/plugin/plugin.info.txt      | 7 +++++++
 lib/plugins/revert/plugin.info.txt      | 1 +
 lib/plugins/testing/plugin.info.txt     | 1 +
 lib/plugins/usermanager/plugin.info.txt | 1 +
 lib/tpl/default/template.info.txt       | 2 +-
 8 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 lib/plugins/plugin/plugin.info.txt

(limited to 'lib')

diff --git a/lib/plugins/acl/plugin.info.txt b/lib/plugins/acl/plugin.info.txt
index db033ebe5..42babd71c 100644
--- a/lib/plugins/acl/plugin.info.txt
+++ b/lib/plugins/acl/plugin.info.txt
@@ -1,3 +1,4 @@
+base   acl
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2012-09-06
diff --git a/lib/plugins/config/plugin.info.txt b/lib/plugins/config/plugin.info.txt
index a5fd77abc..1f9968154 100644
--- a/lib/plugins/config/plugin.info.txt
+++ b/lib/plugins/config/plugin.info.txt
@@ -1,3 +1,4 @@
+base   config
 author Christopher Smith
 email  chris@jalakai.co.uk
 date   2012-09-08
diff --git a/lib/plugins/info/plugin.info.txt b/lib/plugins/info/plugin.info.txt
index b78482e8d..5c7d583c0 100644
--- a/lib/plugins/info/plugin.info.txt
+++ b/lib/plugins/info/plugin.info.txt
@@ -1,3 +1,4 @@
+base info
 author Andreas Gohr
 email andi@splitbrain.org
 date 2012-02-04
diff --git a/lib/plugins/plugin/plugin.info.txt b/lib/plugins/plugin/plugin.info.txt
new file mode 100644
index 000000000..c2f72d998
--- /dev/null
+++ b/lib/plugins/plugin/plugin.info.txt
@@ -0,0 +1,7 @@
+base   plugin
+author Christopher Smith
+email  chris@jalakai.co.uk
+date   2012-09-08
+name   Plugin Manager plugin
+desc   Manage and install plugins
+url    http://www.dokuwiki.org/plugin:plugin
diff --git a/lib/plugins/revert/plugin.info.txt b/lib/plugins/revert/plugin.info.txt
index bb8d7614e..205fe9177 100644
--- a/lib/plugins/revert/plugin.info.txt
+++ b/lib/plugins/revert/plugin.info.txt
@@ -1,3 +1,4 @@
+base   revert
 author Andreas Gohr
 email  andi@splitbrain.org
 date   2012-08-05
diff --git a/lib/plugins/testing/plugin.info.txt b/lib/plugins/testing/plugin.info.txt
index 3d353b4d8..c78c07739 100644
--- a/lib/plugins/testing/plugin.info.txt
+++ b/lib/plugins/testing/plugin.info.txt
@@ -4,3 +4,4 @@ email  tobias@trustedco.de
 date   2012-04-26
 name   Testing Plugin
 desc   Used to test the test framework. Should always be disabled.
+url    http://www.dokuwiki.org/plugin:testing
diff --git a/lib/plugins/usermanager/plugin.info.txt b/lib/plugins/usermanager/plugin.info.txt
index b09e549bf..f4495bb19 100644
--- a/lib/plugins/usermanager/plugin.info.txt
+++ b/lib/plugins/usermanager/plugin.info.txt
@@ -1,3 +1,4 @@
+base   usermanager
 author Chris Smith
 email  chris@jalakai.co.uk
 date   2012-09-08
diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt
index 3b7741ed5..a77289e58 100644
--- a/lib/tpl/default/template.info.txt
+++ b/lib/tpl/default/template.info.txt
@@ -3,5 +3,5 @@ author   Andreas Gohr
 email    andi@splitbrain.org
 date     2012-09-08
 name     DokuWiki Default Template
-desc     The template that comes with DokuWiki
+desc     DokuWiki's default template until 2012
 url      http://www.dokuwiki.org/template:default
-- 
cgit v1.2.3


From 4802becf985a7e314243b0c4d0a30bd7f906d078 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 9 Sep 2012 18:44:16 +0200
Subject: Fix section edit highlighting when the start marker is hidden

This fixes the section edit highlighting when the start marker (normally
a heading) is inside other HTML elements like a div from the wrap
plugin.
---
 lib/scripts/page.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index 5ac81f33b..b8e83cb0c 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -27,9 +27,14 @@ dw_page = {
                 // Walk the DOM tree up (first previous siblings, then parents)
                 // until boundary element
                 while($tgt.length > 0 && !$tgt.hasClass('sectionedit' + nr)) {
-                    // $.last gives the DOM-ordered last element:
-                    // prev if present, else parent.
-                    $tgt = $tgt.prev().add($tgt.parent()).last();
+                    // go down when the sectionedit begin marker is below $tgt
+                    if ($tgt.find('.sectionedit' + nr).length > 0) {
+                        $tgt = $tgt.children().last();
+                    } else {
+                        // $.last gives the DOM-ordered last element:
+                        // prev if present, else parent.
+                        $tgt = $tgt.prev().add($tgt.parent()).last();
+                    }
                     $tgt.addClass('section_highlight');
                 }
             })
-- 
cgit v1.2.3


From 28c7c067399b7a0c1844ca0f7d46d260b632ec08 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 9 Sep 2012 23:17:20 +0100
Subject: added missing DETAIL_STARTED event to lib/exe/detail.php

---
 lib/exe/detail.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index ea46bc037..e597db3a2 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -2,6 +2,7 @@
 if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
 define('DOKU_MEDIADETAIL',1);
 require_once(DOKU_INC.'inc/init.php');
+trigger_event('DETAIL_STARTED', $tmp=array());
 //close session
 session_write_close();
 
-- 
cgit v1.2.3


From 30c1351e814dcc13497a61f65fa05a0901d5436a Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 10 Sep 2012 00:25:36 +0200
Subject: Fix media manager height handling after resize FS#2369

The height handling code was triggered before the width handling code
and thus the right pane was below the other panes during the height
calculations which caused strange effects. Now the height handling code
is called again after adjusting the width of the right pane.
---
 lib/scripts/media.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index 8f3c00c88..182d5fefe 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -514,6 +514,8 @@ var dw_mediamanager = {
                     });
                 }
 
+                dw_mediamanager.resize();
+
                 dw_mediamanager.opacity_slider();
                 dw_mediamanager.portions_slider();
             }
-- 
cgit v1.2.3


From 27a8150a43aa6c4c88f168078fa0a684630b2d1b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 13 Sep 2012 17:06:45 +0100
Subject: deleted empty css files

(How the hell did they get back in?)
---
 lib/tpl/dokuwiki/css/plugins.css | 0
 lib/tpl/dokuwiki/css/rtl.css     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 lib/tpl/dokuwiki/css/plugins.css
 delete mode 100644 lib/tpl/dokuwiki/css/rtl.css

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/plugins.css b/lib/tpl/dokuwiki/css/plugins.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css
deleted file mode 100644
index e69de29bb..000000000
-- 
cgit v1.2.3


From 1d93d6bdde1067a8ea641bdb2ce594d2fb3b78cf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 13 Sep 2012 17:07:35 +0100
Subject: corrected comment in style.ini

---
 lib/tpl/dokuwiki/style.ini | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 45e68e3ed..242b43080 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -3,8 +3,7 @@
 
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
-; print, screen and rtl are supported. rtl styles are loaded additionally
-; to screen styles if a right-to-left language is selected (eg. Hebrew).
+; print, screen and all are supported.
 
 [stylesheets]
 
-- 
cgit v1.2.3


From ee8400d60f3958a974fce9d8a176a563d14ac734 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 15 Sep 2012 21:00:15 +0100
Subject: let tables adjust to default width (FS#2598)

---
 lib/tpl/dokuwiki/css/content.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index ebeb4e17e..9f3eab0f0 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -70,7 +70,6 @@
 /*____________ tables ____________*/
 
 .dokuwiki div.table {
-    width: 100%;
     overflow-x: auto;
     margin-bottom: 1.4em;
 }
-- 
cgit v1.2.3


From d33f2760e5d9ba44d858fef247c03fff3ca877f8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 16 Sep 2012 13:03:28 +0100
Subject: moved media manager resize image to core image folder

---
 lib/images/resizecol.png                   | Bin 0 -> 158 bytes
 lib/tpl/dokuwiki/css/_media_fullscreen.css |   2 +-
 lib/tpl/dokuwiki/images/resizecol.png      | Bin 158 -> 0 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 lib/images/resizecol.png
 delete mode 100644 lib/tpl/dokuwiki/images/resizecol.png

(limited to 'lib')

diff --git a/lib/images/resizecol.png b/lib/images/resizecol.png
new file mode 100644
index 000000000..b5aeec004
Binary files /dev/null and b/lib/images/resizecol.png differ
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index f795c6d65..c67e16051 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -65,7 +65,7 @@
 #mediamanager__page .ui-resizable-e {
     width: 6px;
     right: 2px;
-    background: transparent url(images/resizecol.png) center center no-repeat;
+    background: transparent url(../../images/resizecol.png) center center no-repeat;
 }
 #mediamanager__page .ui-resizable-e:hover {
     background-color: __background_alt__;
diff --git a/lib/tpl/dokuwiki/images/resizecol.png b/lib/tpl/dokuwiki/images/resizecol.png
deleted file mode 100644
index b5aeec004..000000000
Binary files a/lib/tpl/dokuwiki/images/resizecol.png and /dev/null differ
-- 
cgit v1.2.3


From a0df75e62c09594d1d1ed11be9a911badab0699e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Mon, 17 Sep 2012 11:08:34 +0300
Subject: add index file similar to fileicons to show active smileys

---
 lib/images/smileys/index.php | 48 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 lib/images/smileys/index.php

(limited to 'lib')

diff --git a/lib/images/smileys/index.php b/lib/images/smileys/index.php
new file mode 100644
index 000000000..9a2905b33
--- /dev/null
+++ b/lib/images/smileys/index.php
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr">
+<head>
+    <title>simleys</title>
+
+    <style type="text/css">
+        body {
+            background-color: #ccc;
+            font-family: Arial;
+        }
+
+        .box {
+            width: 200px;
+            float:left;
+            padding: 0.5em;
+            margin: 0;
+        }
+
+        .white {
+            background-color: #fff;
+        }
+
+        .black {
+            background-color: #000;
+        }
+    </style>
+
+</head>
+<body>
+
+<div class="white box">
+<?php
+foreach (glob('*.gif') as $img) {
+    echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+}
+?>
+</div>
+
+<div class="black box">
+<?php
+foreach (glob('*.gif') as $img) {
+    echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+}
+?>
+</div>
+
+</body>
+</html>
-- 
cgit v1.2.3


From e71b260a0446cb34eacbd16234691eca41feb9b1 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 18 Sep 2012 00:10:23 +0200
Subject: Simplify js_compress() for regular expressions FS#2593

This simplifies a while loop in the js_compress() code. The
functionality of the new code is completely identical to the old code
but it uses less comparisons and according to FS#2593 it is thus a lot
faster.
---
 lib/exe/js.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 634e21207..42979eeed 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -301,10 +301,8 @@ function js_compress($s){
                 // now move forward and find the end of it
                 $j = 1;
                 while($s{$i+$j} != '/'){
-                    while( ($s{$i+$j} != '\\') && ($s{$i+$j} != '/')){
-                        $j = $j + 1;
-                    }
                     if($s{$i+$j} == '\\') $j = $j + 2;
+                    else $j++;
                 }
                 $result .= substr($s,$i,$j+1);
                 $i = $i + $j + 1;
-- 
cgit v1.2.3


From 19e77bae285ac9b74c39b7bfe457bb2d8331984a Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Mon, 17 Sep 2012 23:16:47 +0100
Subject: fixed checkboxes missing border in Opera (FS#2603)

---
 lib/tpl/dokuwiki/css/basic.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index 4942de001..55c1d2dfe 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -320,7 +320,7 @@ select:focus {
 input[type=radio],
 input[type=checkbox] {
     padding: 0;
-    border-width: 0;
+    border-style: none;
     box-shadow: none;
 }
 
-- 
cgit v1.2.3


From 14977bd2edded61cecdc10116826eef384777e82 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 18 Sep 2012 21:57:56 +0200
Subject: Fix CSS cache handling and CSS output

This fixes several problems:
- the CSS cache was only updated when either the CSS files for all media
  types or one of the global files was modified
- when only the screen CSS was changed, the screen CSS was regenerated
  but then the cache was printed which either caused duplicated screen
  CSS output when gzip output was disabled or invalid output with gzip
  enabled as first the plain text screen CSS and then the
  gzip-compressed cache file was printed

Now first all CSS files are collected, then the cache is checked once
and only after this the CSS content is collected.
---
 lib/exe/css.php | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 8de3db11b..0ad9dee06 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -64,21 +64,27 @@ function css_out(){
     // start output buffering
     ob_start();
 
+    // Array of needed files and their web locations, the latter ones
+    // are needed to fix relative paths in the stylesheets
+    $files = array();
+
+    $cache_files = getConfigFiles('main');
+    $cache_files[] = $tplinc.'style.ini';
+    $cache_files[] = __FILE__;
+
     foreach($mediatypes as $mediatype) {
-        // Array of needed files and their web locations, the latter ones
-        // are needed to fix relative paths in the stylesheets
-        $files   = array();
+        $files[$mediatype] = array();
         // load core styles
-        $files[DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/';
+        $files[$mediatype][DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/';
         // load jQuery-UI theme
         if ($mediatype == 'screen') {
-            $files[DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/';
+            $files[$mediatype][DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/';
         }
         // load plugin styles
-        $files = array_merge($files, css_pluginstyles($mediatype));
+        $files[$mediatype] = array_merge($files[$mediatype], css_pluginstyles($mediatype));
         // load template styles
         if (isset($tplstyles[$mediatype])) {
-            $files = array_merge($files, $tplstyles[$mediatype]);
+            $files[$mediatype] = array_merge($files[$mediatype], $tplstyles[$mediatype]);
         }
         // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
         if (isset($config_cascade['userstyle']['default'])) {
@@ -86,7 +92,7 @@ function css_out(){
         }
         // load user styles
         if(isset($config_cascade['userstyle'][$mediatype])){
-            $files[$config_cascade['userstyle'][$mediatype]] = DOKU_BASE;
+            $files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE;
         }
         // load rtl styles
         // note: this adds the rtl styles only to the 'screen' media type
@@ -94,20 +100,20 @@ function css_out(){
         //     please use "[dir=rtl]" in any css file in all, screen or print mode instead
         if ($mediatype=='screen') {
             if($lang['direction'] == 'rtl'){
-                if (isset($tplstyles['rtl'])) $files = array_merge($files, $tplstyles['rtl']);
+                if (isset($tplstyles['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $tplstyles['rtl']);
             }
         }
 
-        $cache_files = array_merge(array_keys($files), getConfigFiles('main'));
-        $cache_files[] = $tplinc.'style.ini';
-        $cache_files[] = __FILE__;
+        $cache_files = array_merge($cache_files, array_keys($files[$mediatype]));
+    }
 
-        // check cache age & handle conditional request
-        // This may exit if a cache can be used
-        http_cached($cache->cache,
-                    $cache->useCache(array('files' => $cache_files)));
+    // check cache age & handle conditional request
+    // This may exit if a cache can be used
+    http_cached($cache->cache,
+                $cache->useCache(array('files' => $cache_files)));
 
-        // build the stylesheet
+    // build the stylesheet
+    foreach ($mediatypes as $mediatype) {
 
         // print the default classes for interwiki links and file downloads
         if ($mediatype == 'screen') {
@@ -117,7 +123,7 @@ function css_out(){
 
         // load files
         $css_content = '';
-        foreach($files as $file => $location){
+        foreach($files[$mediatype] as $file => $location){
             $css_content .= css_loadfile($file, $location);
         }
         switch ($mediatype) {
-- 
cgit v1.2.3


From dbf794bf86316c93b56454ab5d2c658598cce617 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 18 Sep 2012 22:46:47 +0200
Subject: Set default userstyle only once as screen userstyle

---
 lib/exe/css.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 0ad9dee06..cee806ef4 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -61,6 +61,11 @@ function css_out(){
         }
     }
 
+    // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
+    if (isset($config_cascade['userstyle']['default'])) {
+        $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
+    }
+
     // start output buffering
     ob_start();
 
@@ -86,10 +91,6 @@ function css_out(){
         if (isset($tplstyles[$mediatype])) {
             $files[$mediatype] = array_merge($files[$mediatype], $tplstyles[$mediatype]);
         }
-        // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
-        if (isset($config_cascade['userstyle']['default'])) {
-            $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
-        }
         // load user styles
         if(isset($config_cascade['userstyle'][$mediatype])){
             $files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE;
-- 
cgit v1.2.3


From c5c68de9adc23077defdd39f9264286a62fb2e0e Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 18 Sep 2012 22:47:22 +0200
Subject: Load rtl userstyle as it is still supported (did it ever work?)

---
 lib/exe/css.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index cee806ef4..fb639fc7e 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -102,6 +102,7 @@ function css_out(){
         if ($mediatype=='screen') {
             if($lang['direction'] == 'rtl'){
                 if (isset($tplstyles['rtl'])) $files[$mediatype] = array_merge($files[$mediatype], $tplstyles['rtl']);
+                if (isset($config_cascade['userstyle']['rtl'])) $files[$mediatype][$config_cascade['userstyle']['rtl']] = DOKU_BASE;
             }
         }
 
-- 
cgit v1.2.3


From 3899c2ecc4140de70c555215188bab73b4870e10 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Tue, 18 Sep 2012 22:53:59 +0200
Subject: Start output buffering in lib/exe/css.php only when the CSS is
 generated

This prevents buffering of the cache file output.
---
 lib/exe/css.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index fb639fc7e..8899ff193 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -66,9 +66,6 @@ function css_out(){
         $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
     }
 
-    // start output buffering
-    ob_start();
-
     // Array of needed files and their web locations, the latter ones
     // are needed to fix relative paths in the stylesheets
     $files = array();
@@ -114,6 +111,9 @@ function css_out(){
     http_cached($cache->cache,
                 $cache->useCache(array('files' => $cache_files)));
 
+    // start output buffering
+    ob_start();
+
     // build the stylesheet
     foreach ($mediatypes as $mediatype) {
 
-- 
cgit v1.2.3


From b9eadad04203ceb9b25fba98db5b56780b75b44e Mon Sep 17 00:00:00 2001
From: Edmondo Di Tucci <snarchio@gmail.com>
Date: Fri, 21 Sep 2012 12:48:08 +0200
Subject: Italian language update

---
 lib/plugins/acl/lang/it/lang.php         | 1 +
 lib/plugins/config/lang/it/lang.php      | 3 +++
 lib/plugins/plugin/lang/it/lang.php      | 1 +
 lib/plugins/popularity/lang/it/lang.php  | 1 +
 lib/plugins/revert/lang/it/lang.php      | 1 +
 lib/plugins/usermanager/lang/it/lang.php | 1 +
 6 files changed, 8 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/it/lang.php b/lib/plugins/acl/lang/it/lang.php
index a55a2c0f3..07e86697d 100644
--- a/lib/plugins/acl/lang/it/lang.php
+++ b/lib/plugins/acl/lang/it/lang.php
@@ -14,6 +14,7 @@
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  * @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
  */
 $lang['admin_acl']             = 'Gestione Lista Controllo Accessi (ACL)';
 $lang['acl_group']             = 'Gruppo';
diff --git a/lib/plugins/config/lang/it/lang.php b/lib/plugins/config/lang/it/lang.php
index 91c92bd85..751e5ee95 100644
--- a/lib/plugins/config/lang/it/lang.php
+++ b/lib/plugins/config/lang/it/lang.php
@@ -14,6 +14,7 @@
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  * @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
  */
 $lang['menu']                  = 'Configurazione Wiki';
 $lang['error']                 = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo.
@@ -49,6 +50,7 @@ $lang['title']                 = 'Titolo del wiki';
 $lang['start']                 = 'Nome della pagina iniziale';
 $lang['lang']                  = 'Lingua';
 $lang['template']              = 'Modello';
+$lang['tagline']               = 'Tagline (se il template lo supporta)';
 $lang['sidebar']               = 'Nome pagina in barra laterale (se il template lo supporta), il campo vuoto disabilita la barra laterale';
 $lang['license']               = 'Sotto quale licenza vorresti rilasciare il tuo contenuto?';
 $lang['savedir']               = 'Directory per il salvataggio dei dati';
@@ -140,6 +142,7 @@ $lang['autoplural']            = 'Controlla il plurale nei collegamenti';
 $lang['compression']           = 'Usa la compressione per i file dell\'archivio';
 $lang['gzip_output']           = 'Usa il Content-Encoding gzip per xhtml';
 $lang['compress']              = 'Comprimi i file CSS e javascript';
+$lang['cssdatauri']            = 'Dimensione massima in byte di un\'immagine che può essere integrata nel CSS per ridurre l\'overhead delle richieste HTTP. Questa tecnica non funziona con IE7 e precedenti! Da <code>400</code> a <code>600</code> bytes è un buon valore. Impostare a <code>0</code> per disabilitare.';
 $lang['send404']               = 'Invia "HTTP 404/Pagina non trovata" per le pagine inesistenti';
 $lang['broken_iua']            = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi il<a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> per maggiori informazioni.';
 $lang['xsendfile']             = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.';
diff --git a/lib/plugins/plugin/lang/it/lang.php b/lib/plugins/plugin/lang/it/lang.php
index 3994948a0..9ae55c5de 100644
--- a/lib/plugins/plugin/lang/it/lang.php
+++ b/lib/plugins/plugin/lang/it/lang.php
@@ -14,6 +14,7 @@
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  * @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
  */
 $lang['menu']                  = 'Gestione Plugin';
 $lang['download']              = 'Scarica e installa un nuovo plugin';
diff --git a/lib/plugins/popularity/lang/it/lang.php b/lib/plugins/popularity/lang/it/lang.php
index 9bf4ca8c6..a0cf274aa 100644
--- a/lib/plugins/popularity/lang/it/lang.php
+++ b/lib/plugins/popularity/lang/it/lang.php
@@ -10,6 +10,7 @@
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  * @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
  */
 $lang['name']                  = 'Raccolta dati sul wiki (può impiegare del tempo per caricarsi)';
 $lang['submit']                = 'Invia dati';
diff --git a/lib/plugins/revert/lang/it/lang.php b/lib/plugins/revert/lang/it/lang.php
index a0b676d77..9c092de99 100644
--- a/lib/plugins/revert/lang/it/lang.php
+++ b/lib/plugins/revert/lang/it/lang.php
@@ -11,6 +11,7 @@
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  * @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
  */
 $lang['menu']                  = 'Gestore di ripristini';
 $lang['filter']                = 'Cerca pagine con spam';
diff --git a/lib/plugins/usermanager/lang/it/lang.php b/lib/plugins/usermanager/lang/it/lang.php
index 1e948baab..0222ff1e4 100644
--- a/lib/plugins/usermanager/lang/it/lang.php
+++ b/lib/plugins/usermanager/lang/it/lang.php
@@ -13,6 +13,7 @@
  * @author Osman Tekin osman.tekin93@hotmail.it
  * @author Jacopo Corbetta <jacopo.corbetta@gmail.com>
  * @author Matteo Pasotti <matteo@xquiet.eu>
+ * @author snarchio@gmail.com
  */
 $lang['menu']                  = 'Gestione Utenti';
 $lang['noauth']                = '(autenticazione non disponibile)';
-- 
cgit v1.2.3


From a27f1c2b89bb6f7764902caae0918b81a3074181 Mon Sep 17 00:00:00 2001
From: lainme <lainme993@gmail.com>
Date: Fri, 21 Sep 2012 12:50:31 +0200
Subject: Simplified Chinese language update

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

(limited to 'lib')

diff --git a/lib/plugins/plugin/lang/zh/lang.php b/lib/plugins/plugin/lang/zh/lang.php
index 58f05fbd9..473d31ead 100644
--- a/lib/plugins/plugin/lang/zh/lang.php
+++ b/lib/plugins/plugin/lang/zh/lang.php
@@ -60,4 +60,4 @@ $lang['enabled']               = '%s 插件启用';
 $lang['notenabled']            = '%s插件启用失败，请检查文件权限。';
 $lang['disabled']              = '%s 插件禁用';
 $lang['notdisabled']           = '%s插件禁用失败，请检查文件权限。';
-$lang['packageinstalled']      = '插件  (%d plugin%s: %s) 已成功安装。';
+$lang['packageinstalled']      = '插件  (%d 插件: %s) 已成功安装。';
-- 
cgit v1.2.3


From 93877985689bddcc8d7315123025fada2d861586 Mon Sep 17 00:00:00 2001
From: Martin Michalek <michalek.dev@gmail.com>
Date: Fri, 21 Sep 2012 13:08:35 +0200
Subject: Slovak language update

---
 lib/plugins/config/lang/sk/lang.php | 105 +++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 48 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/sk/lang.php b/lib/plugins/config/lang/sk/lang.php
index cbd69eb9e..9e18b3ed9 100644
--- a/lib/plugins/config/lang/sk/lang.php
+++ b/lib/plugins/config/lang/sk/lang.php
@@ -27,6 +27,8 @@ $lang['_anti_spam']            = 'Nastavenia anti-spamu';
 $lang['_editing']              = 'Nastavenia úprav';
 $lang['_links']                = 'Nastavenia odkazov';
 $lang['_media']                = 'Nastavenia médií';
+$lang['_notifications']        = 'Nastavenie upozornení';
+$lang['_syndication']          = 'Nastavenie poskytovania obsahu';
 $lang['_advanced']             = 'Rozšírené nastavenia';
 $lang['_network']              = 'Nastavenia siete';
 $lang['_plugin_sufix']         = 'Nastavenia plug-inu';
@@ -34,26 +36,29 @@ $lang['_template_sufix']       = 'Nastavenia šablóny';
 $lang['_msg_setting_undefined'] = 'Nenastavené metadata.';
 $lang['_msg_setting_no_class'] = 'Nenastavená trieda.';
 $lang['_msg_setting_no_default'] = 'Žiadna predvolená hodnota.';
-$lang['fmode']                 = 'Spôsob vytvárania súborov';
-$lang['dmode']                 = 'Spôsob vytvárania adresárov';
+$lang['title']                 = 'Názov wiki';
+$lang['start']                 = 'Názov štartovacej stránky';
 $lang['lang']                  = 'Jazyk';
+$lang['template']              = 'Šablóna';
+$lang['tagline']               = 'Slogan (ak ho šablóna podporuje)';
+$lang['sidebar']               = 'Meno bočného panela (ak ho šablóna podporuje), prázdne pole deaktivuje bočný panel';
+$lang['license']               = 'Pod ktorou licenciou bude publikovaný obsah stránky?';
+$lang['savedir']               = 'Adresár pre ukladanie dát';
 $lang['basedir']               = 'Hlavný adresár (napr. <code>/dokuwiki/</code>). Prázdna hodnota znamená použitie autodetekcie.';
 $lang['baseurl']               = 'Adresa servera (napr. <code>http://www.yourserver.com</code>). Prázdna hodnota znamená použitie autodetekcie.';
-$lang['savedir']               = 'Adresár pre ukladanie dát';
 $lang['cookiedir']             = 'Cesta k cookies. Prázdna hodnota znamená použitie adresy servera.';
-$lang['start']                 = 'Názov štartovacej stránky';
-$lang['title']                 = 'Názov wiki';
-$lang['template']              = 'Šablóna';
-$lang['license']               = 'Pod ktorou licenciou bude publikovaný obsah stránky?';
-$lang['fullpath']              = 'Zobrazovať plnú cestu k stránkam v pätičke';
+$lang['dmode']                 = 'Spôsob vytvárania adresárov';
+$lang['fmode']                 = 'Spôsob vytvárania súborov';
+$lang['allowdebug']            = 'Povoliť ladenie chýb <b>deaktivujte, ak nie je potrebné!</b>';
 $lang['recent']                = 'Posledné zmeny';
+$lang['recent_days']           = 'Koľko posledných zmien uchovávať (dni)';
 $lang['breadcrumbs']           = 'Počet záznamov histórie';
 $lang['youarehere']            = 'Nachádzate sa';
+$lang['fullpath']              = 'Zobrazovať plnú cestu k stránkam v pätičke';
 $lang['typography']            = 'Vykonať typografické zmeny';
-$lang['htmlok']                = 'Umožniť vkladanie HTML';
-$lang['phpok']                 = 'Umožniť vkladanie PHP';
 $lang['dformat']               = 'Formát dátumu (pozri funkciu PHP <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Podpis';
+$lang['showuseras']            = 'Čo použiť pri zobrazení používateľa, ktorý posledný upravoval stránku';
 $lang['toptoclevel']           = 'Najvyššia úroveň pre generovanie obsahu.';
 $lang['tocminheads']           = 'Minimálny počet nadpisov pre generovanie obsahu';
 $lang['maxtoclevel']           = 'Maximálna úroveň pre generovanie obsahu.';
@@ -61,16 +66,8 @@ $lang['maxseclevel']           = 'Maximálna úroveň sekcie pre editáciu';
 $lang['camelcase']             = 'Použiť CamelCase pre odkazy';
 $lang['deaccent']              = 'Upraviť názvy stránok';
 $lang['useheading']            = 'Použiť nadpis pre názov stránky';
-$lang['refcheck']              = 'Kontrolovať odkazy na médiá (pred vymazaním)';
-$lang['refshow']               = 'Počet zobrazených odkazov na médiá';
-$lang['allowdebug']            = 'Povoliť ladenie chýb <b>deaktivujte, ak nie je potrebné!</b>';
-$lang['mediarevisions']        = 'Povoliť verzie súborov?';
-$lang['usewordblock']          = 'Blokovať spam na základe zoznamu známych slov';
-$lang['indexdelay']            = 'Časové oneskorenie pred indexovaním (sek)';
-$lang['relnofollow']           = 'Používať rel="nofollow" pre externé odkazy';
-$lang['mailguard']             = 'Zamaskovať e-mailovú adresu';
-$lang['iexssprotect']          = 'Kontrolovať nahraté súbory na prítomnosť nebezpečného JavaScript alebo HTML kódu';
-$lang['showuseras']            = 'Čo použiť pri zobrazení používateľa, ktorý posledný upravoval stránku';
+$lang['sneaky_index']          = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.';
+$lang['hidepages']             = 'Skryť zodpovedajúce stránky (regulárne výrazy)';
 $lang['useacl']                = 'Použiť kontrolu prístupu (ACL)';
 $lang['autopasswd']            = 'Autogenerovanie hesla';
 $lang['authtype']              = 'Systém autentifikácie (back-end)';
@@ -79,58 +76,70 @@ $lang['defaultgroup']          = 'Predvolená skupina';
 $lang['superuser']             = 'Správca - skupina, používateľ alebo čiarkou oddelený zoznam "pouzivatel1,@skupina1,pouzivatel2" s plným prístupom ku všetkým stránkam a funkciám nezávisle od ACL nastavení';
 $lang['manager']               = 'Manažér - skupina, používateľ alebo čiarkou oddelený zoznam "pouzivatel1,@skupina1,pouzivatel2" s prístupom k vybraným správcovským funkciám';
 $lang['profileconfirm']        = 'Potvrdzovať zmeny profilu heslom';
+$lang['rememberme']            = 'Povoliť trvalé prihlasovacie cookies (zapamätaj si ma)';
 $lang['disableactions']        = 'Zakázať DokuWiki akcie';
 $lang['disableactions_check']  = 'Skontrolovať';
 $lang['disableactions_subscription'] = 'Povoliť/Zrušiť informovanie o zmenách stránky';
 $lang['disableactions_wikicode'] = 'Pozrieť zdroj/Exportovať zdroj';
 $lang['disableactions_other']  = 'Iné akcie (oddelené čiarkou)';
-$lang['sneaky_index']          = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.';
 $lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)';
 $lang['securecookie']          = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.';
+$lang['remote']                = 'Povolenie vzdialeného API. Umožnuje iným aplikáciám pristupovať k wiki cez XML-RPC alebo iným spôsobom.';
+$lang['remoteuser']            = 'Obmedzenie použitia vzdialeného API skupinám alebo používateľom oddelených čiarkami. Prázdne pole poskytuje prístup pre každého používateľa.';
+$lang['usewordblock']          = 'Blokovať spam na základe zoznamu známych slov';
+$lang['relnofollow']           = 'Používať rel="nofollow" pre externé odkazy';
+$lang['indexdelay']            = 'Časové oneskorenie pred indexovaním (sek)';
+$lang['mailguard']             = 'Zamaskovať e-mailovú adresu';
+$lang['iexssprotect']          = 'Kontrolovať nahraté súbory na prítomnosť nebezpečného JavaScript alebo HTML kódu';
+$lang['usedraft']              = 'Automaticky ukladať koncept počas úpravy stránky';
+$lang['htmlok']                = 'Umožniť vkladanie HTML';
+$lang['phpok']                 = 'Umožniť vkladanie PHP';
+$lang['locktime']              = 'Maximálne trvanie blokovacích súborov (sek)';
+$lang['cachetime']             = 'Maximálne trvanie cache (sek)';
+$lang['target____wiki']        = 'Cieľové okno (target) pre interné odkazy';
+$lang['target____interwiki']   = 'Cieľové okno (target) pre interwiki odkazy';
+$lang['target____extern']      = 'Cieľové okno (target) pre externé odkazy';
+$lang['target____media']       = 'Cieľové okno (target) pre media odkazy';
+$lang['target____windows']     = 'Cieľové okno (target) pre windows odkazy';
+$lang['mediarevisions']        = 'Povoliť verzie súborov?';
+$lang['refcheck']              = 'Kontrolovať odkazy na médiá (pred vymazaním)';
+$lang['refshow']               = 'Počet zobrazených odkazov na médiá';
+$lang['gdlib']                 = 'Verzia GD Lib';
+$lang['im_convert']            = 'Cesta k ImageMagick convert tool';
+$lang['jpg_quality']           = 'Kvalita JPG kompresie (0-100)';
+$lang['fetchsize']             = 'Maximálna veľkosť (v bajtoch) pri sťahovaní z externých zdrojov';
+$lang['subscribers']           = 'Povoliť podporu informovania o zmenách stránky';
+$lang['subscribe_time']        = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.';
+$lang['notify']                = 'Posielať upozornenia na zmeny na túto e-mailovú adresu';
+$lang['registernotify']        = 'Posielať informáciu o nových užívateľoch na túto e-mailovú adresu';
+$lang['mailfrom']              = 'E-mailová adresa na automatické e-maily';
+$lang['mailprefix']            = 'Prefix predmetu emailovej spravy zasielanej automaticky';
+$lang['htmlmail']              = 'Posielanie lepšie vyzerajúceho ale objemnejšieho HTML mailu. Deaktivovaním sa budú posielať iba textové maily.';
+$lang['sitemap']               = 'Generovať Google sitemap (dni)';
+$lang['rss_type']              = 'Typ XML feedu';
+$lang['rss_linkto']            = 'XML zdroj odkazuje na';
+$lang['rss_content']           = 'Čo zobrazovať v XML feede?';
+$lang['rss_update']            = 'Časový interval obnovy XML feedu (sek.)';
+$lang['rss_show_summary']      = 'XML zdroj ukáže prehľad v názve';
+$lang['rss_media']             = 'Aký typ zmien by mal byť zobrazený v XML feede?';
 $lang['updatecheck']           = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k update.dokuwiki.org.';
 $lang['userewrite']            = 'Používať nice URLs';
 $lang['useslash']              = 'Používať lomku (/) ako oddeľovač v URL';
-$lang['usedraft']              = 'Automaticky ukladať koncept počas úpravy stránky';
 $lang['sepchar']               = 'Oddeľovač slov v názvoch stránok';
 $lang['canonical']             = 'Používať plne kanonické URL názvy';
 $lang['fnencode']              = 'Spôsob kódovania non-ASCII mien súborov.';
 $lang['autoplural']            = 'Kontrolovať množné číslo v odkazoch';
 $lang['compression']           = 'Metóda kompresie pre staré verzie stránok';
-$lang['cachetime']             = 'Maximálne trvanie cache (sek)';
-$lang['locktime']              = 'Maximálne trvanie blokovacích súborov (sek)';
-$lang['fetchsize']             = 'Maximálna veľkosť (v bajtoch) pri sťahovaní z externých zdrojov';
-$lang['notify']                = 'Posielať upozornenia na zmeny na túto e-mailovú adresu';
-$lang['registernotify']        = 'Posielať informáciu o nových užívateľoch na túto e-mailovú adresu';
-$lang['mailfrom']              = 'E-mailová adresa na automatické e-maily';
-$lang['mailprefix']            = 'Prefix predmetu emailovej spravy zasielanej automaticky';
 $lang['gzip_output']           = 'Používať gzip Content-Encoding pre xhtml';
-$lang['gdlib']                 = 'Verzia GD Lib';
-$lang['im_convert']            = 'Cesta k ImageMagick convert tool';
-$lang['jpg_quality']           = 'Kvalita JPG kompresie (0-100)';
-$lang['subscribers']           = 'Povoliť podporu informovania o zmenách stránky';
-$lang['subscribe_time']        = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.';
 $lang['compress']              = 'Komprimovať CSS a javascript výstup';
 $lang['cssdatauri']            = 'Veľkosť v bytoch, do ktorej by mali byť obrázky s odkazom v CSS vložené priamo do štýlu z dôvodu obmedzenia HTTP požiadaviek. Tento postup nefunguje v IE verzie 7 a nižšie! Vhodná hodnota je od <code>400</code> do <code>600</code> bytov. Hodnota <code>0</code> deaktivuje túto metódu.';
-$lang['hidepages']             = 'Skryť zodpovedajúce stránky (regulárne výrazy)';
 $lang['send404']               = 'Poslať "HTTP 404/Page Not Found" pre neexistujúce stránky';
-$lang['sitemap']               = 'Generovať Google sitemap (dni)';
 $lang['broken_iua']            = 'Je vo Vašom systéme funkcia ignore_user_abort poškodená? Môže to mať za následok nefunkčnosť vyhľadávania v indexe. IIS+PHP/CGI je známy tým, že nefunguje správne. Pozrite <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> pre dalšie informácie.';
 $lang['xsendfile']             = 'Používať X-Sendfile hlavičku pre doručenie statických súborov webserverom? Webserver musí túto funkcionalitu podporovať.';
 $lang['renderer_xhtml']        = 'Používané vykresľovacie jadro pre hlavný (xhtml) wiki výstup';
 $lang['renderer__core']        = '%s (dokuwiki jadro)';
 $lang['renderer__plugin']      = '%s (plugin)';
-$lang['rememberme']            = 'Povoliť trvalé prihlasovacie cookies (zapamätaj si ma)';
-$lang['rss_type']              = 'Typ XML feedu';
-$lang['rss_linkto']            = 'XML zdroj odkazuje na';
-$lang['rss_content']           = 'Čo zobrazovať v XML feede?';
-$lang['rss_update']            = 'Časový interval obnovy XML feedu (sek.)';
-$lang['recent_days']           = 'Koľko posledných zmien uchovávať (dni)';
-$lang['rss_show_summary']      = 'XML zdroj ukáže prehľad v názve';
-$lang['target____wiki']        = 'Cieľové okno (target) pre interné odkazy';
-$lang['target____interwiki']   = 'Cieľové okno (target) pre interwiki odkazy';
-$lang['target____extern']      = 'Cieľové okno (target) pre externé odkazy';
-$lang['target____media']       = 'Cieľové okno (target) pre media odkazy';
-$lang['target____windows']     = 'Cieľové okno (target) pre windows odkazy';
+$lang['dnslookups']            = 'DokuWiki hľadá mená vzdialených IP adries používateľov editujúcich stránky. Ak máte pomalý alebo nefunkčný DNS server alebo nechcete túto možnosť, deaktivujte túto voľbu';
 $lang['proxy____host']         = 'Proxy server - názov';
 $lang['proxy____port']         = 'Proxy server - port';
 $lang['proxy____user']         = 'Proxy server - užívateľské meno';
-- 
cgit v1.2.3


From 89fd993fad76fc527d1f0e1546043908b728547e Mon Sep 17 00:00:00 2001
From: Robert Bogenschneider <robog@gmx.de>
Date: Fri, 21 Sep 2012 13:09:38 +0200
Subject: Esperanto language update

---
 lib/plugins/config/lang/eo/lang.php | 107 +++++++++++++++++++-----------------
 lib/plugins/plugin/lang/eo/lang.php |   1 +
 2 files changed, 57 insertions(+), 51 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/eo/lang.php b/lib/plugins/config/lang/eo/lang.php
index de3c95bb5..36f865c28 100644
--- a/lib/plugins/config/lang/eo/lang.php
+++ b/lib/plugins/config/lang/eo/lang.php
@@ -32,6 +32,8 @@ $lang['_anti_spam']            = 'Kontraŭ-spamaj difinoj';
 $lang['_editing']              = 'Difinoj por redakto';
 $lang['_links']                = 'Difinoj por ligiloj';
 $lang['_media']                = 'Difinoj por aŭdvidaĵoj';
+$lang['_notifications']        = 'Sciigaj agordoj';
+$lang['_syndication']          = 'Kunhavigaj agordoj';
 $lang['_advanced']             = 'Fakaj difinoj';
 $lang['_network']              = 'Difinoj por reto';
 $lang['_plugin_sufix']         = 'Difinoj por kromaĵoj';
@@ -39,28 +41,29 @@ $lang['_template_sufix']       = 'Difinoj por ŝablonoj';
 $lang['_msg_setting_undefined'] = 'Neniu difinanta metadatumaro.';
 $lang['_msg_setting_no_class'] = 'Neniu difinanta klaso.';
 $lang['_msg_setting_no_default'] = 'Neniu apriora valoro.';
-$lang['fmode']                 = 'Reĝimo de dosiero-kreado';
-$lang['dmode']                 = 'Reĝimo de dosierujo-kreado';
-$lang['lang']                  = 'Lingvo';
-$lang['basedir']               = 'Baza dosierujo';
-$lang['baseurl']               = 'Baza URL';
-$lang['savedir']               = 'Dosierujo por konservi datumaron';
-$lang['cookiedir']             = 'Kuketopado. Lasu malplena por uzi baseurl.';
-$lang['start']                 = 'Nomo de la hejmpaĝo';
 $lang['title']                 = 'Titolo de la vikio';
+$lang['start']                 = 'Nomo de la hejmpaĝo';
+$lang['lang']                  = 'Lingvo';
 $lang['template']              = 'Ŝablono';
 $lang['tagline']               = 'Moto (se la ŝablono antaûvidas tion)';
 $lang['sidebar']               = 'Nomo de la flanka paĝo  (se la ŝablono antaûvidas tion), malplena kampo malebligas la flankan paĝon';
 $lang['license']               = 'Laŭ kiu permesilo via enhavo devus esti publikigita?';
-$lang['fullpath']              = 'Montri la kompletan padon de la paĝoj en la piedlinio';
+$lang['savedir']               = 'Dosierujo por konservi datumaron';
+$lang['basedir']               = 'Baza dosierujo';
+$lang['baseurl']               = 'Baza URL';
+$lang['cookiedir']             = 'Kuketopado. Lasu malplena por uzi baseurl.';
+$lang['dmode']                 = 'Reĝimo de dosierujo-kreado';
+$lang['fmode']                 = 'Reĝimo de dosiero-kreado';
+$lang['allowdebug']            = 'Ebligi kodumpurigadon <b>malebligu se ne necese!<;/b>';
 $lang['recent']                = 'Freŝaj ŝanĝoj';
+$lang['recent_days']           = 'Kiom da freŝaj ŝanĝoj por teni (tagoj)';
 $lang['breadcrumbs']           = 'Nombro da paderoj';
 $lang['youarehere']            = 'Hierarkiaj paderoj';
+$lang['fullpath']              = 'Montri la kompletan padon de la paĝoj en la piedlinio';
 $lang['typography']            = 'Fari tipografiajn anstataŭigojn';
-$lang['htmlok']                = 'Ebligi enmeton de HTML-aĵoj';
-$lang['phpok']                 = 'Ebligi enmeton de PHP-aĵoj';
 $lang['dformat']               = 'Formato de datoj (vidu la PHP-an funkcion <a href="http://www.php.net/strftime">strftime</a>)';
 $lang['signature']             = 'Subskribo';
+$lang['showuseras']            = 'Kiel indiki la lastan redaktinton';
 $lang['toptoclevel']           = 'Supera nivelo por la enhavtabelo';
 $lang['tocminheads']           = 'Minimuma kvanto da ĉeftitoloj, kiu difinas ĉu la TOC estas kreata.';
 $lang['maxtoclevel']           = 'Maksimuma nivelo por la enhavtabelo';
@@ -68,16 +71,8 @@ $lang['maxseclevel']           = 'Maksimuma nivelo por redakti sekciojn';
 $lang['camelcase']             = 'Uzi KamelUsklecon por ligiloj';
 $lang['deaccent']              = 'Netaj paĝnomoj';
 $lang['useheading']            = 'Uzi unuan titolon por paĝnomoj';
-$lang['refcheck']              = 'Kontrolo por referencoj al aŭdvidaĵoj';
-$lang['refshow']               = 'Nombro da referencoj al aŭdvidaĵoj por montri';
-$lang['allowdebug']            = 'Ebligi kodumpurigadon <b>malebligu se ne necese!<;/b>';
-$lang['mediarevisions']        = 'Ĉu ebligi reviziadon de aŭdvidaĵoj?';
-$lang['usewordblock']          = 'Bloki spamon surbaze de vortlisto';
-$lang['indexdelay']            = 'Prokrasto antaŭ ol indeksi (en sekundoj)';
-$lang['relnofollow']           = 'Uzi rel="nofollow" kun eksteraj ligiloj';
-$lang['mailguard']             = 'Nebuligi retadresojn';
-$lang['iexssprotect']          = 'Ekzameni elŝutaĵojn kontraŭ eblaj malicaj ĴavaSkripto aŭ HTML-a kodumaĵo';
-$lang['showuseras']            = 'Kiel indiki la lastan redaktinton';
+$lang['sneaky_index']          = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Tiel la indekso estus neuzebla por kelkaj agordoj de ACL.';
+$lang['hidepages']             = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)';
 $lang['useacl']                = 'Uzi alirkontrolajn listojn';
 $lang['autopasswd']            = 'Aŭtomate krei pasvortojn';
 $lang['authtype']              = 'Tipo de identiĝo';
@@ -86,61 +81,71 @@ $lang['defaultgroup']          = 'Antaŭdifinita grupo';
 $lang['superuser']             = 'Superanto - grupo, uzanto aŭ listo (disigita per komoj), kiu plene alireblas al ĉiuj paĝoj kaj funkcioj, sendepende de la reguloj ACL';
 $lang['manager']               = 'Administranto - grupo, uzanto aŭ listo (apartite per komoj), kiu havas alirpermeson al kelkaj administraj funkcioj';
 $lang['profileconfirm']        = 'Konfirmi ŝanĝojn en la trajtaro per pasvorto';
+$lang['rememberme']            = 'Permesi longdaŭran ensalutajn kuketojn (rememoru min)';
 $lang['disableactions']        = 'Malebligi DokuWiki-ajn agojn';
 $lang['disableactions_check']  = 'Kontroli';
 $lang['disableactions_subscription'] = 'Aliĝi/Malaliĝi';
 $lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti fontotekston';
 $lang['disableactions_other']  = 'Aliaj agoj (disigita per komoj)';
-$lang['sneaky_index']          = 'Apriore, DokuWiki montras ĉiujn nomspacojn en la indeksa modo. Ebligi tiun ĉi elekteblon kaŝus tion, kion la uzanto ne rajtas legi laŭ ACL. Tio povus rezulti ankaŭan kaŝon de alireblaj subnomspacoj. Tiel la indekso estus neuzebla por kelkaj agordoj de ACL.';
 $lang['auth_security_timeout'] = 'Sekureca tempolimo por aŭtentigo (sekundoj)';
 $lang['securecookie']          = 'Ĉu kuketoj difinitaj per HTTPS sendiĝu de la foliumilo nur per HTTPS? Malebligu tiun ĉi opcion kiam nur la ensaluto al via vikio estas sekurigita per SSL, sed foliumado de la vikio estas farita malsekure.';
-$lang['xmlrpc']                = 'Ebligi/malebligi la interfacon XML-RPC.';
-$lang['xmlrpcuser']            = 'Permesi XML-RPC-an aliron al certaj grupoj aŭ uzantoj, bonvolu meti iliajn komodisigitajn nomojn tien ĉi. Lasu ĝin malplena, se ĉiu povu aliri.';
+$lang['remote']                = 'Ebligu la traretan API-sistemon. Tio ebligas al aliaj aplikaĵoj aliri la vikion pere de XML-RPC aũ aliaj mekanismoj.';
+$lang['remoteuser']            = 'Limigi traretan API-aliron al la komodisigitaj grupoj aũ uzantoj indikitaj jene. Lasu malplena por ebligi aliron al ĉiu ajn.';
+$lang['usewordblock']          = 'Bloki spamon surbaze de vortlisto';
+$lang['relnofollow']           = 'Uzi rel="nofollow" kun eksteraj ligiloj';
+$lang['indexdelay']            = 'Prokrasto antaŭ ol indeksi (en sekundoj)';
+$lang['mailguard']             = 'Nebuligi retadresojn';
+$lang['iexssprotect']          = 'Ekzameni elŝutaĵojn kontraŭ eblaj malicaj ĴavaSkripto aŭ HTML-a kodumaĵo';
+$lang['usedraft']              = 'Aŭtomate konservi skizon dum redaktado';
+$lang['htmlok']                = 'Ebligi enmeton de HTML-aĵoj';
+$lang['phpok']                 = 'Ebligi enmeton de PHP-aĵoj';
+$lang['locktime']              = 'Maksimuma aĝo por serurdosieroj (sek.)';
+$lang['cachetime']             = 'Maksimuma aĝo por provizmemoro (sek.)';
+$lang['target____wiki']        = 'Parametro "target" (celo) por internaj ligiloj';
+$lang['target____interwiki']   = 'Parametro "target" (celo) por intervikiaj ligiloj';
+$lang['target____extern']      = 'Parametro "target" (celo) por eksteraj ligiloj';
+$lang['target____media']       = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj';
+$lang['target____windows']     = 'Parametro "target" (celo) por Vindozaj ligiloj';
+$lang['mediarevisions']        = 'Ĉu ebligi reviziadon de aŭdvidaĵoj?';
+$lang['refcheck']              = 'Kontrolo por referencoj al aŭdvidaĵoj';
+$lang['refshow']               = 'Nombro da referencoj al aŭdvidaĵoj por montri';
+$lang['gdlib']                 = 'Versio de GD-Lib';
+$lang['im_convert']            = 'Pado al la konvertilo de ImageMagick';
+$lang['jpg_quality']           = 'Kompaktiga kvalito de JPG (0-100)';
+$lang['fetchsize']             = 'Maksimuma grandeco (bitokoj), kiun fetch.php rajtas elŝuti el ekstere';
+$lang['subscribers']           = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj';
+$lang['subscribe_time']        = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.';
+$lang['notify']                = 'Sendi avizojn pri ŝanĝoj al tiu ĉi retadreso';
+$lang['registernotify']        = 'Sendi informon pri ĵusaj aliĝintoj al tiu ĉi retadreso';
+$lang['mailfrom']              = 'Retadreso uzota por aŭtomataj retmesaĝoj ';
+$lang['mailprefix']            = 'Retpoŝta temo-prefikso por uzi en aŭtomataj mesaĝoj';
+$lang['htmlmail']              = 'Sendi pli bele aspektajn, sed pli grandajn plurpartajn HTML-retpoŝtaĵojn. Malebligu por ricevi pure tekstajn mesaĝojn.';
+$lang['sitemap']               = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)';
+$lang['rss_type']              = 'XML-a tipo de novaĵ-fluo';
+$lang['rss_linkto']            = 'La novaĵ-fluo de XML ligiĝas al';
+$lang['rss_content']           = 'Kion montri en la XML-aj novaĵ-flueroj?';
+$lang['rss_update']            = 'Intertempo por ĝisdatigi XML-an novaĵ-fluon (sek.)';
+$lang['rss_show_summary']      = 'XML-a novaĵ-fluo montras resumon en la titolo';
+$lang['rss_media']             = 'Kiaj ŝangoj estu montrataj en la XML-fluo?';
 $lang['updatecheck']           = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti update.dokuwiki.org por tiu ĉi trajto.';
 $lang['userewrite']            = 'Uzi netajn URL-ojn';
 $lang['useslash']              = 'Uzi frakcistrekon kiel disigsignaĵon por nomspacoj en URL-oj';
-$lang['usedraft']              = 'Aŭtomate konservi skizon dum redaktado';
 $lang['sepchar']               = 'Disigsignaĵo de vortoj en paĝnomoj';
 $lang['canonical']             = 'Uzi tute evidentajn URL-ojn';
 $lang['fnencode']              = 'Kodiga metodo por ne-ASCII-aj dosiernomoj.';
 $lang['autoplural']            = 'Kontroli pluralajn formojn en ligiloj';
 $lang['compression']           = 'Kompaktigmetodo por arkivaj dosieroj';
-$lang['cachetime']             = 'Maksimuma aĝo por provizmemoro (sek.)';
-$lang['locktime']              = 'Maksimuma aĝo por serurdosieroj (sek.)';
-$lang['fetchsize']             = 'Maksimuma grandeco (bitokoj), kiun fetch.php rajtas elŝuti el ekstere';
-$lang['notify']                = 'Sendi avizojn pri ŝanĝoj al tiu ĉi retadreso';
-$lang['registernotify']        = 'Sendi informon pri ĵusaj aliĝintoj al tiu ĉi retadreso';
-$lang['mailfrom']              = 'Retadreso uzota por aŭtomataj retmesaĝoj ';
-$lang['mailprefix']            = 'Retpoŝta temo-prefikso por uzi en aŭtomataj mesaĝoj';
 $lang['gzip_output']           = 'Uzi gzip-an enhav-enkodigon por XHTML';
-$lang['gdlib']                 = 'Versio de GD-Lib';
-$lang['im_convert']            = 'Pado al la konvertilo de ImageMagick';
-$lang['jpg_quality']           = 'Kompaktiga kvalito de JPG (0-100)';
-$lang['subscribers']           = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj';
-$lang['subscribe_time']        = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.';
 $lang['compress']              = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn';
 $lang['cssdatauri']            = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj enmetiĝu rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aŭ pli frua!
 <code>400</code> ĝis <code>600</code> bitokoj estas bona grandeco. Indiku <code>0</code> por malebligi enmeton.';
-$lang['hidepages']             = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)';
 $lang['send404']               = 'Sendi la mesaĝon "HTTP 404/Paĝo ne trovita" por ne ekzistantaj paĝoj';
-$lang['sitemap']               = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)';
 $lang['broken_iua']            = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu <a href="http://bugs.splitbrain.org/?do=details&task_id=852&">Cimon 852</a> por pli da informoj.';
 $lang['xsendfile']             = 'Ĉu uzi la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo subtenu tion.';
 $lang['renderer_xhtml']        = 'Prezentilo por la ĉefa vikia rezulto (xhtml)';
 $lang['renderer__core']        = '%s (DokuWiki-a kerno)';
 $lang['renderer__plugin']      = '%s (kromaĵo)';
-$lang['rememberme']            = 'Permesi longdaŭran ensalutajn kuketojn (rememoru min)';
-$lang['rss_type']              = 'XML-a tipo de novaĵ-fluo';
-$lang['rss_linkto']            = 'La novaĵ-fluo de XML ligiĝas al';
-$lang['rss_content']           = 'Kion montri en la XML-aj novaĵ-flueroj?';
-$lang['rss_update']            = 'Intertempo por ĝisdatigi XML-an novaĵ-fluon (sek.)';
-$lang['recent_days']           = 'Kiom da freŝaj ŝanĝoj por teni (tagoj)';
-$lang['rss_show_summary']      = 'XML-a novaĵ-fluo montras resumon en la titolo';
-$lang['target____wiki']        = 'Parametro "target" (celo) por internaj ligiloj';
-$lang['target____interwiki']   = 'Parametro "target" (celo) por intervikiaj ligiloj';
-$lang['target____extern']      = 'Parametro "target" (celo) por eksteraj ligiloj';
-$lang['target____media']       = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj';
-$lang['target____windows']     = 'Parametro "target" (celo) por Vindozaj ligiloj';
+$lang['dnslookups']            = 'DokuWiki rigardos servilajn nomojn por paĝmodifoj tra fremdaj IP-adresoj. Se vi havas malrapidan aũ nefunkciantan DNS-servilon aũ malŝatas tiun trajton, malebligu tiun opcion';
 $lang['proxy____host']         = 'Retservilnomo de la "Proxy"';
 $lang['proxy____port']         = 'Pordo ĉe la "Proxy"';
 $lang['proxy____user']         = 'Uzantonomo ĉe la "Proxy"';
diff --git a/lib/plugins/plugin/lang/eo/lang.php b/lib/plugins/plugin/lang/eo/lang.php
index 36e7eadff..67553454c 100644
--- a/lib/plugins/plugin/lang/eo/lang.php
+++ b/lib/plugins/plugin/lang/eo/lang.php
@@ -10,6 +10,7 @@
  * @author Erik Pedersen <erik.pedersen@shaw.ca>
  * @author Robert BOGENSCHNEIDER <robog@gmx.de>
  * @author Robert Bogenschneider <bogi@uea.org>
+ * @author Robert Bogenschneider <robog@gmx.de>
  */
 $lang['menu']                  = 'Administri Kromaĵojn';
 $lang['download']              = 'Elŝuti kaj instali novan kromaĵon';
-- 
cgit v1.2.3


From 07834a7c661d05ab5c707e1c428421c87af565bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 25 Sep 2012 19:47:10 +0100
Subject: de-couple mobile JS from widths to actual media query equivalent
 (fixes FS#2623)

---
 lib/tpl/dokuwiki/css/mobile.css | 14 ++++++++++++++
 lib/tpl/dokuwiki/main.php       |  1 +
 lib/tpl/dokuwiki/script.js      | 25 +++++++++++++++----------
 3 files changed, 30 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 6e07f23ec..cc61ab06c 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -5,10 +5,20 @@
  * @author Anika Henke <anika@selfthinker.org>
  */
 
+/* for detecting media queries in JavaScript (see script.js): */
+#screen__mode {
+    position: relative;
+    z-index: 0;
+}
+
 /* up to 979px screen widths
 ********************************************************************/
 @media only screen and (max-width: 979px) {
 
+#screen__mode {
+    z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
+}
+
 /* structure */
 #dokuwiki__aside {
     width: 100%;
@@ -107,6 +117,10 @@
 ********************************************************************/
 @media only screen and (max-width: 480px) {
 
+#screen__mode {
+    z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
+}
+
 body {
     font-size: 100%;
 }
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 2406a206b..6b1e95d62 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
+    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js
index d858bda89..3ed8dbabe 100644
--- a/lib/tpl/dokuwiki/script.js
+++ b/lib/tpl/dokuwiki/script.js
@@ -12,18 +12,23 @@ var device_classes = 'desktop mobile tablet phone';
 
 function tpl_dokuwiki_mobile(){
 
+    // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here
+    var screen_mode = jQuery('#screen__mode').css('z-index');
+
     // determine our device pattern
     // TODO: consider moving into dokuwiki core
-    var w = document.body.clientWidth;
-    if (w > 979) {
-        if (device_class == 'desktop') return;
-        device_class = 'desktop';
-    } else if (w > 480) {
-        if (device_class.match(/tablet/)) return;
-        device_class = 'mobile tablet';
-    } else {
-        if (device_class.match(/phone/)) return;
-        device_class = 'mobile phone';
+    switch (screen_mode) {
+        case '1':
+            if (device_class.match(/tablet/)) return;
+            device_class = 'mobile tablet';
+            break;
+        case '2':
+            if (device_class.match(/phone/)) return;
+            device_class = 'mobile phone';
+            break;
+        default:
+            if (device_class == 'desktop') return;
+            device_class = 'desktop';
     }
 
     jQuery('html').removeClass(device_classes).addClass(device_class);
-- 
cgit v1.2.3


From 20391a36885910a616110df30f3ce30f8d23639d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Tue, 25 Sep 2012 20:25:54 +0100
Subject: removed html dependency from media query detection JS in new template

---
 lib/tpl/dokuwiki/css/mobile.css | 15 +++++----------
 lib/tpl/dokuwiki/main.php       |  1 -
 lib/tpl/dokuwiki/script.js      |  6 +++---
 3 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index cc61ab06c..ea32fb11d 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -5,18 +5,16 @@
  * @author Anika Henke <anika@selfthinker.org>
  */
 
-/* for detecting media queries in JavaScript (see script.js): */
-#screen__mode {
-    position: relative;
-    z-index: 0;
+body {
+    min-height: 0; /* for detecting media queries in JavaScript (see script.js): */
 }
 
 /* up to 979px screen widths
 ********************************************************************/
 @media only screen and (max-width: 979px) {
 
-#screen__mode {
-    z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
+body {
+    min-height: 1px; /* for detecting media queries in JavaScript (see script.js) */
 }
 
 /* structure */
@@ -117,12 +115,9 @@
 ********************************************************************/
 @media only screen and (max-width: 480px) {
 
-#screen__mode {
-    z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
-}
-
 body {
     font-size: 100%;
+    min-height: 2px; /* for detecting media queries in JavaScript (see script.js) */
 }
 
 /*____________ structure ____________*/
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 6b1e95d62..2406a206b 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,7 +91,6 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
-    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js
index 3ed8dbabe..ec6e5285e 100644
--- a/lib/tpl/dokuwiki/script.js
+++ b/lib/tpl/dokuwiki/script.js
@@ -13,16 +13,16 @@ var device_classes = 'desktop mobile tablet phone';
 function tpl_dokuwiki_mobile(){
 
     // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here
-    var screen_mode = jQuery('#screen__mode').css('z-index');
+    var screen_mode = jQuery('body').css('min-height');
 
     // determine our device pattern
     // TODO: consider moving into dokuwiki core
     switch (screen_mode) {
-        case '1':
+        case '1px':
             if (device_class.match(/tablet/)) return;
             device_class = 'mobile tablet';
             break;
-        case '2':
+        case '2px':
             if (device_class.match(/phone/)) return;
             device_class = 'mobile phone';
             break;
-- 
cgit v1.2.3


From 86ca15261461b6c74f66407e7ac6992baa097d0d Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 26 Sep 2012 09:22:02 +0100
Subject: Revert "removed html dependency from media query detection JS in new
 template"

... because it made the solution less transparent, more error prone and even more like a hack than it already was

This reverts commit 20391a36885910a616110df30f3ce30f8d23639d.
---
 lib/tpl/dokuwiki/css/mobile.css | 15 ++++++++++-----
 lib/tpl/dokuwiki/main.php       |  1 +
 lib/tpl/dokuwiki/script.js      |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index ea32fb11d..cc61ab06c 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -5,16 +5,18 @@
  * @author Anika Henke <anika@selfthinker.org>
  */
 
-body {
-    min-height: 0; /* for detecting media queries in JavaScript (see script.js): */
+/* for detecting media queries in JavaScript (see script.js): */
+#screen__mode {
+    position: relative;
+    z-index: 0;
 }
 
 /* up to 979px screen widths
 ********************************************************************/
 @media only screen and (max-width: 979px) {
 
-body {
-    min-height: 1px; /* for detecting media queries in JavaScript (see script.js) */
+#screen__mode {
+    z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
 }
 
 /* structure */
@@ -115,9 +117,12 @@ body {
 ********************************************************************/
 @media only screen and (max-width: 480px) {
 
+#screen__mode {
+    z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
+}
+
 body {
     font-size: 100%;
-    min-height: 2px; /* for detecting media queries in JavaScript (see script.js) */
 }
 
 /*____________ structure ____________*/
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 2406a206b..6b1e95d62 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,6 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
+    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js
index ec6e5285e..3ed8dbabe 100644
--- a/lib/tpl/dokuwiki/script.js
+++ b/lib/tpl/dokuwiki/script.js
@@ -13,16 +13,16 @@ var device_classes = 'desktop mobile tablet phone';
 function tpl_dokuwiki_mobile(){
 
     // the z-index in mobile.css is (mis-)used purely for detecting the screen mode here
-    var screen_mode = jQuery('body').css('min-height');
+    var screen_mode = jQuery('#screen__mode').css('z-index');
 
     // determine our device pattern
     // TODO: consider moving into dokuwiki core
     switch (screen_mode) {
-        case '1px':
+        case '1':
             if (device_class.match(/tablet/)) return;
             device_class = 'mobile tablet';
             break;
-        case '2px':
+        case '2':
             if (device_class.match(/phone/)) return;
             device_class = 'mobile phone';
             break;
-- 
cgit v1.2.3


From 89a539f258c3cc00e6ed028bf3e0534f072b35bd Mon Sep 17 00:00:00 2001
From: Nick Reilingh <nick@magnumopusgames.com>
Date: Sun, 30 Sep 2012 18:23:45 -0400
Subject: Changed XHTML validator icon to HTML5 (FS#2619)

---
 lib/tpl/dokuwiki/images/button-html5.png | Bin 0 -> 354 bytes
 lib/tpl/dokuwiki/images/button-xhtml.png | Bin 321 -> 0 bytes
 lib/tpl/dokuwiki/tpl_footer.php          |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 lib/tpl/dokuwiki/images/button-html5.png
 delete mode 100644 lib/tpl/dokuwiki/images/button-xhtml.png

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/images/button-html5.png b/lib/tpl/dokuwiki/images/button-html5.png
new file mode 100644
index 000000000..5885a331b
Binary files /dev/null and b/lib/tpl/dokuwiki/images/button-html5.png differ
diff --git a/lib/tpl/dokuwiki/images/button-xhtml.png b/lib/tpl/dokuwiki/images/button-xhtml.png
deleted file mode 100644
index ec686442c..000000000
Binary files a/lib/tpl/dokuwiki/images/button-xhtml.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index 3a2e3d121..b7dc9c631 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -20,8 +20,8 @@ if (!defined('DOKU_INC')) die();
             src="<?php echo tpl_basedir(); ?>images/button-donate.gif" width="80" height="15" alt="Donate" /></a>
         <a href="http://www.php.net" title="Powered by PHP" <?php echo $target?>><img
             src="<?php echo tpl_basedir(); ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
-        <a href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0" <?php echo $target?>><img
-            src="<?php echo tpl_basedir(); ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
+        <a href="http://validator.w3.org/check/referer" title="Valid HTML5" <?php echo $target?>><img
+            src="<?php echo tpl_basedir(); ?>images/button-html5.png" width="80" height="15" alt="Valid HTML5" /></a>
         <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS" <?php echo $target?>><img
             src="<?php echo tpl_basedir(); ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
         <a href="http://dokuwiki.org/" title="Driven by DokuWiki" <?php echo $target?>><img
-- 
cgit v1.2.3


From a0cc1f96efda74d05704bcb61c09f5b75a122c49 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 6 Oct 2012 12:53:39 +0100
Subject: Revert "deleted very old (and unused) images", will deprecate them
 instead (FS#2612)

This reverts commit ea62d5316150a9477d962aff311f9c6f64f68db7.
---
 lib/images/arrow_down.gif | Bin 0 -> 273 bytes
 lib/images/arrow_up.gif   | Bin 0 -> 274 bytes
 lib/images/at.gif         | Bin 0 -> 57 bytes
 lib/images/close.png      | Bin 0 -> 137 bytes
 lib/images/del.png        | Bin 0 -> 355 bytes
 lib/images/edit.gif       | Bin 0 -> 142 bytes
 lib/images/icon-file.png  | Bin 0 -> 3363 bytes
 lib/images/icon-thumb.png | Bin 0 -> 969 bytes
 lib/images/list-minus.gif | Bin 0 -> 64 bytes
 lib/images/list-plus.gif  | Bin 0 -> 67 bytes
 lib/images/pencil.png     | Bin 0 -> 391 bytes
 11 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lib/images/arrow_down.gif
 create mode 100644 lib/images/arrow_up.gif
 create mode 100644 lib/images/at.gif
 create mode 100644 lib/images/close.png
 create mode 100644 lib/images/del.png
 create mode 100644 lib/images/edit.gif
 create mode 100644 lib/images/icon-file.png
 create mode 100644 lib/images/icon-thumb.png
 create mode 100644 lib/images/list-minus.gif
 create mode 100644 lib/images/list-plus.gif
 create mode 100644 lib/images/pencil.png

(limited to 'lib')

diff --git a/lib/images/arrow_down.gif b/lib/images/arrow_down.gif
new file mode 100644
index 000000000..ff13b9585
Binary files /dev/null and b/lib/images/arrow_down.gif differ
diff --git a/lib/images/arrow_up.gif b/lib/images/arrow_up.gif
new file mode 100644
index 000000000..d491c18db
Binary files /dev/null and b/lib/images/arrow_up.gif differ
diff --git a/lib/images/at.gif b/lib/images/at.gif
new file mode 100644
index 000000000..8bdf40d54
Binary files /dev/null and b/lib/images/at.gif differ
diff --git a/lib/images/close.png b/lib/images/close.png
new file mode 100644
index 000000000..4ccef0603
Binary files /dev/null and b/lib/images/close.png differ
diff --git a/lib/images/del.png b/lib/images/del.png
new file mode 100644
index 000000000..e59ded55f
Binary files /dev/null and b/lib/images/del.png differ
diff --git a/lib/images/edit.gif b/lib/images/edit.gif
new file mode 100644
index 000000000..a2a23de7b
Binary files /dev/null and b/lib/images/edit.gif differ
diff --git a/lib/images/icon-file.png b/lib/images/icon-file.png
new file mode 100644
index 000000000..d350c8c31
Binary files /dev/null and b/lib/images/icon-file.png differ
diff --git a/lib/images/icon-thumb.png b/lib/images/icon-thumb.png
new file mode 100644
index 000000000..ccc7a101d
Binary files /dev/null and b/lib/images/icon-thumb.png differ
diff --git a/lib/images/list-minus.gif b/lib/images/list-minus.gif
new file mode 100644
index 000000000..36902f159
Binary files /dev/null and b/lib/images/list-minus.gif differ
diff --git a/lib/images/list-plus.gif b/lib/images/list-plus.gif
new file mode 100644
index 000000000..adc3fac8a
Binary files /dev/null and b/lib/images/list-plus.gif differ
diff --git a/lib/images/pencil.png b/lib/images/pencil.png
new file mode 100644
index 000000000..78142b61e
Binary files /dev/null and b/lib/images/pencil.png differ
-- 
cgit v1.2.3


From c973a9c8b8f30a6c0c2122b87fd9c44af16ffec3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 6 Oct 2012 13:06:26 +0100
Subject: deprecated very old (and unused) images, deleted two which were never
 used (FS#2612)

---
 lib/images/_deprecated.txt |  12 ++++++++++++
 lib/images/icon-file.png   | Bin 3363 -> 0 bytes
 lib/images/icon-thumb.png  | Bin 969 -> 0 bytes
 3 files changed, 12 insertions(+)
 create mode 100644 lib/images/_deprecated.txt
 delete mode 100644 lib/images/icon-file.png
 delete mode 100644 lib/images/icon-thumb.png

(limited to 'lib')

diff --git a/lib/images/_deprecated.txt b/lib/images/_deprecated.txt
new file mode 100644
index 000000000..bccea2049
--- /dev/null
+++ b/lib/images/_deprecated.txt
@@ -0,0 +1,12 @@
+
+== @deprecated 2012-10-06 ==
+
+arrow_down.gif
+arrow_up.gif
+at.gif
+close.png
+del.png
+edit.gif
+list-minus.gif
+list-plus.gif
+pencil.png
diff --git a/lib/images/icon-file.png b/lib/images/icon-file.png
deleted file mode 100644
index d350c8c31..000000000
Binary files a/lib/images/icon-file.png and /dev/null differ
diff --git a/lib/images/icon-thumb.png b/lib/images/icon-thumb.png
deleted file mode 100644
index ccc7a101d..000000000
Binary files a/lib/images/icon-thumb.png and /dev/null differ
-- 
cgit v1.2.3


From 835dfcaefaa402c6f7c46b222b94da30a33571bf Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 6 Oct 2012 13:42:03 +0100
Subject: Removed tpl_sidebar() to avoid fatal errors in other templates

Replaced it by the old tpl_include_page() and made it more flexible by adding a boolean $propagate parameter.
(It's false by default for backwards compatibility reasons. Should it rather be true? That would probably be what most users want.)
---
 lib/tpl/dokuwiki/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 6b1e95d62..820dd47df 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -42,7 +42,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                     <div class="content">
                         <?php tpl_flush() ?>
                         <?php tpl_includeFile('sidebarheader.html') ?>
-                        <?php tpl_sidebar() ?>
+                        <?php tpl_include_page($conf['sidebar'], 1, 1) ?>
                         <?php tpl_includeFile('sidebarfooter.html') ?>
                     </div>
                 </div></div><!-- /aside -->
-- 
cgit v1.2.3


From 85159e75b55f6a10010af360b6ebf9f952994511 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 7 Oct 2012 02:55:37 +0100
Subject: removed stray closing div (FS#2633)

---
 lib/tpl/dokuwiki/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 820dd47df..963750a1c 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -91,7 +91,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
     </div></div><!-- /site -->
 
     <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
-    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?></div>
+    <div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?>
     <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
 </body>
 </html>
-- 
cgit v1.2.3


From 3046a46462b44f28b1e5b1b25240a8ac4a859020 Mon Sep 17 00:00:00 2001
From: Zigor Astarbe <astarbe@gmail.com>
Date: Sun, 7 Oct 2012 09:46:58 +0200
Subject: Basque language update

---
 lib/plugins/acl/lang/eu/lang.php         |  1 +
 lib/plugins/config/lang/eu/lang.php      | 98 +++++++++++++++++---------------
 lib/plugins/plugin/lang/eu/lang.php      |  1 +
 lib/plugins/popularity/lang/eu/lang.php  |  1 +
 lib/plugins/revert/lang/eu/lang.php      |  1 +
 lib/plugins/usermanager/lang/eu/lang.php |  1 +
 6 files changed, 56 insertions(+), 47 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/eu/lang.php b/lib/plugins/acl/lang/eu/lang.php
index 99e70ad00..b9285ff36 100644
--- a/lib/plugins/acl/lang/eu/lang.php
+++ b/lib/plugins/acl/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['admin_acl']             = 'Atzipen Kontrol Listaren Kudeaketa';
 $lang['acl_group']             = 'Taldea';
diff --git a/lib/plugins/config/lang/eu/lang.php b/lib/plugins/config/lang/eu/lang.php
index 97addbb50..4dd3ff351 100644
--- a/lib/plugins/config/lang/eu/lang.php
+++ b/lib/plugins/config/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['menu']                  = 'Konfigurazio Ezarpenak';
 $lang['error']                 = 'Ezarpenak ez dira eguneratu balio oker bat dela eta, mesedez errepasatu aldaketak eta berriz bidali. <br />Balio okerra(k) ertz gorriz inguratuak erakutsiko dira. ';
@@ -25,6 +26,8 @@ $lang['_anti_spam']            = 'Anti-Spam Ezarpenak';
 $lang['_editing']              = 'Edizio Ezarpenak';
 $lang['_links']                = 'Esteken Ezarpenak';
 $lang['_media']                = 'Multimedia Ezarpenak';
+$lang['_notifications']        = 'Abisuen ezarpenak';
+$lang['_syndication']          = 'Sindikazio ezarpenak';
 $lang['_advanced']             = 'Ezarpen Aurreratuak';
 $lang['_network']              = 'Sare Ezarpenak';
 $lang['_plugin_sufix']         = 'Plugin Ezarpenak';
@@ -32,25 +35,26 @@ $lang['_template_sufix']       = 'Txantiloi Ezarpenak';
 $lang['_msg_setting_undefined'] = 'Ezarpen metadaturik ez.';
 $lang['_msg_setting_no_class'] = 'Ezarpen klaserik ez.';
 $lang['_msg_setting_no_default'] = 'Balio lehenetsirik ez.';
-$lang['fmode']                 = 'Fitxategi sortze modua';
-$lang['dmode']                 = 'Direktorio sortze modua';
-$lang['lang']                  = 'Hizkuntza';
-$lang['basedir']               = 'Oinarri direktorioa';
-$lang['baseurl']               = 'Oinarri URLa';
-$lang['savedir']               = 'Datuak gordetzeko direktorioa';
-$lang['start']                 = 'Hasiera orriaren izena';
 $lang['title']                 = 'Wiki-aren izenburua';
+$lang['start']                 = 'Hasiera orriaren izena';
+$lang['lang']                  = 'Hizkuntza';
 $lang['template']              = 'Txantiloia';
 $lang['license']               = 'Zein lizentziapean argitaratu beharko lirateke edukiak?';
-$lang['fullpath']              = 'Orri oinean orrien bide osoa erakutsi';
+$lang['savedir']               = 'Datuak gordetzeko direktorioa';
+$lang['basedir']               = 'Oinarri direktorioa';
+$lang['baseurl']               = 'Oinarri URLa';
+$lang['dmode']                 = 'Direktorio sortze modua';
+$lang['fmode']                 = 'Fitxategi sortze modua';
+$lang['allowdebug']            = 'Baimendu debug-a <b>ezgaitu behar ez bada!</b>';
 $lang['recent']                = 'Azken aldaketak';
+$lang['recent_days']           = 'Zenbat azken aldaketa gordeko dira (egunak)';
 $lang['breadcrumbs']           = 'Arrasto pauso kopurua';
 $lang['youarehere']            = 'Arrasto pauso hierarkikoak';
+$lang['fullpath']              = 'Orri oinean orrien bide osoa erakutsi';
 $lang['typography']            = 'Ordezkapen tipografikoak egin';
-$lang['htmlok']                = 'Enbotatutako HTMLa baimendu';
-$lang['phpok']                 = 'Enbotatutako PHPa baimendu';
 $lang['dformat']               = 'Data formatua (ikusi PHPren <a href="http://www.php.net/strftime">strftime</a> funtzioa)';
 $lang['signature']             = 'Sinadura';
+$lang['showuseras']            = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan';
 $lang['toptoclevel']           = 'Eduki taularen goiko maila';
 $lang['tocminheads']           = 'Gutxiengo izenburu kopuru minimoa Edukien Taula-ren sortu dadin.';
 $lang['maxtoclevel']           = 'Eduki taularen maila maximoa';
@@ -58,15 +62,8 @@ $lang['maxseclevel']           = 'Sekzio edizio mailaren maximoa';
 $lang['camelcase']             = 'Estekentzat CamelCase erabili';
 $lang['deaccent']              = 'Orri izen garbiak';
 $lang['useheading']            = 'Erabili lehen izenburua orri izen moduan';
-$lang['refcheck']              = 'Multimedia erreferentzia kontrolatu';
-$lang['refshow']               = 'Erakusteko multimedia erreferentzia kopurua';
-$lang['allowdebug']            = 'Baimendu debug-a <b>ezgaitu behar ez bada!</b>';
-$lang['usewordblock']          = 'Blokeatu spam-a hitz zerrenda batean oinarrituta';
-$lang['indexdelay']            = 'Denbora atzerapena indexatu baino lehen (seg)';
-$lang['relnofollow']           = 'Erabili rel="nofollow" kanpo esteketan';
-$lang['mailguard']             = 'Ezkutatu posta-e helbidea';
-$lang['iexssprotect']          = 'Egiaztatu igotako fitxategiak JavaScript edo HTML kode maltzurra detektatzeko';
-$lang['showuseras']            = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan';
+$lang['sneaky_index']          = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.';
+$lang['hidepages']             = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)';
 $lang['useacl']                = 'Erabili atzipen kontrol listak';
 $lang['autopasswd']            = 'Pasahitzak automatikoki sortu';
 $lang['authtype']              = 'Kautotze backend-a';
@@ -75,57 +72,64 @@ $lang['defaultgroup']          = 'Talde lehenetsia';
 $lang['superuser']             = 'Supererabiltzailea - taldea, erabiltzailea edo komaz bereiztutako zerrenda user1,@group1,user2 orri eta funtzio guztietara atzipen osoarekin, AKL-ren ezarpenetan zehaztutakoa kontutan hartu gabe';
 $lang['manager']               = 'Kudeatzailea - talde, erabiltzaile edo komaz bereiztutako zerrenda user1,@group1,user2 kudeatze funtzio zehatz batzuetara atzipenarekin';
 $lang['profileconfirm']        = 'Profil aldaketak pasahitzaz berretsi';
+$lang['rememberme']            = 'Baimendu saio hasiera cookie iraunkorrak (gogoratu iezaidazu)';
 $lang['disableactions']        = 'DokuWiki ekintzak ezgaitu';
 $lang['disableactions_check']  = 'Egiaztatu';
 $lang['disableactions_subscription'] = 'Harpidetu/Harpidetza utzi';
 $lang['disableactions_wikicode'] = 'Ikusi iturburua/Esportatu Raw';
 $lang['disableactions_other']  = 'Beste ekintzak (komaz bereiztuak)';
-$lang['sneaky_index']          = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.';
 $lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)';
 $lang['securecookie']          = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. ';
+$lang['usewordblock']          = 'Blokeatu spam-a hitz zerrenda batean oinarrituta';
+$lang['relnofollow']           = 'Erabili rel="nofollow" kanpo esteketan';
+$lang['indexdelay']            = 'Denbora atzerapena indexatu baino lehen (seg)';
+$lang['mailguard']             = 'Ezkutatu posta-e helbidea';
+$lang['iexssprotect']          = 'Egiaztatu igotako fitxategiak JavaScript edo HTML kode maltzurra detektatzeko';
+$lang['usedraft']              = 'Automatikoki zirriborroa gorde editatze garaian';
+$lang['htmlok']                = 'Enbotatutako HTMLa baimendu';
+$lang['phpok']                 = 'Enbotatutako PHPa baimendu';
+$lang['locktime']              = 'Adin maximoa lock fitxategientzat (seg)';
+$lang['cachetime']             = 'Adin maximoa cachearentzat (seg)';
+$lang['target____wiki']        = 'Barne estekentzat helburu leihoa';
+$lang['target____interwiki']   = 'Interwiki estekentzat helburu leihoa';
+$lang['target____extern']      = 'Kanpo estekentzat helburu leihoa';
+$lang['target____media']       = 'Multimedia estekentzat helburu leihoa';
+$lang['target____windows']     = 'Leihoen estekentzat helburu leihoa';
+$lang['mediarevisions']        = 'Media rebisioak gaitu?';
+$lang['refcheck']              = 'Multimedia erreferentzia kontrolatu';
+$lang['refshow']               = 'Erakusteko multimedia erreferentzia kopurua';
+$lang['gdlib']                 = 'GD Lib bertsioa';
+$lang['im_convert']            = 'ImageMagick-en aldaketa tresnara bidea';
+$lang['jpg_quality']           = 'JPG konprimitze kalitatea (0-100)';
+$lang['fetchsize']             = 'Kanpo esteketatik fetch.php-k deskargatu dezakeen tamaina maximoa (byteak)';
+$lang['subscribers']           = 'Gaitu orri harpidetza euskarria';
+$lang['subscribe_time']        = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.';
+$lang['notify']                = 'Aldaketen jakinarazpenak posta-e helbide honetara bidali';
+$lang['registernotify']        = 'Erregistratu berri diren erabiltzaileei buruzko informazioa post-e helbide honetara bidali';
+$lang['mailfrom']              = 'Posta automatikoentzat erabiliko den posta-e helbidea';
+$lang['mailprefix']            = 'Posta automatikoen gaientzat erabili beharreko aurrizkia';
+$lang['sitemap']               = 'Sortu Google gune-mapa (egunak)';
+$lang['rss_type']              = 'XML jario mota';
+$lang['rss_linkto']            = 'XML jarioak hona estekatzen du';
+$lang['rss_content']           = 'Zer erakutsi XML jarioetan?';
+$lang['rss_update']            = 'XML jarioaren eguneratze tartea (seg)';
+$lang['rss_show_summary']      = 'XML jarioak laburpena erakusten du izenburuan';
 $lang['updatecheck']           = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako update.dokuwiki.org kontaktatu behar du.';
 $lang['userewrite']            = 'Erabili URL politak';
 $lang['useslash']              = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan';
-$lang['usedraft']              = 'Automatikoki zirriborroa gorde editatze garaian';
 $lang['sepchar']               = 'Orri izenaren hitz banatzailea';
 $lang['canonical']             = 'Erabili URL erabat kanonikoak';
 $lang['fnencode']              = 'Non-ASCII fitxategi izenak kodetzeko metodoa.';
 $lang['autoplural']            = 'Kontrolatu forma pluralak esteketan';
 $lang['compression']           = 'Trinkotze metodoa attic fitxategientzat';
-$lang['cachetime']             = 'Adin maximoa cachearentzat (seg)';
-$lang['locktime']              = 'Adin maximoa lock fitxategientzat (seg)';
-$lang['fetchsize']             = 'Kanpo esteketatik fetch.php-k deskargatu dezakeen tamaina maximoa (byteak)';
-$lang['notify']                = 'Aldaketen jakinarazpenak posta-e helbide honetara bidali';
-$lang['registernotify']        = 'Erregistratu berri diren erabiltzaileei buruzko informazioa post-e helbide honetara bidali';
-$lang['mailfrom']              = 'Posta automatikoentzat erabiliko den posta-e helbidea';
-$lang['mailprefix']            = 'Posta automatikoen gaientzat erabili beharreko aurrizkia';
 $lang['gzip_output']           = 'Gzip Eduki-Kodeketa erabili xhtml-rentzat';
-$lang['gdlib']                 = 'GD Lib bertsioa';
-$lang['im_convert']            = 'ImageMagick-en aldaketa tresnara bidea';
-$lang['jpg_quality']           = 'JPG konprimitze kalitatea (0-100)';
-$lang['subscribers']           = 'Gaitu orri harpidetza euskarria';
-$lang['subscribe_time']        = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.';
 $lang['compress']              = 'Trinkotu CSS eta javascript irteera';
-$lang['hidepages']             = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)';
 $lang['send404']               = 'Bidali "HTTP 404/Ez Da Orria Aurkitu" existitzen ez diren orrientzat';
-$lang['sitemap']               = 'Sortu Google gune-mapa (egunak)';
 $lang['broken_iua']            = 'Zure sisteman ignore_user_abort (erabiltzailearen bertan behera uztea kontuan ez hartu) funtzioa hautsia al dago? Honek funtzionatzen ez duen bilaketa indize bat eragin dezake. ISS+PHP/CGI hautsiak daude. Ikusi <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a> informazio gehiago jasotzeko.';
 $lang['xsendfile']             = 'X-Sendfile goiburua erabili web zerbitzariari fitxategi estatikoak bidaltzen uzteko? Zure web zerbitzariak hau ahalbidetuta eduki beharko du.';
 $lang['renderer_xhtml']        = 'Erabiliko den errenderizatzailea wiki irteera (xhtml) nagusiarentzat';
 $lang['renderer__core']        = '%s (dokuwiki-ren nukleoa)';
 $lang['renderer__plugin']      = '%s (plugina)';
-$lang['rememberme']            = 'Baimendu saio hasiera cookie iraunkorrak (gogoratu iezaidazu)';
-$lang['rss_type']              = 'XML jario mota';
-$lang['rss_linkto']            = 'XML jarioak hona estekatzen du';
-$lang['rss_content']           = 'Zer erakutsi XML jarioetan?';
-$lang['rss_update']            = 'XML jarioaren eguneratze tartea (seg)';
-$lang['recent_days']           = 'Zenbat azken aldaketa gordeko dira (egunak)';
-$lang['rss_show_summary']      = 'XML jarioak laburpena erakusten du izenburuan';
-$lang['target____wiki']        = 'Barne estekentzat helburu leihoa';
-$lang['target____interwiki']   = 'Interwiki estekentzat helburu leihoa';
-$lang['target____extern']      = 'Kanpo estekentzat helburu leihoa';
-$lang['target____media']       = 'Multimedia estekentzat helburu leihoa';
-$lang['target____windows']     = 'Leihoen estekentzat helburu leihoa';
 $lang['proxy____host']         = 'Proxy zerbitzari izena';
 $lang['proxy____port']         = 'Proxy portua';
 $lang['proxy____user']         = 'Proxyaren erabiltzaile izena';
diff --git a/lib/plugins/plugin/lang/eu/lang.php b/lib/plugins/plugin/lang/eu/lang.php
index 56c03325f..2fc07fef9 100644
--- a/lib/plugins/plugin/lang/eu/lang.php
+++ b/lib/plugins/plugin/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['menu']                  = 'Plugin-ak Kudeatu';
 $lang['download']              = 'Plugin berri bat deskargatu eta instalatu';
diff --git a/lib/plugins/popularity/lang/eu/lang.php b/lib/plugins/popularity/lang/eu/lang.php
index 05e4262de..b52ccaee1 100644
--- a/lib/plugins/popularity/lang/eu/lang.php
+++ b/lib/plugins/popularity/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['name']                  = 'Popularitate Feedback-a (denbora dezente iraun dezake kargatzen)';
 $lang['submit']                = 'Datuak Bidali';
diff --git a/lib/plugins/revert/lang/eu/lang.php b/lib/plugins/revert/lang/eu/lang.php
index e94f07b2a..d3532c070 100644
--- a/lib/plugins/revert/lang/eu/lang.php
+++ b/lib/plugins/revert/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['menu']                  = 'Berrezartze Kudeatzailea';
 $lang['filter']                = 'Bilatu spam duten orriak';
diff --git a/lib/plugins/usermanager/lang/eu/lang.php b/lib/plugins/usermanager/lang/eu/lang.php
index b6e04f7c4..5d3a01fc7 100644
--- a/lib/plugins/usermanager/lang/eu/lang.php
+++ b/lib/plugins/usermanager/lang/eu/lang.php
@@ -3,6 +3,7 @@
  * Basque language file
  *
  * @author Inko Illarramendi <inko.i.a@gmail.com>
+ * @author Zigor Astarbe <astarbe@gmail.com>
  */
 $lang['menu']                  = 'Erabiltzaile Kudeatzailea';
 $lang['noauth']                = '(erabiltzaile kautotzea ez dago erabilgarri)';
-- 
cgit v1.2.3


From 0e6f9f08b1c948f45d1867346a4502021afa55bc Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 7 Oct 2012 15:30:38 +0100
Subject: added support for local style.ini files

---
 lib/exe/css.php            | 29 +++++++++++++++++++++++------
 lib/tpl/default/style.ini  |  3 +++
 lib/tpl/dokuwiki/style.ini |  3 +++
 lib/tpl/index.php          | 10 ++++++++--
 4 files changed, 37 insertions(+), 8 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index 8899ff193..dd69c94cf 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -49,14 +49,17 @@ function css_out(){
         $tpldir = tpl_basedir();
     }
 
+    // used style.ini file
+    $styleini = css_styleini($tplinc);
+
     // The generated script depends on some dynamic options
     $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tplinc.$type,'.css');
 
     // load template styles
     $tplstyles = array();
-    if(@file_exists($tplinc.'style.ini')){
-        $ini = parse_ini_file($tplinc.'style.ini',true);
-        foreach($ini['stylesheets'] as $file => $mode){
+    if ($styleini) {
+        $ini = parse_ini_file($styleini, true);
+        foreach($ini['stylesheets'] as $file => $mode) {
             $tplstyles[$mode][$tplinc.$file] = $tpldir;
         }
     }
@@ -71,7 +74,8 @@ function css_out(){
     $files = array();
 
     $cache_files = getConfigFiles('main');
-    $cache_files[] = $tplinc.'style.ini';
+    if ($styleini)
+        $cache_files[] = $styleini;
     $cache_files[] = __FILE__;
 
     foreach($mediatypes as $mediatype) {
@@ -173,13 +177,26 @@ function css_out(){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function css_applystyle($css,$tplinc){
-    if(@file_exists($tplinc.'style.ini')){
-        $ini = parse_ini_file($tplinc.'style.ini',true);
+    $styleini = css_styleini($tplinc);
+
+    if($styleini){
+        $ini = parse_ini_file($styleini,true);
         $css = strtr($css,$ini['replacements']);
     }
     return $css;
 }
 
+/**
+ * If either exist, get the template's style.local.ini or style.ini file.
+ */
+function css_styleini($tplinc) {
+    if(@file_exists($tplinc.'style.local.ini'))
+        return $tplinc.'style.local.ini';
+    if(@file_exists($tplinc.'style.ini'))
+        return $tplinc.'style.ini';
+    return '';
+}
+
 /**
  * Prints classes for interwikilinks
  *
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index 7d27381c9..b9e1e9424 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -1,6 +1,9 @@
 ; Please see http://www.php.net/manual/en/function.parse-ini-file.php
 ; for limitations of the ini format used here
 
+; Please only make changes in style.local.ini. If it doesn't exist,
+; just create it by copying style.ini.
+
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
 ; print, screen and rtl are supported. rtl styles are loaded additionally
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 242b43080..bcb5a1a2e 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -1,6 +1,9 @@
 ; Please see http://www.php.net/manual/en/function.parse-ini-file.php
 ; for limitations of the ini format used here
 
+; Please only make changes in style.local.ini. If it doesn't exist,
+; just create it by copying style.ini.
+
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
 ; print, screen and all are supported.
diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 357cc1f0d..7cdec9774 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -43,7 +43,13 @@ require_once(DOKU_INC.'inc/init.php');
 </head>
 <body>
 <?php
-$ini = @parse_ini_file($conf['template'].'/style.ini',true);
+$styleini = '';
+if(@file_exists($conf['template'].'/style.local.ini'))
+    $styleini = $conf['template'].'/style.local.ini';
+else if(@file_exists($conf['template'].'/style.ini'))
+    $styleini = $conf['template'].'/style.ini';
+$ini = @parse_ini_file($styleini, true);
+
 if ($ini) {
     echo '<table>';
     echo "<caption>".htmlspecialchars($conf['template'])."'s style.ini</caption>";
@@ -60,7 +66,7 @@ if ($ini) {
     }
     echo '</table>';
 } else {
-    echo "<p>Non-existent template: <strong>".htmlspecialchars($conf['template'])."</strong></p>";
+    echo "<p>Non-existent or invalid template or style.ini: <strong>".htmlspecialchars($conf['template'])."</strong></p>";
 }
 ?>
 </body>
-- 
cgit v1.2.3


From 506c1de7b3fee44073b5ec5d944de4cbb03960a5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 7 Oct 2012 20:34:34 +0200
Subject: fixed warning in popularity plugin FS#2628

---
 lib/plugins/popularity/helper.php      | 2 +-
 lib/plugins/popularity/plugin.info.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/popularity/helper.php b/lib/plugins/popularity/helper.php
index af1e8a706..34521021d 100644
--- a/lib/plugins/popularity/helper.php
+++ b/lib/plugins/popularity/helper.php
@@ -143,7 +143,7 @@ class helper_plugin_popularity extends Dokuwiki_Plugin {
 
         // number and size of pages
         $list = array();
-        search($list,$conf['datadir'],array($this,'_search_count'),'','');
+        search($list,$conf['datadir'],array($this,'_search_count'),array('all'=>false),'');
         $data['page_count']    = $list['file_count'];
         $data['page_size']     = $list['file_size'];
         $data['page_biggest']  = $list['file_max'];
diff --git a/lib/plugins/popularity/plugin.info.txt b/lib/plugins/popularity/plugin.info.txt
index 871259ee9..2f1451c4a 100644
--- a/lib/plugins/popularity/plugin.info.txt
+++ b/lib/plugins/popularity/plugin.info.txt
@@ -1,7 +1,7 @@
 base    popularity
 author  Andreas Gohr
 email   andi@splitbrain.org
-date    2012-09-08
+date    2012-10-07
 name    Popularity Feedback Plugin
 desc    Send anonymous data about your wiki to the developers.
 url     http://www.dokuwiki.org/plugin:popularity
-- 
cgit v1.2.3


From 9f6bf6d3f6b79437d248bbed29bad0f69afe8660 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 7 Oct 2012 20:47:18 +0200
Subject: adjusted h1 size in sidebar

note: we recommend to NOT use H1 elements in the sidebar for semantic
reasons
---
 lib/tpl/dokuwiki/css/design.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 12ec80687..67fe7ac13 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -264,6 +264,7 @@
 /* make sidebar more condensed */
 
 #dokuwiki__aside h1 {
+    font-size: 1.7em;
     margin-bottom: .222em;
 }
 #dokuwiki__aside h2 {
-- 
cgit v1.2.3


From f3f24c6857f888109f23be1ab8dcf45df25b2ca5 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 7 Oct 2012 23:03:03 +0100
Subject: improvements to h1 in sidebar (follow font size scale + vertical
 grid)

---
 lib/tpl/dokuwiki/css/design.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 67fe7ac13..5cf7fad42 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -264,8 +264,8 @@
 /* make sidebar more condensed */
 
 #dokuwiki__aside h1 {
-    font-size: 1.7em;
-    margin-bottom: .222em;
+    font-size: 1.714em;
+    margin-bottom: .292em;
 }
 #dokuwiki__aside h2 {
     margin-bottom: .333em;
-- 
cgit v1.2.3


From 650d96f6b66b6c10cb0f2e51a75def685e8fb2d3 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sun, 7 Oct 2012 23:58:42 +0100
Subject: fixed 2-digit ordered list items in sidebar (FS#2624)

---
 lib/tpl/dokuwiki/css/design.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 5cf7fad42..501e0a613 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -295,15 +295,16 @@
 
 #dokuwiki__aside ul,
 #dokuwiki__aside ol {
-    padding-left: 0;
+    padding-left: .5em;
 }
 [dir=rtl] #dokuwiki__aside ul,
 [dir=rtl] #dokuwiki__aside ol {
-    padding-right: 0;
+    padding-right: .5em;
 }
 #dokuwiki__aside li ul,
 #dokuwiki__aside li ol {
     margin-bottom: 0;
+    padding: 0;
 }
 
 #dokuwiki__aside a:link,
-- 
cgit v1.2.3


From 5db35f6f9b815f87ace9af277ca6e07a6edf9ae7 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Wed, 10 Oct 2012 11:12:21 +0100
Subject: removed template dependencies from underscored CSS files in new
 default template

---
 lib/images/README                         |   6 ++++++
 lib/images/bullet.png                     | Bin 0 -> 112 bytes
 lib/images/closed-rtl.png                 | Bin 0 -> 118 bytes
 lib/images/closed.png                     | Bin 0 -> 119 bytes
 lib/images/email.png                      | Bin 0 -> 659 bytes
 lib/images/external-link.png              | Bin 0 -> 816 bytes
 lib/images/open.png                       | Bin 0 -> 118 bytes
 lib/images/unc.png                        | Bin 0 -> 553 bytes
 lib/tpl/dokuwiki/css/_links.css           |  10 +++-------
 lib/tpl/dokuwiki/css/_toc.css             |   8 ++++----
 lib/tpl/dokuwiki/css/content.css          |  15 ++++++++++++++-
 lib/tpl/dokuwiki/images/bullet.png        | Bin 112 -> 0 bytes
 lib/tpl/dokuwiki/images/closed-rtl.png    | Bin 118 -> 0 bytes
 lib/tpl/dokuwiki/images/closed.png        | Bin 119 -> 0 bytes
 lib/tpl/dokuwiki/images/email.png         | Bin 659 -> 0 bytes
 lib/tpl/dokuwiki/images/external-link.png | Bin 816 -> 0 bytes
 lib/tpl/dokuwiki/images/icons-license.txt |   5 -----
 lib/tpl/dokuwiki/images/license.txt       |   5 +++++
 lib/tpl/dokuwiki/images/open.png          | Bin 118 -> 0 bytes
 lib/tpl/dokuwiki/images/unc.png           | Bin 553 -> 0 bytes
 lib/tpl/dokuwiki/style.ini                |   6 +++---
 21 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 lib/images/README
 create mode 100644 lib/images/bullet.png
 create mode 100644 lib/images/closed-rtl.png
 create mode 100644 lib/images/closed.png
 create mode 100644 lib/images/email.png
 create mode 100644 lib/images/external-link.png
 create mode 100644 lib/images/open.png
 create mode 100644 lib/images/unc.png
 delete mode 100644 lib/tpl/dokuwiki/images/bullet.png
 delete mode 100644 lib/tpl/dokuwiki/images/closed-rtl.png
 delete mode 100644 lib/tpl/dokuwiki/images/closed.png
 delete mode 100644 lib/tpl/dokuwiki/images/email.png
 delete mode 100644 lib/tpl/dokuwiki/images/external-link.png
 delete mode 100644 lib/tpl/dokuwiki/images/icons-license.txt
 create mode 100644 lib/tpl/dokuwiki/images/license.txt
 delete mode 100644 lib/tpl/dokuwiki/images/open.png
 delete mode 100644 lib/tpl/dokuwiki/images/unc.png

(limited to 'lib')

diff --git a/lib/images/README b/lib/images/README
new file mode 100644
index 000000000..e2788b400
--- /dev/null
+++ b/lib/images/README
@@ -0,0 +1,6 @@
+
+Icons:      email.png, external-link.png, unc.png
+Icon set:   Dusseldorf
+Designer:   pc.de
+License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
+URL:        http://pc.de/icons/#Dusseldorf
diff --git a/lib/images/bullet.png b/lib/images/bullet.png
new file mode 100644
index 000000000..5e557b334
Binary files /dev/null and b/lib/images/bullet.png differ
diff --git a/lib/images/closed-rtl.png b/lib/images/closed-rtl.png
new file mode 100644
index 000000000..caa027e34
Binary files /dev/null and b/lib/images/closed-rtl.png differ
diff --git a/lib/images/closed.png b/lib/images/closed.png
new file mode 100644
index 000000000..e3bd0f9e9
Binary files /dev/null and b/lib/images/closed.png differ
diff --git a/lib/images/email.png b/lib/images/email.png
new file mode 100644
index 000000000..d1d4a5fd5
Binary files /dev/null and b/lib/images/email.png differ
diff --git a/lib/images/external-link.png b/lib/images/external-link.png
new file mode 100644
index 000000000..a4d5de17c
Binary files /dev/null and b/lib/images/external-link.png differ
diff --git a/lib/images/open.png b/lib/images/open.png
new file mode 100644
index 000000000..5f2d408c5
Binary files /dev/null and b/lib/images/open.png differ
diff --git a/lib/images/unc.png b/lib/images/unc.png
new file mode 100644
index 000000000..a552d6e6f
Binary files /dev/null and b/lib/images/unc.png differ
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index e53ba45e5..7e5fb02cd 100644
--- a/lib/tpl/dokuwiki/css/_links.css
+++ b/lib/tpl/dokuwiki/css/_links.css
@@ -6,13 +6,9 @@
 
 /* existing wikipage */
 .dokuwiki a.wikilink1 {
-    color: __existing__;
-    background-color: inherit;
 }
 /* not existing wikipage */
 .dokuwiki a.wikilink2 {
-    color: __missing__;
-    background-color: inherit;
     text-decoration: none;
 }
 .dokuwiki a.wikilink2:link,
@@ -43,15 +39,15 @@
 }
 /* external link */
 .dokuwiki a.urlextern {
-    background-image: url(images/external-link.png);
+    background-image: url(../../images/external-link.png);
 }
 /* windows share */
 .dokuwiki a.windows {
-    background-image: url(images/unc.png);
+    background-image: url(../../images/unc.png);
 }
 /* email link */
 .dokuwiki a.mail {
-    background-image: url(images/email.png);
+    background-image: url(../../images/email.png);
 }
 
 /* icons of the following are set by dokuwiki in lib/exe/css.php */
diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css
index 0d1b976d1..1226b5b5b 100644
--- a/lib/tpl/dokuwiki/css/_toc.css
+++ b/lib/tpl/dokuwiki/css/_toc.css
@@ -80,14 +80,14 @@
     padding-right: 0;
 }
 .dokuwiki ul.idx li {
-    list-style-image: url(images/bullet.png);
+    list-style-image: url(../../images/bullet.png);
 }
 .dokuwiki ul.idx li.open {
-    list-style-image: url(images/open.png);
+    list-style-image: url(../../images/open.png);
 }
 .dokuwiki ul.idx li.closed {
-    list-style-image: url(images/closed.png);
+    list-style-image: url(../../images/closed.png);
 }
 [dir=rtl] .dokuwiki ul.idx li.closed {
-    list-style-image: url(images/closed-rtl.png);
+    list-style-image: url(../../images/closed-rtl.png);
 }
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index 9f3eab0f0..1d3ae8c01 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -6,7 +6,6 @@
  * @author Clarence Lee <clarencedglee@gmail.com>
  */
 
-
 /*____________ section indenting ____________
 
 .dokuwiki.page  h1 {margin-left: 0;}
@@ -34,6 +33,20 @@
 /* hx margin-left = (1 / font-size) * .levelx-margin */
 
 
+/*____________ links to wiki pages (addition to _links) ____________*/
+
+/* existing wikipage */
+.dokuwiki a.wikilink1 {
+    color: __existing__;
+    background-color: inherit;
+}
+/* not existing wikipage */
+.dokuwiki a.wikilink2 {
+    color: __missing__;
+    background-color: inherit;
+}
+
+
 /*____________ images ____________*/
 
 /* embedded images (styles are already partly set in lib/styles/all.css) */
diff --git a/lib/tpl/dokuwiki/images/bullet.png b/lib/tpl/dokuwiki/images/bullet.png
deleted file mode 100644
index 5e557b334..000000000
Binary files a/lib/tpl/dokuwiki/images/bullet.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/images/closed-rtl.png b/lib/tpl/dokuwiki/images/closed-rtl.png
deleted file mode 100644
index caa027e34..000000000
Binary files a/lib/tpl/dokuwiki/images/closed-rtl.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/images/closed.png b/lib/tpl/dokuwiki/images/closed.png
deleted file mode 100644
index e3bd0f9e9..000000000
Binary files a/lib/tpl/dokuwiki/images/closed.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png
deleted file mode 100644
index d1d4a5fd5..000000000
Binary files a/lib/tpl/dokuwiki/images/email.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png
deleted file mode 100644
index a4d5de17c..000000000
Binary files a/lib/tpl/dokuwiki/images/external-link.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/images/icons-license.txt b/lib/tpl/dokuwiki/images/icons-license.txt
deleted file mode 100644
index 7e12bbbd4..000000000
--- a/lib/tpl/dokuwiki/images/icons-license.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Icons for:  sitetools.png, email.png, external-link.png and unc.png
-Icon set:   Dusseldorf
-Designer:   pc.de
-License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
-URL:        http://pc.de/icons/#Dusseldorf
diff --git a/lib/tpl/dokuwiki/images/license.txt b/lib/tpl/dokuwiki/images/license.txt
new file mode 100644
index 000000000..7d12604b6
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/license.txt
@@ -0,0 +1,5 @@
+Icons for:  sitetools.png
+Icon set:   Dusseldorf
+Designer:   pc.de
+License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
+URL:        http://pc.de/icons/#Dusseldorf
diff --git a/lib/tpl/dokuwiki/images/open.png b/lib/tpl/dokuwiki/images/open.png
deleted file mode 100644
index 5f2d408c5..000000000
Binary files a/lib/tpl/dokuwiki/images/open.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png
deleted file mode 100644
index a552d6e6f..000000000
Binary files a/lib/tpl/dokuwiki/images/unc.png and /dev/null differ
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 242b43080..d0292e9b1 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -54,6 +54,9 @@ __background_neu__  = "#ddd"
 ; border color
 __border__          = "#ccc"
 
+; highlighted text (e.g. search snippets)
+__highlight__       = "#ff9"
+
 ;--------------------------------------------------------------------------
 
 __background_site__ = "#fbfaf9"
@@ -63,9 +66,6 @@ __link__            = "#2b73b7"
 __existing__        = "#080"
 __missing__         = "#d30"
 
-; highlighting search snippets
-__highlight__       = "#ff9"
-
 ; site and sidebar widths
 __site_width__      = "75em"
 __sidebar_width__   = "16em"
-- 
cgit v1.2.3


From 0ac69508958a06e566a51fb6a74802401ebe5eb5 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 11 Oct 2012 13:26:47 +0100
Subject: changed local style.ini to be merged with standard one

---
 lib/exe/css.php            | 33 +++++++++++++++++++++------------
 lib/tpl/default/style.ini  |  6 ++++--
 lib/tpl/dokuwiki/style.ini |  6 ++++--
 3 files changed, 29 insertions(+), 16 deletions(-)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index dd69c94cf..ae160558a 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -58,8 +58,7 @@ function css_out(){
     // load template styles
     $tplstyles = array();
     if ($styleini) {
-        $ini = parse_ini_file($styleini, true);
-        foreach($ini['stylesheets'] as $file => $mode) {
+        foreach($styleini['stylesheets'] as $file => $mode) {
             $tplstyles[$mode][$tplinc.$file] = $tpldir;
         }
     }
@@ -74,8 +73,8 @@ function css_out(){
     $files = array();
 
     $cache_files = getConfigFiles('main');
-    if ($styleini)
-        $cache_files[] = $styleini;
+    $cache_files[] = $tplinc.'style.ini';
+    $cache_files[] = $tplinc.'style.local.ini';
     $cache_files[] = __FILE__;
 
     foreach($mediatypes as $mediatype) {
@@ -180,21 +179,31 @@ function css_applystyle($css,$tplinc){
     $styleini = css_styleini($tplinc);
 
     if($styleini){
-        $ini = parse_ini_file($styleini,true);
-        $css = strtr($css,$ini['replacements']);
+        $css = strtr($css,$styleini['replacements']);
     }
     return $css;
 }
 
 /**
- * If either exist, get the template's style.local.ini or style.ini file.
+ * Get contents of merged style.ini and style.local.ini as an array.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
  */
 function css_styleini($tplinc) {
-    if(@file_exists($tplinc.'style.local.ini'))
-        return $tplinc.'style.local.ini';
-    if(@file_exists($tplinc.'style.ini'))
-        return $tplinc.'style.ini';
-    return '';
+    $styleini = array();
+
+    foreach (array($tplinc.'style.ini', $tplinc.'style.local.ini') as $ini) {
+        $tmp = (@file_exists($ini)) ? parse_ini_file($ini, true) : array();
+
+        foreach($tmp as $key => $value) {
+            if(array_key_exists($key, $styleini) && is_array($value)) {
+                $styleini[$key] = array_merge($styleini[$key], $tmp[$key]);
+            } else {
+                $styleini[$key] = $value;
+            }
+        }
+    }
+    return $styleini;
 }
 
 /**
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index b9e1e9424..726c2025d 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -1,8 +1,10 @@
 ; Please see http://www.php.net/manual/en/function.parse-ini-file.php
 ; for limitations of the ini format used here
 
-; Please only make changes in style.local.ini. If it doesn't exist,
-; just create it by copying style.ini.
+; To extend this file or make changes to it, it is recommended to create
+; a style.local.ini file to prevent losing any changes after an upgrade.
+; Please don't forgot to copy the section your changes should be under
+; (i.e. [stylesheets] or [replacements]) into that file as well.
 
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index bcb5a1a2e..86066fa3b 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -1,8 +1,10 @@
 ; Please see http://www.php.net/manual/en/function.parse-ini-file.php
 ; for limitations of the ini format used here
 
-; Please only make changes in style.local.ini. If it doesn't exist,
-; just create it by copying style.ini.
+; To extend this file or make changes to it, it is recommended to create
+; a style.local.ini file to prevent losing any changes after an upgrade.
+; Please don't forgot to copy the section your changes should be under
+; (i.e. [stylesheets] or [replacements]) into that file as well.
 
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
-- 
cgit v1.2.3


From f809ae7b68654e512abb3c980f458bda533d1327 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Thu, 11 Oct 2012 13:48:09 +0100
Subject: fixed lib/tpl/index.php to reflect recent changes

---
 lib/tpl/index.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/index.php b/lib/tpl/index.php
index 7cdec9774..3c00ab8e8 100644
--- a/lib/tpl/index.php
+++ b/lib/tpl/index.php
@@ -43,12 +43,10 @@ require_once(DOKU_INC.'inc/init.php');
 </head>
 <body>
 <?php
-$styleini = '';
-if(@file_exists($conf['template'].'/style.local.ini'))
-    $styleini = $conf['template'].'/style.local.ini';
-else if(@file_exists($conf['template'].'/style.ini'))
-    $styleini = $conf['template'].'/style.ini';
-$ini = @parse_ini_file($styleini, true);
+// get merged style.ini
+define('SIMPLE_TEST', true); // hack to prevent css output and headers
+require_once(DOKU_INC.'lib/exe/css.php');
+$ini = css_styleini(tpl_incdir());
 
 if ($ini) {
     echo '<table>';
-- 
cgit v1.2.3


From 870c8a4b77dd7c2cfdc14045f8604b5bbf34c01e Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 12 Oct 2012 00:41:37 +0100
Subject: #2541, alter section highlighting to insert a container into the DOM
 to hold the elements being highlighted & later remove it

---
 lib/scripts/page.js             | 33 ++++++++++++++++++---------------
 lib/tpl/dokuwiki/css/_edit.css  |  6 ++++--
 lib/tpl/dokuwiki/css/design.css |  6 ++++--
 lib/tpl/dokuwiki/css/mobile.css |  6 ++++--
 4 files changed, 30 insertions(+), 21 deletions(-)

(limited to 'lib')

diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index b8e83cb0c..4ab0bf9b5 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -22,24 +22,27 @@ dw_page = {
         jQuery('form.btn_secedit')
             .mouseover(function(){
                 var $tgt = jQuery(this).parent(),
-                    nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2];
-
-                // Walk the DOM tree up (first previous siblings, then parents)
-                // until boundary element
-                while($tgt.length > 0 && !$tgt.hasClass('sectionedit' + nr)) {
-                    // go down when the sectionedit begin marker is below $tgt
-                    if ($tgt.find('.sectionedit' + nr).length > 0) {
-                        $tgt = $tgt.children().last();
-                    } else {
-                        // $.last gives the DOM-ordered last element:
-                        // prev if present, else parent.
-                        $tgt = $tgt.prev().add($tgt.parent()).last();
-                    }
-                    $tgt.addClass('section_highlight');
+                    nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2],
+                    $highlight = jQuery(),                                             // holder for elements in the section to be highlighted
+                    $highlightWrap = jQuery('<div class="section_highlight"></div>');  // section highlight wrapper
+
+                // Walk the dom tree in reverse to find the sibling which is or contains the section edit marker
+                while($tgt.length > 0 && !($tgt.hasClass('sectionedit' + nr) || $tgt.find('.sectionedit' + nr).length)) {
+                    $tgt = $tgt.prev();
+                    $highlight = $highlight.add($tgt);
                 }
+              // insert the section highlight wrapper before the last element added to $highlight
+              $highlight.filter(':last').before($highlightWrap);
+              // and move the elements to be highlighted inside the section highlight wrapper
+              $highlight.detach().appendTo($highlightWrap);
             })
             .mouseout(function(){
-                jQuery('.section_highlight').removeClass('section_highlight');
+                // find the section highlight wrapper...
+                var $highlightWrap = jQuery('.section_highlight');
+                // ...move its children in front of it (as siblings)...
+                $highlightWrap.before($highlightWrap.children().detach());
+                // ...and remove the section highlight wrapper
+                $highlightWrap.detach();
             });
     },
 
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index e4182774e..bae69ad96 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -140,8 +140,10 @@ div.picker button.toolbutton {
 }
 /* style for section highlighting (only sections below headings) */
 .dokuwiki div.section_highlight {
-    margin: -3em -1em -.01em -1em; /* negative side margin = side padding + side border */
-    padding: 3em .5em .01em .5em;
+    margin-left: -1em; /* negative side margin = side padding + side border */
+    margin-right: -1em; /* negative side margin = side padding + side border */
+    padding-left: .5em;
+    padding-right: .5em;
     border: solid __background_alt__;
     border-width: 0 .5em;
 }
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 501e0a613..87610663d 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -421,8 +421,10 @@
 }
 
 .dokuwiki div.section_highlight {
-    margin: -3em -2em -.01em -2em;
-    padding: 3em 1em .01em 1em;
+    margin-left:  -2em;
+    margin-right: -2em;
+    padding-left: 1em;
+    padding-right: 1em;
     border-width: 0 1em;
 }
 [dir=rtl] .dokuwiki div.section_highlight {
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index cc61ab06c..7f106b046 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -92,8 +92,10 @@
 
 /* _edit */
 .dokuwiki div.section_highlight {
-    margin: -3em -1em -.01em -1em;
-    padding: 3em .5em .01em .5em;
+    margin-left: -1em;
+    margin-right: -1em;
+    padding-left: .5em;
+    padding-right: .5em;
     border-width: 0 .5em;
 }
 .dokuwiki div.preview {
-- 
cgit v1.2.3


From 9f88c3ada06d83e6bed7fc70d1eb22a806ae40fe Mon Sep 17 00:00:00 2001
From: Frederico Goncalves Guimaraes <frederico@teia.bio.br>
Date: Fri, 12 Oct 2012 10:12:40 +0200
Subject: Brazilia Portuguese language update

---
 lib/plugins/config/lang/pt-br/lang.php      | 106 +++++++++++++++-------------
 lib/plugins/popularity/lang/pt-br/intro.txt |   4 +-
 2 files changed, 60 insertions(+), 50 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/pt-br/lang.php b/lib/plugins/config/lang/pt-br/lang.php
index 8c0ef713a..7151713d8 100644
--- a/lib/plugins/config/lang/pt-br/lang.php
+++ b/lib/plugins/config/lang/pt-br/lang.php
@@ -39,33 +39,38 @@ $lang['_anti_spam']            = 'Configurações do anti-spam';
 $lang['_editing']              = 'Configurações de edição';
 $lang['_links']                = 'Configurações de link';
 $lang['_media']                = 'Configurações de mídia';
+$lang['_notifications']        = 'Configurações de notificação';
+$lang['_syndication']          = 'Configurações de sindicância';
 $lang['_advanced']             = 'Configurações avançadas';
 $lang['_network']              = 'Configurações de rede';
 $lang['_plugin_sufix']         = 'Configurações de plug-ins';
-$lang['_template_sufix']       = 'Configurações de modelos';
+$lang['_template_sufix']       = 'Configurações do modelo';
 $lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.';
 $lang['_msg_setting_no_class'] = 'Nenhuma classe definida.';
 $lang['_msg_setting_no_default'] = 'Nenhum valor padrão.';
-$lang['fmode']                 = 'Modo de criação do arquivo';
-$lang['dmode']                 = 'Modo de criação do diretório';
+$lang['title']                 = 'Título do wiki';
+$lang['start']                 = 'Nome da página inicial';
 $lang['lang']                  = 'Idioma';
+$lang['template']              = 'Modelo, ou a aparência do wiki.';
+$lang['tagline']               = 'Slogan (caso o modelo suporte isso)';
+$lang['sidebar']               = 'Nome da página da barra lateral (caso o modelo suporte isso). Deixe em branco para desabilitar a barra lateral.';
+$lang['license']               = 'Sob qual licença o seu conteúdo deve ser disponibilizado?';
+$lang['savedir']               = 'Diretório para salvar os dados';
 $lang['basedir']               = 'Diretório base';
 $lang['baseurl']               = 'URL base';
-$lang['savedir']               = 'Diretório para salvar os dados';
 $lang['cookiedir']             = 'Caminhos dos cookies. Deixe em branco para usar a url base.';
-$lang['start']                 = 'Nome da página inicial';
-$lang['title']                 = 'Título do wiki';
-$lang['template']              = 'Modelo';
-$lang['license']               = 'Sob qual licença o seu conteúdo deve ser disponibilizado?';
-$lang['fullpath']              = 'Indica o caminho completo das páginas no rodapé';
+$lang['dmode']                 = 'Modo de criação do diretório';
+$lang['fmode']                 = 'Modo de criação do arquivo';
+$lang['allowdebug']            = 'Habilitar a depuração <b>(desabilite se não for necessário!)</b>';
 $lang['recent']                = 'Modificações recentes';
+$lang['recent_days']           = 'Quantas mudanças recentes devem ser mantidas (dias)?';
 $lang['breadcrumbs']           = 'Número de elementos na trilha de páginas visitadas';
 $lang['youarehere']            = 'Trilha hierárquica';
+$lang['fullpath']              = 'Indica o caminho completo das páginas no rodapé';
 $lang['typography']            = 'Efetuar modificações tipográficas';
-$lang['htmlok']                = 'Permitir incorporação de HTML';
-$lang['phpok']                 = 'Permitir incorporação de PHP';
 $lang['dformat']               = 'Formato da data (veja a função <a href="http://www.php.net/strftime">strftime</a> do PHP)';
 $lang['signature']             = 'Assinatura';
+$lang['showuseras']            = 'O que exibir quando mostrar o usuário que editou a página pela última vez';
 $lang['toptoclevel']           = 'Nível mais alto para a tabela de conteúdos';
 $lang['tocminheads']           = 'Quantidade mínima de cabeçalhos para a construção da tabela de conteúdos.';
 $lang['maxtoclevel']           = 'Nível máximo para entrar na tabela de conteúdos';
@@ -73,15 +78,8 @@ $lang['maxseclevel']           = 'Nível máximo para gerar uma seção de ediç
 $lang['camelcase']             = 'Usar CamelCase para links';
 $lang['deaccent']              = '"Limpar" os nomes das páginas';
 $lang['useheading']            = 'Usar o primeiro cabeçalho como nome da página';
-$lang['refcheck']              = 'Verificação de referência da mídia';
-$lang['refshow']               = 'Número de referências de mídia a exibir';
-$lang['allowdebug']            = 'Habilitar a depuração <b>(desabilite se não for necessário!)</b>';
-$lang['usewordblock']          = 'Bloquear spam baseado em lista de palavras';
-$lang['indexdelay']            = 'Tempo de espera antes da indexação (seg)';
-$lang['relnofollow']           = 'Usar rel="nofollow" em links externos';
-$lang['mailguard']             = 'Obscurecer endereços de e-mail';
-$lang['iexssprotect']          = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados';
-$lang['showuseras']            = 'O que exibir quando mostrar o usuário que editou a página pela última vez';
+$lang['sneaky_index']          = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.';
+$lang['hidepages']             = 'Esconder páginas correspondentes (expressão regular)';
 $lang['useacl']                = 'Usar listas de controle de acesso';
 $lang['autopasswd']            = 'Gerar senhas automaticamente';
 $lang['authtype']              = 'Método de autenticação';
@@ -90,58 +88,70 @@ $lang['defaultgroup']          = 'Grupo padrão';
 $lang['superuser']             = 'Superusuário - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso completo a todas as páginas e funções, independente das definições da ACL';
 $lang['manager']               = 'Gerente - um grupo, usuário ou uma lista separada por vírgulas (usuário1,@grupo1,usuário2) que tenha acesso a certas funções de gerenciamento';
 $lang['profileconfirm']        = 'Confirmar mudanças no perfil com a senha';
+$lang['rememberme']            = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")';
 $lang['disableactions']        = 'Desabilitar as ações do DokuWiki';
 $lang['disableactions_check']  = 'Verificação';
 $lang['disableactions_subscription'] = 'Monitoramento';
 $lang['disableactions_wikicode'] = 'Ver a fonte/Exportar sem processamento';
 $lang['disableactions_other']  = 'Outras ações (separadas por vírgula)';
-$lang['sneaky_index']          = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.';
 $lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)';
 $lang['securecookie']          = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.';
+$lang['remote']                = 'Habilitar o sistema de API remota. Isso permite que outras aplicações acessem o wiki via XML-RPC ou outros mecanismos.';
+$lang['remoteuser']            = 'Restringir o acesso à API remota aos grupos ou usuários definidos aqui (separados por vírgulas). Deixe em branco para permitir o acesso a qualquer um.';
+$lang['usewordblock']          = 'Bloquear spam baseado em lista de palavras';
+$lang['relnofollow']           = 'Usar rel="nofollow" em links externos';
+$lang['indexdelay']            = 'Tempo de espera antes da indexação (seg)';
+$lang['mailguard']             = 'Obscurecer endereços de e-mail';
+$lang['iexssprotect']          = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados';
+$lang['usedraft']              = 'Salvar o rascunho automaticamente durante a edição';
+$lang['htmlok']                = 'Permitir incorporação de HTML';
+$lang['phpok']                 = 'Permitir incorporação de PHP';
+$lang['locktime']              = 'Tempo máximo para o bloqueio de arquivos (seg)';
+$lang['cachetime']             = 'Tempo máximo para o cache (seg)';
+$lang['target____wiki']        = 'Parâmetro "target" para links internos';
+$lang['target____interwiki']   = 'Parâmetro "target" para links interwiki';
+$lang['target____extern']      = 'Parâmetro "target" para links externos';
+$lang['target____media']       = 'Parâmetro "target" para links de mídia';
+$lang['target____windows']     = 'Parâmetro "target" para links do Windows';
+$lang['mediarevisions']        = 'Habilitar revisões de mídias?';
+$lang['refcheck']              = 'Verificação de referência da mídia';
+$lang['refshow']               = 'Número de referências de mídia a exibir';
+$lang['gdlib']                 = 'Versão da biblioteca "GD Lib"';
+$lang['im_convert']            = 'Caminho para a ferramenta de conversão ImageMagick';
+$lang['jpg_quality']           = 'Qualidade de compressão do JPG (0-100)';
+$lang['fetchsize']             = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior';
+$lang['subscribers']           = 'Habilitar o suporte ao monitoramento de páginas';
+$lang['subscribe_time']        = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days';
+$lang['notify']                = 'Enviar notificações de mudança para esse endereço de e-mail';
+$lang['registernotify']        = 'Enviar informações de usuários registrados para esse endereço de e-mail';
+$lang['mailfrom']              = 'Endereço de e-mail a ser utilizado para mensagens automáticas';
+$lang['mailprefix']            = 'Prefixo do assunto dos e-mails de envio automático';
+$lang['htmlmail']              = 'Enviar e-mail HTML multipartes, que têm uma aparência melhor, mas um tamanho maior. Desabilite para enviar e-mails em texto puro.';
+$lang['sitemap']               = 'Gerar Google Sitemap (dias)';
+$lang['rss_type']              = 'Tipo de fonte XML';
+$lang['rss_linkto']            = 'Os links da fonte XML apontam para';
+$lang['rss_content']           = 'O que deve ser exibido nos itens da fonte XML?';
+$lang['rss_update']            = 'Intervalo de atualização da fonte XML (seg)';
+$lang['rss_show_summary']      = 'Resumo de exibição da fonte XML no título';
+$lang['rss_media']             = 'Que tipo de alterações devem ser listadas na fonte XML?';
 $lang['updatecheck']           = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.';
 $lang['userewrite']            = 'Usar URLs "limpas"';
 $lang['useslash']              = 'Usar a barra como separador de espaços de nomes nas URLs';
-$lang['usedraft']              = 'Salvar o rascunho automaticamente durante a edição';
 $lang['sepchar']               = 'Separador de palavras no nome da página';
 $lang['canonical']             = 'Usar URLs absolutas (http://servidor/caminho)';
 $lang['fnencode']              = 'Método de codificação não-ASCII de nome de arquivos.';
 $lang['autoplural']            = 'Verificar formas plurais nos links';
 $lang['compression']           = 'Método de compressão para arquivos antigos';
-$lang['cachetime']             = 'Tempo máximo para o cache (seg)';
-$lang['locktime']              = 'Tempo máximo para o bloqueio de arquivos (seg)';
-$lang['fetchsize']             = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior';
-$lang['notify']                = 'Enviar notificações de mudança para esse endereço de e-mail';
-$lang['registernotify']        = 'Enviar informações de usuários registrados para esse endereço de e-mail';
-$lang['mailfrom']              = 'Endereço de e-mail a ser utilizado para mensagens automáticas';
-$lang['mailprefix']            = 'Prefixo do assunto dos e-mails de envio automático';
 $lang['gzip_output']           = 'Usar "Content-Encoding" do gzip para o código xhtml';
-$lang['gdlib']                 = 'Versão da biblioteca "GD Lib"';
-$lang['im_convert']            = 'Caminho para a ferramenta de conversão ImageMagick';
-$lang['jpg_quality']           = 'Qualidade de compressão do JPG (0-100)';
-$lang['subscribers']           = 'Habilitar o suporte ao monitoramento de páginas';
-$lang['subscribe_time']        = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days';
 $lang['compress']              = 'Compactar as saídas de CSS e JavaScript';
 $lang['cssdatauri']            = 'Tamanho máximo em bytes para o qual as imagens referenciadas em arquivos CSS devam ser incorporadas na folha de estilos (o arquivo CSS) para reduzir o custo dos pedidos HTTP. Essa técnica não funcionará na versões do IE < 8!  Valores de <code>400</code> a <code>600</code> são bons. Defina o valor <code>0</code> para desativar.';
-$lang['hidepages']             = 'Esconder páginas correspondentes (expressão regular)';
 $lang['send404']               = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes';
-$lang['sitemap']               = 'Gerar Google Sitemap (dias)';
 $lang['broken_iua']            = 'A função "ignore_user_abort" está com defeito no seu sistema? Isso pode causar um índice de busca defeituoso. IIS+PHP/CGI reconhecidamente possui esse erro. Veja o <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">bug 852</a> para mais informações.';
 $lang['xsendfile']             = 'Usar o cabeçalho "X-Sendfile" para permitir que o servidor web encaminhe arquivos estáticos? Seu servidor web precisa ter suporte a isso.';
 $lang['renderer_xhtml']        = 'Renderizador a ser utilizado para a saída principal (xhtml) do wiki';
 $lang['renderer__core']        = '%s (núcleo do DokuWiki)';
 $lang['renderer__plugin']      = '%s ("plug-in")';
-$lang['rememberme']            = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")';
-$lang['rss_type']              = 'Tipo de fonte XML';
-$lang['rss_linkto']            = 'Os links da fonte XML apontam para';
-$lang['rss_content']           = 'O que deve ser exibido nos itens da fonte XML?';
-$lang['rss_update']            = 'Intervalo de atualização da fonte XML (seg)';
-$lang['recent_days']           = 'Quantas mudanças recentes devem ser mantidas (dias)?';
-$lang['rss_show_summary']      = 'Resumo de exibição da fonte XML no título';
-$lang['target____wiki']        = 'Parâmetro "target" para links internos';
-$lang['target____interwiki']   = 'Parâmetro "target" para links interwiki';
-$lang['target____extern']      = 'Parâmetro "target" para links externos';
-$lang['target____media']       = 'Parâmetro "target" para links de mídia';
-$lang['target____windows']     = 'Parâmetro "target" para links do Windows';
+$lang['dnslookups']            = 'O DokuWiki procurará pelo nome de host dos endereços IP remotos dos usuários que estão editando as páginas. Caso você tenha um DNS lento, ele não esteja funcionando ou, ainda, você não queira esse recurso, desabilite essa opção.';
 $lang['proxy____host']         = 'Nome do servidor proxy';
 $lang['proxy____port']         = 'Porta do proxy';
 $lang['proxy____user']         = 'Nome de usuário do proxy';
diff --git a/lib/plugins/popularity/lang/pt-br/intro.txt b/lib/plugins/popularity/lang/pt-br/intro.txt
index 306cb2820..e07aa0ac3 100644
--- a/lib/plugins/popularity/lang/pt-br/intro.txt
+++ b/lib/plugins/popularity/lang/pt-br/intro.txt
@@ -1,9 +1,9 @@
 ====== Retorno de Popularidade ======
 
-Essa ferramenta coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real.
+Essa [[doku>popularity|ferramenta]] coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real.
 
 Você é encorajado a repetir esse procedimento de tempos em tempos, para manter os desenvolvedores informados quando o seu wiki for alterado. Seus pacotes de dados repetidos serão categorizados por uma identificação anônima.
 
 Os dados coletados contém informações do tipo: a versão do seu DokuWiki, o número e tamanho das suas páginas e arquivos, plug-ins instalados e informações sobre a sua instalação do PHP.
 
-Os dados brutos que serão enviados é mostrado abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação.
+Os dados brutos que serão enviados serão exibidos abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação.
-- 
cgit v1.2.3


From db770f698b9d190dce389ce0a29b84eaa333dff8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 12 Oct 2012 15:41:25 +0100
Subject: fixed typo in style.ini

---
 lib/tpl/default/style.ini  | 2 +-
 lib/tpl/dokuwiki/style.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index 726c2025d..0706303d0 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -3,7 +3,7 @@
 
 ; To extend this file or make changes to it, it is recommended to create
 ; a style.local.ini file to prevent losing any changes after an upgrade.
-; Please don't forgot to copy the section your changes should be under
+; Please don't forget to copy the section your changes should be under
 ; (i.e. [stylesheets] or [replacements]) into that file as well.
 
 ; Define the stylesheets your template uses here. The second value
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 1402f751a..d5cc68852 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -3,7 +3,7 @@
 
 ; To extend this file or make changes to it, it is recommended to create
 ; a style.local.ini file to prevent losing any changes after an upgrade.
-; Please don't forgot to copy the section your changes should be under
+; Please don't forget to copy the section your changes should be under
 ; (i.e. [stylesheets] or [replacements]) into that file as well.
 
 ; Define the stylesheets your template uses here. The second value
-- 
cgit v1.2.3


From 1586bc3488e4f51d3ce69662f9be7fce5c4f7673 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 12 Oct 2012 20:08:52 +0100
Subject: improved tab styles

* added more selectors to allow different markup
* added border to make tabs more distinctive, especially in other templates
---
 lib/tpl/dokuwiki/css/_media_fullscreen.css | 25 ++++++++++++----
 lib/tpl/dokuwiki/css/_tabs.css             | 47 ++++++++++++++++++++++++------
 2 files changed, 57 insertions(+), 15 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index c67e16051..8d5e1e8ca 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -91,24 +91,35 @@
     text-align: right;
 }
 
+/* make it look like a tab (as in _tabs.css) */
 #mediamanager__page .namespaces h2 {
     font-size: 1em;
     display: inline-block;
-    border-width: 0;
     padding: .3em .8em;
-    margin: 0 .3em 0 0;
+    margin: 0 0 0 .3em;
     border-radius: .5em .5em 0 0;
     font-weight: normal;
     background-color: __background_alt__;
     color: __text__;
+    border: 1px solid __border__;
+    border-bottom-color: __background_alt__;
     line-height: 1.4em;
+    position: relative;
+    bottom: -1px;
+    z-index: 2;
 }
 * html #mediamanager__page .namespaces h2,
 *+html #mediamanager__page .namespaces h2 {
     display: inline;
 }
 [dir=rtl] #mediamanager__page .namespaces h2 {
-    margin-right: 10px;
+    margin: 0 .3em 0 0;
+    position: relative;
+    right: 10px;
+}
+#mediamanager__page .namespaces .panelHeader {
+    border-top: 1px solid __border__;
+    z-index: 1;
 }
 
 #mediamanager__page .namespaces ul {
@@ -165,10 +176,12 @@
 
 #mediamanager__page .panelHeader ul li.listType {
     padding-left: 30px;
+    margin: 0 0 0 5px;
     background: url('../../images/icon-list.png') 3px 1px no-repeat;
 }
 #mediamanager__page .panelHeader ul li.sortBy {
     padding-left: 30px;
+    margin: 0 0 0 5px;
     background: url('../../images/icon-sort.png') 3px 1px no-repeat;
 }
 
@@ -185,10 +198,10 @@
 
 #mediamanager__page .filelist ul {
     padding: 0;
-    margin: 0;
+    margin: 0 10px 0 0;
 }
-[dir=rtl] #mediamanager__page .filelist ul.tabs {
-    margin-right: 10px;
+[dir=rtl] #mediamanager__page .filelist ul {
+    margin: 0 10px 0 0;
 }
 
 #mediamanager__page .filelist .panelContent ul li:hover {
diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css
index 1dffa8f7b..845ec9a57 100644
--- a/lib/tpl/dokuwiki/css/_tabs.css
+++ b/lib/tpl/dokuwiki/css/_tabs.css
@@ -2,40 +2,56 @@
  * This file provides the styles for general tabs.
  */
 
+.dokuwiki .tabs > ul,
 .dokuwiki ul.tabs {
     padding: 0;
     margin: 0;
     overflow: hidden;
+    position: relative;
 }
+/* border underneath */
+.dokuwiki .tabs > ul:after,
+.dokuwiki ul.tabs:after {
+    position: absolute;
+    content: "";
+    width: 100%;
+    bottom: 0;
+    left: 0;
+    border-bottom: 1px solid __border__;
+    z-index: 1;
+}
+
+.dokuwiki .tabs > ul li,
 .dokuwiki ul.tabs li {
     float: left;
     padding: 0;
     margin: 0;
     list-style: none;
 }
+[dir=rtl] .dokuwiki .tabs > ul li,
 [dir=rtl] .dokuwiki ul.tabs li {
     float: right;
 }
 
+.dokuwiki .tabs > ul li a,
 .dokuwiki ul.tabs li strong,
 .dokuwiki ul.tabs li a {
-    float: left;
+    display: inline-block;
     padding: .3em .8em;
-    margin: 0 .3em 0 0;
+    margin: 0 0 0 .3em;
     background-color: __background_neu__;
     color: __text__;
+    border: 1px solid __border__;
     border-radius: .5em .5em 0 0;
+    position: relative;
+    z-index: 0;
 }
+[dir=rtl] .dokuwiki .tabs > ul li a,
 [dir=rtl] .dokuwiki ul.tabs li strong,
 [dir=rtl] .dokuwiki ul.tabs li a {
-    float: right;
-    margin: 0 0 0 .3em;
-}
-*+html[dir=rtl] .dokuwiki ul.tabs li strong,
-*+html[dir=rtl] .dokuwiki ul.tabs li a {
-    float: none;
-    display: inline-block;
+    margin: 0 .3em 0 0;
 }
+
 .dokuwiki ul.tabs li strong {
     font-weight: normal;
 }
@@ -43,6 +59,11 @@
 .dokuwiki ul.tabs li a:link,
 .dokuwiki ul.tabs li a:visited {
 }
+.dokuwiki .tabs > ul li a:hover,
+.dokuwiki .tabs > ul li a:active,
+.dokuwiki .tabs > ul li a:focus,
+.dokuwiki .tabs > ul li .curid a,
+.dokuwiki .tabs > ul .active a,
 .dokuwiki ul.tabs li a:hover,
 .dokuwiki ul.tabs li a:active,
 .dokuwiki ul.tabs li a:focus,
@@ -50,4 +71,12 @@
     background-color: __background_alt__;
     color: __text__;
     text-decoration: none;
+    font-weight: normal;
+}
+
+.dokuwiki .tabs > ul li .curid a,
+.dokuwiki .tabs > ul li .active a,
+.dokuwiki ul.tabs li strong {
+    z-index: 2;
+    border-bottom-color: __background_alt__;
 }
-- 
cgit v1.2.3


From 0c49c5d6c2b38fdcf269e570dd7948632d3b23ff Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 12 Oct 2012 22:52:07 +0100
Subject: moved some styles around

---
 lib/styles/screen.css              |   6 +-
 lib/tpl/dokuwiki/css/basic.css     |  73 ++++++------
 lib/tpl/dokuwiki/css/content.css   | 227 +++++++++++++++++++++++++++++++++----
 lib/tpl/dokuwiki/css/design.css    | 206 ---------------------------------
 lib/tpl/dokuwiki/template.info.txt |   4 +-
 5 files changed, 248 insertions(+), 268 deletions(-)

(limited to 'lib')

diff --git a/lib/styles/screen.css b/lib/styles/screen.css
index 8ada48932..119878f9b 100644
--- a/lib/styles/screen.css
+++ b/lib/styles/screen.css
@@ -73,12 +73,16 @@ div.notify {
    (e.g. for screen readers or to keep access keys working) */
 .a11y {
     position: absolute !important;
-    left: -10000px !important;
+    left: -99999em !important;
     top: auto !important;
     width: 1px !important;
     height: 1px !important;
     overflow: hidden !important;
 }
+[dir=rtl] .a11y {
+    left: auto !important;
+    right: -99999em !important;
+}
 
 /* syntax highlighting code */
 .code .br0  { color: #66cc66; }
diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index 55c1d2dfe..539ccd715 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -43,6 +43,16 @@ legend {
     line-height: 1.2;
     clear: left; /* ideally 'both', but problems with toc */
 }
+[dir=rtl] h1,
+[dir=rtl] h2,
+[dir=rtl] h3,
+[dir=rtl] h4,
+[dir=rtl] h5,
+[dir=rtl] h6,
+[dir=rtl] caption,
+[dir=rtl] legend {
+    clear: right;
+}
 
 h1 {
     font-size: 2em;
@@ -99,11 +109,20 @@ ul,
 ol {
     padding: 0 0 0 1.5em;
 }
+[dir=rtl] ul,
+[dir=rtl] ol {
+    padding: 0 1.5em 0 0;
+}
+
 li,
 dd {
     padding: 0;
     margin: 0 0 0 1.5em;
 }
+[dir=rtl] li,
+[dir=rtl] dd {
+    margin: 0 1.5em 0 0;
+}
 dt {
     font-weight: bold;
     margin: 0;
@@ -145,6 +164,9 @@ caption {
     text-align: left;
     margin: 0 0 .3em;
 }
+[dir=rtl] caption {
+    text-align: right;
+}
 
 th,
 td {
@@ -158,6 +180,10 @@ th {
     font-weight: bold;
     background-color: __background_alt__;
 }
+[dir=rtl] td,
+[dir=rtl] th {
+    text-align: right;
+}
 
 
 /*____________ links ____________*/
@@ -225,10 +251,14 @@ kbd {
     font-size: 1em;
     direction: ltr;
     text-align: left;
+    background-color: __background_alt__;
+    color: __text__;
 }
 pre {
     overflow: auto;
     word-wrap: normal;
+    border: 1px solid __border__;
+    padding: .7em 1em;
 }
 
 blockquote {
@@ -236,6 +266,9 @@ blockquote {
     border: solid __border__;
     border-width: 0 0 0 .25em;
 }
+[dir=rtl] blockquote {
+    border-width: 0 .25em 0 0;
+}
 q:before,
 q:after {
     content: '';
@@ -343,6 +376,10 @@ button,
     padding: .1em .5em;
     cursor: pointer;
 }
+#IE7 input.button,
+#IE7 button {
+    line-height: 1.4;
+}
 
 input[type=submit]:hover,
 input[type=submit]:active,
@@ -379,39 +416,3 @@ input[readonly],
 button[readonly] {
     cursor: auto;
 }
-
-/*____________ rtl corrections ____________*/
-
-[dir=rtl] caption,
-[dir=rtl] td,
-[dir=rtl] th {
-    text-align: right;
-}
-
-[dir=rtl] ul,
-[dir=rtl] ol {
-    padding: 0 1.5em 0 0;
-}
-[dir=rtl] li,
-[dir=rtl] dd {
-    margin: 0 1.5em 0 0;
-}
-[dir=rtl] blockquote {
-    border-width: 0 .25em 0 0;
-}
-
-[dir=rtl] h1,
-[dir=rtl] h2,
-[dir=rtl] h3,
-[dir=rtl] h4,
-[dir=rtl] h5,
-[dir=rtl] h6,
-[dir=rtl] caption,
-[dir=rtl] legend {
-    clear: right;
-}
-
-[dir=rtl] .a11y {
-    left: auto;
-    right: -9000px;
-}
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index 1d3ae8c01..aae83570d 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -82,6 +82,7 @@
 
 /*____________ tables ____________*/
 
+/* div around each table */
 .dokuwiki div.table {
     overflow-x: auto;
     margin-bottom: 1.4em;
@@ -92,17 +93,6 @@
 
 .dokuwiki table.inline {
     min-width: 50%;
-    border-width: 0;
-}
-.dokuwiki table.inline th,
-.dokuwiki table.inline td {
-    border: 1px solid __border__;
-}
-.dokuwiki table.inline th {
-    color: inherit;
-    background-color: __background_alt__;
-}
-.dokuwiki table.inline td {
 }
 .dokuwiki table.inline tr:hover td {
     background-color: __background_alt__;
@@ -114,22 +104,11 @@
 
 /*____________ code ____________*/
 
-.dokuwiki pre,
-.dokuwiki tt,
-.dokuwiki code,
-.dokuwiki samp,
-.dokuwiki kbd {
-    background-color: __background_alt__;
-    color: __text__;
-}
 /* fix if background-color hides underlining */
 .dokuwiki em.u code {
     text-decoration: underline;
 }
-.dokuwiki pre {
-    border: 1px solid __border__;
-    padding: .75em 1em;
-}
+
 /* for code in <file> */
 .dokuwiki pre.file {
 }
@@ -175,3 +154,205 @@
     clear: left;
 }
 
+
+/*____________ JS popup ____________*/
+
+.JSpopup {
+    background-color: __background__;
+    color: __text__;
+    border: 1px solid __border__;
+    box-shadow: .1em .1em .1em __border__;
+    border-radius: 2px;
+    padding: .3em .5em;
+    font-size: .9em;
+}
+.dokuwiki form.search div.ajax_qsearch {
+    top: -.35em;
+    font-size: 1em;
+    text-overflow: ellipsis;
+}
+
+.JSpopup ul,
+.JSpopup ol {
+    padding-left: 0;
+}
+[dir=rtl] .JSpopup ul,
+[dir=rtl] .JSpopup ol {
+    padding-right: 0;
+}
+
+
+/* changes to underscored CSS files
+********************************************************************/
+
+#acl__tree li {
+    margin: 0;
+}
+
+#dokuwiki__content span.curid a {
+    font-weight: normal;
+}
+#dokuwiki__content strong span.curid a {
+    font-weight: bold;
+}
+
+
+/*____________ changes to _edit ____________*/
+
+.dokuwiki div.toolbar button.toolbutton {
+    border-radius: 0;
+    border-left-width: 0;
+    padding: .1em .35em;
+}
+.dokuwiki div.toolbar button.toolbutton:first-child {
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    border-left-width: 1px;
+}
+[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-left-width: 0;
+    border-right-width: 1px;
+}
+.dokuwiki div.toolbar button.toolbutton:last-child {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+}
+[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child {
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-left-width: 1px;
+}
+
+.dokuwiki div.section_highlight {
+    margin-left:  -2em;
+    margin-right: -2em;
+    padding-left: 1em;
+    padding-right: 1em;
+    border-width: 0 1em;
+}
+[dir=rtl] .dokuwiki div.section_highlight {
+    margin-right: -2em;
+    border-right-width: 1em;
+}
+
+.dokuwiki textarea.edit {
+    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
+}
+
+.dokuwiki div.preview {
+    margin: 0 -2em;
+    padding: 0 2em;
+}
+.dokuwiki.hasSidebar div.preview {
+    border-right: __sidebar_width__ solid __background_alt__;
+}
+[dir=rtl] .dokuwiki.hasSidebar div.preview {
+    border-right-width: 0;
+    border-left: __sidebar_width__ solid __background_alt__;
+}
+.dokuwiki div.preview div.pad {
+    padding: 1.556em 0 2em;
+}
+
+
+/*____________ changes to _toc ____________*/
+
+#dw__toc {
+    margin:  -1.556em -2em .5em 1.4em;
+    width: __sidebar_width__;
+    border-left: 1px solid __border__;
+    background: __background__;
+    color: inherit;
+}
+[dir=rtl] #dw__toc {
+    margin: -1.556em 1.4em .5em -2em;
+    border-left-width: 0;
+    border-right: 1px solid __border__;
+}
+
+.dokuwiki h3.toggle {
+    padding: .5em 1em;
+    margin-bottom: 0;
+    font-size: .875em;
+    letter-spacing: .1em;
+}
+#dokuwiki__aside h3.toggle {
+    display: none;
+}
+
+.dokuwiki .toggle strong {
+    background: transparent url(images/toc-arrows.png) 0 0;
+    width: 8px;
+    height: 5px;
+    margin: .4em 0 0;
+}
+.dokuwiki .toggle.closed strong {
+    background-position: 0 -5px;
+}
+
+.dokuwiki .toggle strong span {
+    display: none;
+}
+
+
+#dw__toc > div {
+    font-size: 0.875em;
+    padding: .5em 1em 1em;
+}
+#dw__toc ul {
+    padding: 0 0 0 1.2em;
+}
+[dir=rtl] #dw__toc ul {
+    padding: 0 1.5em 0 0;
+}
+#dw__toc ul li {
+    list-style-image: url(images/toc-bullet.png);
+}
+#dw__toc ul li.clear {
+    list-style: none;
+}
+#dw__toc ul li div.li {
+    padding: .2em 0;
+}
+
+
+/*____________ changes to _imgdetail ____________*/
+
+#dokuwiki__detail {
+    padding: 0;
+}
+#dokuwiki__detail img {
+    float: none;
+    margin-bottom: 1.4em;
+}
+#dokuwiki__detail div.img_detail {
+    float: none;
+}
+
+#dokuwiki__detail div.img_detail dl {
+    overflow: hidden;
+}
+#dokuwiki__detail div.img_detail dl dt {
+    float: left;
+    width: 9em;
+    text-align: right;
+    clear: left;
+}
+[dir=rtl] #dokuwiki__detail div.img_detail dl dt {
+    float: right;
+    text-align: left;
+    clear: right;
+}
+#dokuwiki__detail div.img_detail dl dd {
+    margin-left: 9.5em;
+}
+[dir=rtl] #dokuwiki__detail div.img_detail dl dd {
+    margin-left: 0;
+    margin-right: 9.5em;
+}
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 87610663d..2c2109228 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -364,217 +364,11 @@
     text-align: left;
 }
 
-/*____________ misc ____________*/
-
 /* license note under edit window */
 .dokuwiki div.license {
     font-size: 93.75%;
 }
 
-#IE7 .dokuwiki input.button,
-#IE7 .dokuwiki button {
-    line-height: 1.4;
-}
-
-#acl__tree li {
-    margin: 0;
-}
-
-#dokuwiki__content span.curid a {
-    font-weight: normal;
-}
-#dokuwiki__content strong span.curid a {
-    font-weight: bold;
-}
-
-
-/*____________ changes to _edit ____________*/
-
-.dokuwiki div.toolbar button.toolbutton {
-    border-radius: 0;
-    border-left-width: 0;
-    padding: .1em .35em;
-}
-.dokuwiki div.toolbar button.toolbutton:first-child {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-left-width: 1px;
-}
-[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-left-width: 0;
-    border-right-width: 1px;
-}
-.dokuwiki div.toolbar button.toolbutton:last-child {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}
-[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-left-width: 1px;
-}
-
-.dokuwiki div.section_highlight {
-    margin-left:  -2em;
-    margin-right: -2em;
-    padding-left: 1em;
-    padding-right: 1em;
-    border-width: 0 1em;
-}
-[dir=rtl] .dokuwiki div.section_highlight {
-    margin-right: -2em;
-    border-right-width: 1em;
-}
-
-.dokuwiki textarea.edit {
-    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace;
-}
-
-.dokuwiki div.preview {
-    margin: 0 -2em;
-    padding: 0 2em;
-}
-.dokuwiki.hasSidebar div.preview {
-    border-right: __sidebar_width__ solid __background_alt__;
-}
-[dir=rtl] .dokuwiki.hasSidebar div.preview {
-    border-right-width: 0;
-    border-left: __sidebar_width__ solid __background_alt__;
-}
-.dokuwiki div.preview div.pad {
-    padding: 1.556em 0 2em;
-}
-
-
-/*____________ changes to _toc ____________*/
-
-#dw__toc {
-    margin:  -1.556em -2em .5em 1.4em;
-    width: __sidebar_width__;
-    border-left: 1px solid __border__;
-    background: __background__;
-    color: inherit;
-}
-[dir=rtl] #dw__toc {
-    margin: -1.556em 1.4em .5em -2em;
-    border-left-width: 0;
-    border-right: 1px solid __border__;
-}
-
-.dokuwiki h3.toggle {
-    padding: .5em 1em;
-    margin-bottom: 0;
-    font-size: .875em;
-    letter-spacing: .1em;
-}
-#dokuwiki__aside h3.toggle {
-    display: none;
-}
-
-.dokuwiki .toggle strong {
-    background: transparent url(images/toc-arrows.png) 0 0;
-    width: 8px;
-    height: 5px;
-    margin: .4em 0 0;
-}
-.dokuwiki .toggle.closed strong {
-    background-position: 0 -5px;
-}
-
-.dokuwiki .toggle strong span {
-    display: none;
-}
-
-
-#dw__toc > div {
-    font-size: 0.875em;
-    padding: .5em 1em 1em;
-}
-#dw__toc ul {
-    padding: 0 0 0 1.2em;
-}
-[dir=rtl] #dw__toc ul {
-    padding: 0 1.5em 0 0;
-}
-#dw__toc ul li {
-    list-style-image: url(images/toc-bullet.png);
-}
-#dw__toc ul li.clear {
-    list-style: none;
-}
-#dw__toc ul li div.li {
-    padding: .2em 0;
-}
-
-
-/*____________ changes to _imgdetail ____________*/
-
-#dokuwiki__detail {
-    padding: 0;
-}
-#dokuwiki__detail img {
-    float: none;
-    margin-bottom: 1.4em;
-}
-#dokuwiki__detail div.img_detail {
-    float: none;
-}
-
-#dokuwiki__detail div.img_detail dl {
-    overflow: hidden;
-}
-#dokuwiki__detail div.img_detail dl dt {
-    float: left;
-    width: 9em;
-    text-align: right;
-    clear: left;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dt {
-    float: right;
-    text-align: left;
-    clear: right;
-}
-#dokuwiki__detail div.img_detail dl dd {
-    margin-left: 9.5em;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dd {
-    margin-left: 0;
-    margin-right: 9.5em;
-}
-
-
-/*____________ JS popup ____________*/
-
-.JSpopup {
-    background-color: __background__;
-    color: __text__;
-    border: 1px solid __border__;
-    box-shadow: .1em .1em .1em __border__;
-    border-radius: 2px;
-    padding: .3em .5em;
-    font-size: .9em;
-}
-.dokuwiki form.search div.ajax_qsearch {
-    top: -.35em;
-    font-size: 1em;
-    text-overflow: ellipsis;
-}
-
-.JSpopup ul,
-.JSpopup ol {
-    padding-left: 0;
-}
-[dir=rtl] .JSpopup ul,
-[dir=rtl] .JSpopup ol {
-    padding-right: 0;
-}
-
 
 /* footer
 ********************************************************************/
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index dfac2ef4e..a9a55865e 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
-base     dokuwiki
+base     dokuwiki
 author   Anika Henke
 email    anika@selfthinker.org
-date     2012-09-08
+date     2012-10-12
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki
-- 
cgit v1.2.3


From cacfb6067895a011e255d9f940a8dac2fa2c1110 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 12 Oct 2012 23:15:53 +0100
Subject: fixed interwiki and filetype styles being included in all css modes

---
 lib/exe/css.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index ae160558a..1e662c64a 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -122,8 +122,10 @@ function css_out(){
 
         // print the default classes for interwiki links and file downloads
         if ($mediatype == 'screen') {
+            print '@media screen {';
             css_interwiki();
             css_filetypes();
+            print '}';
         }
 
         // load files
-- 
cgit v1.2.3


From 63c25974f5bb7ca4472bc68a2342ac05d42883b5 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 12 Oct 2012 23:31:01 +0100
Subject: removed unnecessary print styles

---
 lib/styles/all.css             |  2 +-
 lib/styles/print.css           | 20 ++++++--------------
 lib/styles/screen.css          |  2 +-
 lib/tpl/dokuwiki/css/print.css | 38 --------------------------------------
 4 files changed, 8 insertions(+), 54 deletions(-)

(limited to 'lib')

diff --git a/lib/styles/all.css b/lib/styles/all.css
index 5d7eb7d14..ff4bd2457 100644
--- a/lib/styles/all.css
+++ b/lib/styles/all.css
@@ -1,5 +1,5 @@
 /**
- * Basic styles. These styles are needed for basic DokuWiki functions
+ * Basic screen and print styles. These styles are needed for basic DokuWiki functions
  * regardless of the used template. Templates can override them of course
  */
 
diff --git a/lib/styles/print.css b/lib/styles/print.css
index 76bc6d3bc..a5c39e889 100644
--- a/lib/styles/print.css
+++ b/lib/styles/print.css
@@ -1,23 +1,15 @@
 /**
- * Basic styles. These styles are needed for basic DokuWiki functions
+ * Basic print styles. These styles are needed for basic DokuWiki functions
  * regardless of the used template. Templates can override them of course
  */
 
-/* messages with msg() */
-div.error,
+div.error, /* messages with msg() */
 div.info,
 div.success,
-div.notify {
-    display: none;
-}
-
-/* section edit button */
-.secedit {
-    display: none;
-}
-
-/* modal windows */
-.JSpopup,
+div.notify,
+.secedit, /* section edit button */
+.a11y, /* accessibly hidden text */
+.JSpopup, /* modal windows */
 #link__wiz {
     display: none;
 }
diff --git a/lib/styles/screen.css b/lib/styles/screen.css
index 119878f9b..241904d7c 100644
--- a/lib/styles/screen.css
+++ b/lib/styles/screen.css
@@ -1,5 +1,5 @@
 /**
- * Basic styles. These styles are needed for basic DokuWiki functions
+ * Basic screen styles. These styles are needed for basic DokuWiki functions
  * regardless of the used template. Templates can override them of course
  */
 
diff --git a/lib/tpl/dokuwiki/css/print.css b/lib/tpl/dokuwiki/css/print.css
index 191d50c28..d30bc6c91 100644
--- a/lib/tpl/dokuwiki/css/print.css
+++ b/lib/tpl/dokuwiki/css/print.css
@@ -14,16 +14,11 @@ body {
 
 /* hide certain sections */
 .a11y,
-div.notify,
-div.info,
-div.success,
-div.error,
 #dokuwiki__header .tools,
 #dokuwiki__aside,
 .dokuwiki .breadcrumbs,
 #dw__toc,
 h3.toggle,
-.dokuwiki .secedit,
 #dokuwiki__pagetools,
 #dokuwiki__footer {
     display: none;
@@ -57,14 +52,11 @@ h3.toggle,
     list-style-type: lower-roman;
 }
 
-/* undo icons */
 .dokuwiki a:link,
 .dokuwiki a:visited {
     text-decoration: underline;
     color: #333;
     background-color: inherit;
-    background-image: none;
-    padding: 0;
 }
 
 /* display href after link */
@@ -94,42 +86,12 @@ a.mail:after {
 }
 .dokuwiki img.medialeft {
     margin: .2em 1em .2em 0;
-    float: left;
 }
 .dokuwiki img.mediaright {
     margin: .2em 0 .2em 1em;
-    float: right;
 }
 .dokuwiki img.mediacenter {
     margin: .2em auto;
-    display: block;
-}
-
-/* align table cells */
-.dokuwiki .leftalign {
-    text-align: left;
-}
-.dokuwiki .centeralign {
-    text-align: center;
-}
-.dokuwiki .rightalign {
-    text-align: right;
-}
-
-/* underline */
-.dokuwiki em.u {
-    font-style: normal;
-    text-decoration: underline;
-}
-.dokuwiki em em.u {
-    font-style: italic;
-}
-
-div.clearer {
-    clear: both;
-    line-height: 0;
-    height: 0;
-    overflow: hidden;
 }
 
 .dokuwiki blockquote {
-- 
cgit v1.2.3


From 7ecda050991d21031d59eb064890acdb2ee954ae Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 13 Oct 2012 00:06:25 +0100
Subject: improved section highlighting styles

---
 lib/tpl/dokuwiki/css/_edit.css   | 11 +++--------
 lib/tpl/dokuwiki/css/content.css | 10 ++--------
 lib/tpl/dokuwiki/css/mobile.css  |  6 ++----
 3 files changed, 7 insertions(+), 20 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index bae69ad96..0c66c75b7 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -135,15 +135,10 @@ div.picker button.toolbutton {
     font-size: 75%;
 }
 
-/* generic style for section highlighting (including headings) */
-.dokuwiki .section_highlight {
-}
-/* style for section highlighting (only sections below headings) */
+/* style for section highlighting */
 .dokuwiki div.section_highlight {
-    margin-left: -1em; /* negative side margin = side padding + side border */
-    margin-right: -1em; /* negative side margin = side padding + side border */
-    padding-left: .5em;
-    padding-right: .5em;
+    margin: 0 -1em; /* negative side margin = side padding + side border */
+    padding: 0 .5em;
     border: solid __background_alt__;
     border-width: 0 .5em;
 }
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index aae83570d..a714869db 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -230,16 +230,10 @@
 }
 
 .dokuwiki div.section_highlight {
-    margin-left:  -2em;
-    margin-right: -2em;
-    padding-left: 1em;
-    padding-right: 1em;
+    margin: 0 -2em;
+    padding: 0 1em;
     border-width: 0 1em;
 }
-[dir=rtl] .dokuwiki div.section_highlight {
-    margin-right: -2em;
-    border-right-width: 1em;
-}
 
 .dokuwiki textarea.edit {
     font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 7f106b046..501e53a54 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -92,10 +92,8 @@
 
 /* _edit */
 .dokuwiki div.section_highlight {
-    margin-left: -1em;
-    margin-right: -1em;
-    padding-left: .5em;
-    padding-right: .5em;
+    margin: 0 -1em;
+    padding: 0 .5em;
     border-width: 0 .5em;
 }
 .dokuwiki div.preview {
-- 
cgit v1.2.3


From 90104b138051e1fbecfc8a13f512a3794fec93c8 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 13 Oct 2012 11:33:56 +0100
Subject: beautified code blocks, also using lighter background colour
 (FS#2444)

---
 lib/tpl/dokuwiki/css/basic.css   |  6 +++++-
 lib/tpl/dokuwiki/css/content.css | 17 +++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index 539ccd715..27ca84cdf 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -251,13 +251,17 @@ kbd {
     font-size: 1em;
     direction: ltr;
     text-align: left;
-    background-color: __background_alt__;
+    background-color: __background_site__;
     color: __text__;
+    box-shadow: inset 0 0 .3em __border__;
+    border-radius: 2px;
 }
 pre {
     overflow: auto;
     word-wrap: normal;
     border: 1px solid __border__;
+    border-radius: 2px;
+    box-shadow: inset 0 0 .5em __border__;
     padding: .7em 1em;
 }
 
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index a714869db..437ad7b05 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -120,15 +120,15 @@
 
 .dokuwiki dl.code dt,
 .dokuwiki dl.file dt {
-    background-color: __background_alt__;
+    background-color: __background_site__;
     /*background: -moz-linear-gradient(   top, __background__ 0%, __background_alt__ 100%); see FS#2447 */
-    background: -webkit-linear-gradient(top, __background__ 0%, __background_alt__ 100%);
-    background: -o-linear-gradient(     top, __background__ 0%, __background_alt__ 100%);
-    background: -ms-linear-gradient(    top, __background__ 0%, __background_alt__ 100%);
-    background: linear-gradient(        top, __background__ 0%, __background_alt__ 100%);
+    background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%);
+    background: -o-linear-gradient(     top, __background_alt__ 0%, __background_site__ 100%);
+    background: -ms-linear-gradient(    top, __background_alt__ 0%, __background_site__ 100%);
+    background: linear-gradient(        top, __background_alt__ 0%, __background_site__ 100%);
     color: inherit;
     border: 1px solid __border__;
-    border-bottom-color: __background_alt__;
+    border-bottom-color: __background_site__;
     border-top-left-radius: .3em;
     border-top-right-radius: .3em;
     padding: .3em .6em .1em;
@@ -154,6 +154,11 @@
     clear: left;
 }
 
+.dokuwiki dl.code pre,
+.dokuwiki dl.file pre {
+    box-shadow: inset -4px -4px .5em -.3em __border__;
+}
+
 
 /*____________ JS popup ____________*/
 
-- 
cgit v1.2.3


From f98e484a45d533262ff2e9f4359dc02da66a257b Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 13 Oct 2012 12:09:40 +0100
Subject: RTL and IE7 fixes for code blocks

---
 lib/tpl/dokuwiki/css/basic.css   |  1 -
 lib/tpl/dokuwiki/css/content.css | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index 27ca84cdf..8b7447239 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -38,7 +38,6 @@ caption,
 legend {
     font-family: Arial, sans-serif;
     font-weight: bold;
-    background-color: inherit;
     padding: 0;
     line-height: 1.2;
     clear: left; /* ideally 'both', but problems with toc */
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.css
index 437ad7b05..c23612643 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.css
@@ -121,7 +121,7 @@
 .dokuwiki dl.code dt,
 .dokuwiki dl.file dt {
     background-color: __background_site__;
-    /*background: -moz-linear-gradient(   top, __background__ 0%, __background_alt__ 100%); see FS#2447 */
+    /* background: -moz-linear-gradient(   top, __background_alt__ 0%, __background_site__ 100%); see FS#2447 */
     background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%);
     background: -o-linear-gradient(     top, __background_alt__ 0%, __background_site__ 100%);
     background: -ms-linear-gradient(    top, __background_alt__ 0%, __background_site__ 100%);
@@ -137,8 +137,7 @@
 }
 [dir=rtl] .dokuwiki dl.code dt,
 [dir=rtl] .dokuwiki dl.file dt {
-    margin-left: 0;
-    margin-right: 1em;
+    float: right;
 }
 .dokuwiki dl.code dt a,
 .dokuwiki dl.file dt a {
@@ -148,10 +147,16 @@
     display: block;
     min-height: 16px;
 }
+
 .dokuwiki dl.code dd,
 .dokuwiki dl.file dd {
     margin: 0;
     clear: left;
+    min-height: 1px; /* for IE7 */
+}
+[dir=rtl] .dokuwiki dl.code dd,
+[dir=rtl] .dokuwiki dl.file dd {
+    clear: right;
 }
 
 .dokuwiki dl.code pre,
-- 
cgit v1.2.3


From 58789954a7642c133920f37a51fd3dbb5d76cbde Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 23 Oct 2012 18:08:57 +0200
Subject: correctly check hash parameter in media dispatcher FS#2648

---
 lib/exe/fetch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/exe/fetch.php b/lib/exe/fetch.php
index e8f189256..52e7ebe1e 100644
--- a/lib/exe/fetch.php
+++ b/lib/exe/fetch.php
@@ -157,7 +157,7 @@ function checkFileStatus(&$media, &$file, $rev='') {
   //media to local file
   if(preg_match('#^(https?)://#i',$media)){
     //check hash
-    if(substr(md5(auth_cookiesalt().$media),0,6) != $INPUT->str('hash')){
+    if(substr(md5(auth_cookiesalt().$media),0,6) !== $INPUT->str('hash')){
       return array( 412, 'Precondition Failed');
     }
     //handle external images
-- 
cgit v1.2.3


From b8faabb62f51d6a99c5a49b03d969db5f53d594a Mon Sep 17 00:00:00 2001
From: "sh.khmit" <sh.khamit@gmail.com>
Date: Tue, 23 Oct 2012 18:16:42 +0200
Subject: Kazach language update

---
 lib/plugins/acl/lang/kk/lang.php         | 4 ++++
 lib/plugins/usermanager/lang/kk/lang.php | 3 +++
 2 files changed, 7 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/kk/lang.php b/lib/plugins/acl/lang/kk/lang.php
index dde5b9577..f21b93132 100644
--- a/lib/plugins/acl/lang/kk/lang.php
+++ b/lib/plugins/acl/lang/kk/lang.php
@@ -4,3 +4,7 @@
  *
  * @author Nurgozha Kaliaskarov astana08@gmail.com
  */
+$lang['acl_group']             = 'Группа';
+$lang['acl_user']              = 'Пайдаланушы';
+$lang['page']                  = 'Бет';
+$lang['acl_perm1']             = 'Оқу';
diff --git a/lib/plugins/usermanager/lang/kk/lang.php b/lib/plugins/usermanager/lang/kk/lang.php
index dde5b9577..b1bbd39ec 100644
--- a/lib/plugins/usermanager/lang/kk/lang.php
+++ b/lib/plugins/usermanager/lang/kk/lang.php
@@ -4,3 +4,6 @@
  *
  * @author Nurgozha Kaliaskarov astana08@gmail.com
  */
+$lang['user_id']               = 'Пайдаланушы';
+$lang['user_pass']             = 'Шартты белгi';
+$lang['user_mail']             = 'E-mail';
-- 
cgit v1.2.3


From 39e0d5142d842ff9fcba090a320cc1cddcc4d919 Mon Sep 17 00:00:00 2001
From: "sh.khmit" <sh.khamit@gmail.com>
Date: Tue, 23 Oct 2012 18:17:17 +0200
Subject: russian language update

---
 lib/plugins/config/lang/ru/lang.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/ru/lang.php b/lib/plugins/config/lang/ru/lang.php
index 84dce4a67..36e04686d 100644
--- a/lib/plugins/config/lang/ru/lang.php
+++ b/lib/plugins/config/lang/ru/lang.php
@@ -39,6 +39,7 @@ $lang['_editing']              = 'Параметры правки';
 $lang['_links']                = 'Параметры ссылок';
 $lang['_media']                = 'Параметры медиафайлов';
 $lang['_notifications']        = 'Параметры уведомлений';
+$lang['_syndication']          = 'Настройки синдикаций';
 $lang['_advanced']             = 'Тонкая настройка';
 $lang['_network']              = 'Параметры сети';
 $lang['_plugin_sufix']         = 'Параметры плагина';
@@ -95,6 +96,7 @@ $lang['disableactions_other']  = 'Другие операции (через за
 $lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)';
 $lang['securecookie']          = 'Должны ли куки (cookies), выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.';
 $lang['remote']                = 'Включить систему API для подключений. Это позволит другим приложениям получить доступ к вики через XML-RPC или другие механизмы.';
+$lang['remoteuser']            = 'Дать права для удаленного API доступа пользователям указанным тут (разделять запятыми). Оставьте это поле пустым что бы открыть доступ всем.';
 $lang['usewordblock']          = 'Блокировать спам по ключевым словам';
 $lang['relnofollow']           = 'rel="nofollow" для внешних ссылок';
 $lang['indexdelay']            = 'Задержка перед индексированием';
@@ -129,6 +131,7 @@ $lang['rss_linkto']            = 'Ссылки в RSS';
 $lang['rss_content']           = 'Что отображать в строках XML-ленты?';
 $lang['rss_update']            = 'Интервал обновления XML-ленты (сек.)';
 $lang['rss_show_summary']      = 'Показывать краткую выдержку в заголовках XML-ленты';
+$lang['rss_media']             = 'Какие изменения должны быть отображены в XML?';
 $lang['updatecheck']           = 'Проверять наличие обновлений и предупреждений о безопасности? Для этого «ДокуВики» потребуется связываться с сайтом <a href="http://www.splitbrain.org/">splitbrain.org</a>.';
 $lang['userewrite']            = 'Удобочитаемые адреса (URL)';
 $lang['useslash']              = 'Использовать слэш';
@@ -146,6 +149,7 @@ $lang['xsendfile']             = 'Используете заголовок X-Se
 $lang['renderer_xhtml']        = 'Обработчик основного (xhtml) вывода вики';
 $lang['renderer__core']        = '%s (ядро dokuwiki)';
 $lang['renderer__plugin']      = '%s (плагин)';
+$lang['dnslookups']            = 'DokuWiki ищет DNS имена пользователей редактирующих страницы. Если у вас нет DNS сервера или он работает медленно, рекомендуем отключить эту опцию.';
 $lang['proxy____host']         = 'proxy-адрес';
 $lang['proxy____port']         = 'proxy-порт';
 $lang['proxy____user']         = 'proxy-имя пользователя';
-- 
cgit v1.2.3


From 8036aaf2ed03c0233579841311fc9835e032e4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Merc=C3=A8=20L=C3=B3pez?= <mercelz@gmail.com>
Date: Tue, 23 Oct 2012 18:18:31 +0200
Subject: Spanish language update

---
 lib/plugins/acl/lang/es/lang.php         | 1 +
 lib/plugins/config/lang/es/lang.php      | 1 +
 lib/plugins/plugin/lang/es/lang.php      | 5 +++--
 lib/plugins/popularity/lang/es/lang.php  | 1 +
 lib/plugins/revert/lang/es/lang.php      | 1 +
 lib/plugins/usermanager/lang/es/lang.php | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/es/lang.php b/lib/plugins/acl/lang/es/lang.php
index 8aed3c504..b60033e0f 100644
--- a/lib/plugins/acl/lang/es/lang.php
+++ b/lib/plugins/acl/lang/es/lang.php
@@ -23,6 +23,7 @@
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['admin_acl']             = 'Administración de lista de control de acceso';
 $lang['acl_group']             = 'Grupo';
diff --git a/lib/plugins/config/lang/es/lang.php b/lib/plugins/config/lang/es/lang.php
index b940f13cd..5d03efb60 100644
--- a/lib/plugins/config/lang/es/lang.php
+++ b/lib/plugins/config/lang/es/lang.php
@@ -23,6 +23,7 @@
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['menu']                  = 'Parámetros de configuración';
 $lang['error']                 = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario. <br /> Los valores incorrectos se mostrarán con un marco rojo alrededor.';
diff --git a/lib/plugins/plugin/lang/es/lang.php b/lib/plugins/plugin/lang/es/lang.php
index db91b73c6..ded7d7369 100644
--- a/lib/plugins/plugin/lang/es/lang.php
+++ b/lib/plugins/plugin/lang/es/lang.php
@@ -23,6 +23,7 @@
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['menu']                  = 'Administración de Plugins';
 $lang['download']              = 'Descargar e instalar un nuevo plugin';
@@ -66,6 +67,6 @@ $lang['error_copy']            = 'Hubo un error al copiar el fichero mientras se
 $lang['error_delete']          = 'Hubo un error al intentar eliminar el plugin <em>%s</em>. La causa más probable es que no se cuente con los permisos necesarios en el fichero o en el directorio';
 $lang['enabled']               = 'Plugin %s habilitado.';
 $lang['notenabled']            = 'Plugin %s no puede ser habilitado, verifica los permisos del archivo.';
-$lang['disabled']              = 'Plugin %s desabilitado.';
-$lang['notdisabled']           = 'Plugin %s no puede ser desabilitado, verifica los permisos de archivo.';
+$lang['disabled']              = 'Plugin %s deshabilitado.';
+$lang['notdisabled']           = 'Plugin %s no puede ser deshabilitado, verifica los permisos de archivo.';
 $lang['packageinstalled']      = 'Plugin (%d plugin(s): %s) instalado exitosamente.';
diff --git a/lib/plugins/popularity/lang/es/lang.php b/lib/plugins/popularity/lang/es/lang.php
index 2be2d4a04..e46735782 100644
--- a/lib/plugins/popularity/lang/es/lang.php
+++ b/lib/plugins/popularity/lang/es/lang.php
@@ -20,6 +20,7 @@
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['name']                  = 'Retroinformación (Feedback) plugin Popularity';
 $lang['submit']                = 'Enviar datos';
diff --git a/lib/plugins/revert/lang/es/lang.php b/lib/plugins/revert/lang/es/lang.php
index 3fb02be8e..129d71574 100644
--- a/lib/plugins/revert/lang/es/lang.php
+++ b/lib/plugins/revert/lang/es/lang.php
@@ -21,6 +21,7 @@
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['menu']                  = 'Restaurador';
 $lang['filter']                = 'Buscar páginas con spam';
diff --git a/lib/plugins/usermanager/lang/es/lang.php b/lib/plugins/usermanager/lang/es/lang.php
index b616857a2..521191701 100644
--- a/lib/plugins/usermanager/lang/es/lang.php
+++ b/lib/plugins/usermanager/lang/es/lang.php
@@ -22,6 +22,7 @@
  * @author Oscar Ciudad <oscar@jacho.net>
  * @author Ruben Figols <ruben.figols@gmail.com>
  * @author Gerardo Zamudio <gerardo@gerardozamudio.net>
+ * @author Mercè López mercelz@gmail.com
  */
 $lang['menu']                  = 'Administración de usuarios';
 $lang['noauth']                = '(la autenticación de usuarios no está disponible)';
-- 
cgit v1.2.3


From 990578f7e4f53f6b079ceaf02dee9bd72aab1b77 Mon Sep 17 00:00:00 2001
From: AmirH Hassaneini <mytechmix@gmail.com>
Date: Tue, 23 Oct 2012 18:19:56 +0200
Subject: Persian language update

---
 lib/plugins/acl/lang/fa/lang.php         | 1 +
 lib/plugins/config/lang/fa/lang.php      | 1 +
 lib/plugins/plugin/lang/fa/lang.php      | 1 +
 lib/plugins/popularity/lang/fa/lang.php  | 1 +
 lib/plugins/revert/lang/fa/lang.php      | 1 +
 lib/plugins/usermanager/lang/fa/lang.php | 1 +
 6 files changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/fa/lang.php b/lib/plugins/acl/lang/fa/lang.php
index 8b7d72f51..7fe0f2c43 100644
--- a/lib/plugins/acl/lang/fa/lang.php
+++ b/lib/plugins/acl/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['admin_acl']             = 'مدیریت کنترل دسترسی‌ها';
 $lang['acl_group']             = 'گروه';
diff --git a/lib/plugins/config/lang/fa/lang.php b/lib/plugins/config/lang/fa/lang.php
index ba00d5a2d..34c76780c 100644
--- a/lib/plugins/config/lang/fa/lang.php
+++ b/lib/plugins/config/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['menu']                  = 'تنظیمات پیکر‌بندی';
 $lang['error']                 = 'به دلیل ایراد در مقادیر وارد شده، تنظیمات اعمال نشد، خواهشمندیم تغییرات را مجددن کنترل نمایید و دوباره ارسال کنید.<br/> مقادیر مشکل‌دار با کادر قرمز مشخص شده‌اند.';
diff --git a/lib/plugins/plugin/lang/fa/lang.php b/lib/plugins/plugin/lang/fa/lang.php
index dbfe9ef9a..bc43ee3ef 100644
--- a/lib/plugins/plugin/lang/fa/lang.php
+++ b/lib/plugins/plugin/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['menu']                  = 'مدیریت افزونه‌ها';
 $lang['download']              = 'دریافت و نصب افزونه';
diff --git a/lib/plugins/popularity/lang/fa/lang.php b/lib/plugins/popularity/lang/fa/lang.php
index 600e68077..6a0529891 100644
--- a/lib/plugins/popularity/lang/fa/lang.php
+++ b/lib/plugins/popularity/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['name']                  = 'بازخورد محبوبیت (ممکن است اندکی زمان ببرد)';
 $lang['submit']                = 'ارسال اطلاعات';
diff --git a/lib/plugins/revert/lang/fa/lang.php b/lib/plugins/revert/lang/fa/lang.php
index 34a5c430e..ba20313a3 100644
--- a/lib/plugins/revert/lang/fa/lang.php
+++ b/lib/plugins/revert/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['menu']                  = 'مدیریت برگشت‌ها';
 $lang['filter']                = 'جستجوی صفحات اسپم شده';
diff --git a/lib/plugins/usermanager/lang/fa/lang.php b/lib/plugins/usermanager/lang/fa/lang.php
index 674013474..8176b776b 100644
--- a/lib/plugins/usermanager/lang/fa/lang.php
+++ b/lib/plugins/usermanager/lang/fa/lang.php
@@ -8,6 +8,7 @@
  * @author Omid Mottaghi <omidmr@gmail.com>
  * @author Mohammad Reza Shoaei <shoaei@gmail.com>
  * @author Milad DZand <M.DastanZand@gmail.com>
+ * @author AmirH Hassaneini <mytechmix@gmail.com>
  */
 $lang['menu']                  = 'مدیریت کاربر';
 $lang['noauth']                = '(معتبرسازی کاربر ممکن نیست)';
-- 
cgit v1.2.3


From ac628d80ed1fc2003b4f4ef6e6897d9c9235ae83 Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 26 Oct 2012 00:09:31 +0100
Subject: added cut off points for mobile devices as parameters to style.ini

---
 lib/tpl/dokuwiki/css/mobile.css    | 8 ++++----
 lib/tpl/dokuwiki/style.ini         | 3 +++
 lib/tpl/dokuwiki/template.info.txt | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 501e53a54..88333c012 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -11,9 +11,9 @@
     z-index: 0;
 }
 
-/* up to 979px screen widths
+/* for screen widths in the tablet range
 ********************************************************************/
-@media only screen and (max-width: 979px) {
+@media only screen and (max-width: __tablet_width__) {
 
 #screen__mode {
     z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
@@ -113,9 +113,9 @@
 } /* /@media */
 
 
-/* up to 480px screen widths
+/* for screen widths in the smartphone range
 ********************************************************************/
-@media only screen and (max-width: 480px) {
+@media only screen and (max-width: __phone_width__) {
 
 #screen__mode {
     z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index d5cc68852..67fbb3065 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -74,3 +74,6 @@ __missing__         = "#d30"
 ; site and sidebar widths
 __site_width__      = "75em"
 __sidebar_width__   = "16em"
+; cut off points for mobile devices
+__tablet_width__    = "979px"
+__phone_width__     = "480px"
diff --git a/lib/tpl/dokuwiki/template.info.txt b/lib/tpl/dokuwiki/template.info.txt
index a9a55865e..d32e94d39 100644
--- a/lib/tpl/dokuwiki/template.info.txt
+++ b/lib/tpl/dokuwiki/template.info.txt
@@ -1,7 +1,7 @@
 base     dokuwiki
 author   Anika Henke
 email    anika@selfthinker.org
-date     2012-10-12
+date     2012-10-26
 name     DokuWiki Template
 desc     DokuWiki's default template since 2012
 url      http://www.dokuwiki.org/template:dokuwiki
-- 
cgit v1.2.3


From a7e9a2b1d273a7dec13225a7059539640d0b63f8 Mon Sep 17 00:00:00 2001
From: Aivars Miska <allefm@gmail.com>
Date: Fri, 2 Nov 2012 15:21:45 +0100
Subject: Latvian language update

---
 lib/plugins/config/lang/lv/lang.php | 94 ++++++++++++++++++-------------------
 lib/plugins/plugin/lang/lv/lang.php |  1 +
 2 files changed, 48 insertions(+), 47 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/config/lang/lv/lang.php b/lib/plugins/config/lang/lv/lang.php
index f95697c46..50031d5e5 100644
--- a/lib/plugins/config/lang/lv/lang.php
+++ b/lib/plugins/config/lang/lv/lang.php
@@ -33,25 +33,26 @@ $lang['_template_sufix']       = 'šablona iestatījumi';
 $lang['_msg_setting_undefined'] = 'Nav atrodami iestatījumu metadati';
 $lang['_msg_setting_no_class'] = 'Nav iestatījumu klases';
 $lang['_msg_setting_no_default'] = 'Nav noklusētās vērtības';
-$lang['fmode']                 = 'Tiesības izveidotajiem failiem';
-$lang['dmode']                 = 'Tiesības izveidotajām direktorijām';
-$lang['lang']                  = 'Valoda';
-$lang['basedir']               = 'Saknes direktorija';
-$lang['baseurl']               = 'Saknes adrese (URL)';
-$lang['savedir']               = 'Direktorija datu glabāšanai';
-$lang['start']                 = 'Sākumlapas vārds';
 $lang['title']                 = 'Wiki virsraksts';
+$lang['start']                 = 'Sākumlapas vārds';
+$lang['lang']                  = 'Valoda';
 $lang['template']              = 'Šablons';
 $lang['license']               = 'Ar kādu licenci saturs tiks publicēts?';
-$lang['fullpath']              = 'Norādīt kājenē pilnu lapas ceļu';
+$lang['savedir']               = 'Direktorija datu glabāšanai';
+$lang['basedir']               = 'Saknes direktorija';
+$lang['baseurl']               = 'Saknes adrese (URL)';
+$lang['dmode']                 = 'Tiesības izveidotajām direktorijām';
+$lang['fmode']                 = 'Tiesības izveidotajiem failiem';
+$lang['allowdebug']            = 'Ieslēgt atkļūdošanu. <b>Izslēdz!</b>';
 $lang['recent']                = 'Jaunākie grozījumi';
+$lang['recent_days']           = 'Cik dienas glabāt jaunākās izmaiņas';
 $lang['breadcrumbs']           = 'Apmeklējumu vēstures garums';
 $lang['youarehere']            = 'Rādīt "tu atrodies šeit"';
+$lang['fullpath']              = 'Norādīt kājenē pilnu lapas ceļu';
 $lang['typography']            = 'Veikt tipogrāfijas aizvietošanu';
-$lang['htmlok']                = 'Atļaut iekļautu HTTP';
-$lang['phpok']                 = 'Atļaut iekļautu PHP';
 $lang['dformat']               = 'Datuma formāts (sk. PHP <a href="http://www.php.net/strftime">strftime</a> funkciju)';
 $lang['signature']             = 'Paraksts';
+$lang['showuseras']            = 'Kā rādīt pēdējo lietotāju, ka labojis lapu';
 $lang['toptoclevel']           = 'Satura rādītāja pirmais līmenis';
 $lang['tocminheads']           = 'Mazākais virsrakstu skaits, no kuriem jāveido satura rādītājs.';
 $lang['maxtoclevel']           = 'Satura rādītāja dziļākais līmenis';
@@ -59,15 +60,8 @@ $lang['maxseclevel']           = 'Dziļākais sekciju labošanas līmenis';
 $lang['camelcase']             = 'Lietot saitēm CamelCase';
 $lang['deaccent']              = 'Lapu nosaukumu transliterācija';
 $lang['useheading']            = 'Izmantot pirmo virsrakstu lapu nosaukumiem';
-$lang['refcheck']              = 'Pārbaudīt saites uz mēdiju failiem';
-$lang['refshow']               = 'Cik saites uz mēdiju failiem rādīt';
-$lang['allowdebug']            = 'Ieslēgt atkļūdošanu. <b>Izslēdz!</b>';
-$lang['usewordblock']          = 'Bloķēt spamu pēc slikto vārdu saraksta.';
-$lang['indexdelay']            = 'Laika aizture pirms indeksācijas (sekundēs)';
-$lang['relnofollow']           = 'rel="nofollow" ārējām saitēm';
-$lang['mailguard']             = 'Slēpt epasta adreses';
-$lang['iexssprotect']          = 'Pārbaudīt, vai augšupielādētajā failā nav nav potenciāli bīstamā JavaScript vai HTML koda.';
-$lang['showuseras']            = 'Kā rādīt pēdējo lietotāju, ka labojis lapu';
+$lang['sneaky_index']          = 'Pēc noklusētā DokuWiki lapu sarakstā parāda visu nodaļu lapas. Ieslēdzot šo parametru, noslēps tās nodaļas, kuras apmeklētājam nav tiesības lasīt. Bet tad  tiks arī paslēptas dziļākas, bet atļautas nodaļas. Atsevišķos pieejas tiesību konfigurācijas gadījumos lapu saraksts var nedarboties.';
+$lang['hidepages']             = 'Slēpt lapas (regulāras izteiksmes)';
 $lang['useacl']                = 'Izmantot piekļuves tiesības';
 $lang['autopasswd']            = 'Automātiski ģenerēt paroles';
 $lang['authtype']              = 'Autentifikācijas mehānisms';
@@ -76,57 +70,63 @@ $lang['defaultgroup']          = 'Noklusētā grupa';
 $lang['superuser']             = 'Administrators - grupa, lietotājs vai to saraksts ( piem.: user1,@group1,user2), kam ir pilnas tiesības.';
 $lang['manager']               = 'Pārziņi - grupa, lietotājs vai to saraksts ( piem.: user1,@group1,user2), kam ir pieeja pie dažām administrēšanas funkcijām.';
 $lang['profileconfirm']        = 'Profila labošanai vajag paroli';
+$lang['rememberme']            = 'Atļaut pastāvīgas ielogošanās sīkdatnes ("atceries mani")';
 $lang['disableactions']        = 'Bloķēt Dokuwiki darbības';
 $lang['disableactions_check']  = 'atzīmēt';
 $lang['disableactions_subscription'] = 'abonēt/atteikties';
 $lang['disableactions_wikicode'] = 'skatīt/eksportēt izejtekstu';
 $lang['disableactions_other']  = 'citas darbības (atdalīt ar komatiem)';
-$lang['sneaky_index']          = 'Pēc noklusētā DokuWiki lapu sarakstā parāda visu nodaļu lapas. Ieslēdzot šo parametru, noslēps tās nodaļas, kuras apmeklētājam nav tiesības lasīt. Bet tad  tiks arī paslēptas dziļākas, bet atļautas nodaļas. Atsevišķos pieejas tiesību konfigurācijas gadījumos lapu saraksts var nedarboties.';
 $lang['auth_security_timeout'] = 'Autorizācijas drošības intervāls (sekundēs)';
 $lang['securecookie']          = 'Vai pa HTTPS sūtāmās sīkdatnes sūtīt tikai pa HTTPS? Atslēdz šo iespēju, kad tikai pieteikšanās wiki sistēmā notiek pa SSL šifrētu savienojumu, bet skatīšana  - pa nešifrētu.';
+$lang['usewordblock']          = 'Bloķēt spamu pēc slikto vārdu saraksta.';
+$lang['relnofollow']           = 'rel="nofollow" ārējām saitēm';
+$lang['indexdelay']            = 'Laika aizture pirms indeksācijas (sekundēs)';
+$lang['mailguard']             = 'Slēpt epasta adreses';
+$lang['iexssprotect']          = 'Pārbaudīt, vai augšupielādētajā failā nav nav potenciāli bīstamā JavaScript vai HTML koda.';
+$lang['usedraft']              = 'Labojot automātiski saglabāt melnrakstu';
+$lang['htmlok']                = 'Atļaut iekļautu HTTP';
+$lang['phpok']                 = 'Atļaut iekļautu PHP';
+$lang['locktime']              = 'Bloķēšanas failu maksimālais vecums';
+$lang['cachetime']             = 'Bufera maksimālais vecums (sek)';
+$lang['target____wiki']        = 'Kur atvērt iekšējās saites';
+$lang['target____interwiki']   = 'Kur atvērt saites strap wiki';
+$lang['target____extern']      = 'Kur atvērt ārējās saites';
+$lang['target____media']       = 'Kur atvērt mēdiju saites';
+$lang['target____windows']     = 'Kur atvērt saites uz tīkla mapēm';
+$lang['refcheck']              = 'Pārbaudīt saites uz mēdiju failiem';
+$lang['refshow']               = 'Cik saites uz mēdiju failiem rādīt';
+$lang['gdlib']                 = 'GD Lib versija';
+$lang['im_convert']            = 'Ceļš uz ImageMagick convert rīku';
+$lang['jpg_quality']           = 'JPG saspiešanas kvalitāte';
+$lang['fetchsize']             = 'Maksimālais faila apjoms baitos, ko fetch.php var ielādēt no interneta.';
+$lang['subscribers']           = 'Atļaut abonēt izmaiņas';
+$lang['subscribe_time']        = 'Pēc cik ilga laika izsūtīt abonētos sarakstus un kopsavilkumus (sekundes); jābūt mazākam par laiku, kas norādīts "recent_days".';
+$lang['notify']                = 'Nosūtīt izmaiņu paziņojumu uz epasta adresi';
+$lang['registernotify']        = 'Nosūtīt paziņojumu par jauniem lietotājiem uz epasta adresi';
+$lang['mailfrom']              = 'Epasta adrese automātiskajiem paziņojumiem';
+$lang['mailprefix']            = 'E-pasta temata prefikss automātiskajiem paziņojumiem';
+$lang['sitemap']               = 'Lapas karte priekš Google (dienas)';
+$lang['rss_type']              = 'XML barotnes veids';
+$lang['rss_linkto']            = 'XML barotnes uz ';
+$lang['rss_content']           = 'Ko attēlot XML barotnē?';
+$lang['rss_update']            = 'XML barotnes atjaunošanas intervāls (sec)';
+$lang['rss_show_summary']      = 'Rādīt visrakstos XML barotnes kopsavilkumu ';
 $lang['updatecheck']           = 'Pārbaudīt, vai pieejami atjauninājumi un drošības brīdinājumi? Dokuwiki sazināsies ar update.dokuwiki.org';
 $lang['userewrite']            = 'Ērti lasāmas adreses (URL)';
 $lang['useslash']              = 'Lietot slīpiņu  par URL atdalītāju';
-$lang['usedraft']              = 'Labojot automātiski saglabāt melnrakstu';
 $lang['sepchar']               = 'Lapas nosaukuma vārdu atdalītājs';
 $lang['canonical']             = 'Lietot kanoniskus URL';
 $lang['fnencode']              = 'Ne ASCII failvārdu kodēšanas metode:';
 $lang['autoplural']            = 'Automātisks daudzskaitlis';
 $lang['compression']           = 'Saspiešanas metode vecajiem failiem';
-$lang['cachetime']             = 'Bufera maksimālais vecums (sek)';
-$lang['locktime']              = 'Bloķēšanas failu maksimālais vecums';
-$lang['fetchsize']             = 'Maksimālais faila apjoms baitos, ko fetch.php var ielādēt no interneta.';
-$lang['notify']                = 'Nosūtīt izmaiņu paziņojumu uz epasta adresi';
-$lang['registernotify']        = 'Nosūtīt paziņojumu par jauniem lietotājiem uz epasta adresi';
-$lang['mailfrom']              = 'Epasta adrese automātiskajiem paziņojumiem';
-$lang['mailprefix']            = 'E-pasta temata prefikss automātiskajiem paziņojumiem';
 $lang['gzip_output']           = 'Lietot gzip Content-Encoding priekš xhtml';
-$lang['gdlib']                 = 'GD Lib versija';
-$lang['im_convert']            = 'Ceļš uz ImageMagick convert rīku';
-$lang['jpg_quality']           = 'JPG saspiešanas kvalitāte';
-$lang['subscribers']           = 'Atļaut abonēt izmaiņas';
-$lang['subscribe_time']        = 'Pēc cik ilga laika izsūtīt abonētos sarakstus un kopsavilkumus (sekundes); jābūt mazākam par laiku, kas norādīts "recent_days".';
 $lang['compress']              = 'Saspiest CSS un javascript failus';
-$lang['hidepages']             = 'Slēpt lapas (regulāras izteiksmes)';
 $lang['send404']               = 'Par neesošām lapām atbildēt "HTTP 404/Page Not Found" ';
-$lang['sitemap']               = 'Lapas karte priekš Google (dienas)';
 $lang['broken_iua']            = 'Varbūt tavā serverī nedarbojas funkcija ignore_user_abort? Tā dēļ var nestādāt meklēšanas indeksācija. Šī problēma sastopama, piemēram, IIS ar PHP/CGI. Papildus informāciju skatīt <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Kļūdā Nr.852</a>.';
 $lang['xsendfile']             = 'Lietot X-Sendfile virsrakstu, augšupielādējot failu serverī? ';
 $lang['renderer_xhtml']        = 'Galveno (xhtml) wiki saturu renderēt ar ';
 $lang['renderer__core']        = '%s (dokuwiki kodols)';
 $lang['renderer__plugin']      = '%s (modulis)';
-$lang['rememberme']            = 'Atļaut pastāvīgas ielogošanās sīkdatnes ("atceries mani")';
-$lang['rss_type']              = 'XML barotnes veids';
-$lang['rss_linkto']            = 'XML barotnes uz ';
-$lang['rss_content']           = 'Ko attēlot XML barotnē?';
-$lang['rss_update']            = 'XML barotnes atjaunošanas intervāls (sec)';
-$lang['recent_days']           = 'Cik dienas glabāt jaunākās izmaiņas';
-$lang['rss_show_summary']      = 'Rādīt visrakstos XML barotnes kopsavilkumu ';
-$lang['target____wiki']        = 'Kur atvērt iekšējās saites';
-$lang['target____interwiki']   = 'Kur atvērt saites strap wiki';
-$lang['target____extern']      = 'Kur atvērt ārējās saites';
-$lang['target____media']       = 'Kur atvērt mēdiju saites';
-$lang['target____windows']     = 'Kur atvērt saites uz tīkla mapēm';
 $lang['proxy____host']         = 'Proxy servera vārds';
 $lang['proxy____port']         = 'Proxy ports';
 $lang['proxy____user']         = 'Proxy lietotāja vārds';
diff --git a/lib/plugins/plugin/lang/lv/lang.php b/lib/plugins/plugin/lang/lv/lang.php
index 0f6103899..9a8727875 100644
--- a/lib/plugins/plugin/lang/lv/lang.php
+++ b/lib/plugins/plugin/lang/lv/lang.php
@@ -48,3 +48,4 @@ $lang['enabled']               = 'Modulis %s pieslēgts.';
 $lang['notenabled']            = 'Moduli %s nevar pieslēgt, pārbaudi failu tiesības.';
 $lang['disabled']              = 'Modulis %s atslēgts.';
 $lang['notdisabled']           = 'Moduli %s nevar atslēgt, pārbaudi failu tiesības.';
+$lang['packageinstalled']      = 'Moduļu paka (pavisam kopā %d: %s) veiksmīgi uzstādīti.';
-- 
cgit v1.2.3


From d4b178ac520c38efe17d50446b8159a32ca8800c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=EB=AA=85=EC=A7=84?= <aranet100@gmail.com>
Date: Fri, 2 Nov 2012 15:22:45 +0100
Subject: Korean language update

---
 lib/plugins/acl/lang/ko/help.txt         |  2 +-
 lib/plugins/acl/lang/ko/lang.php         |  2 +-
 lib/plugins/config/lang/ko/intro.txt     |  4 ++--
 lib/plugins/config/lang/ko/lang.php      | 39 ++++++++++++++++----------------
 lib/plugins/popularity/lang/ko/intro.txt |  2 +-
 lib/plugins/usermanager/lang/ko/edit.txt |  2 +-
 lib/plugins/usermanager/lang/ko/lang.php |  8 +++----
 7 files changed, 29 insertions(+), 30 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/acl/lang/ko/help.txt b/lib/plugins/acl/lang/ko/help.txt
index 377636682..6a15b7a2e 100644
--- a/lib/plugins/acl/lang/ko/help.txt
+++ b/lib/plugins/acl/lang/ko/help.txt
@@ -1,4 +1,4 @@
-=== 도움말: ===
+=== 빠른 도움말: ===
 
 현재 문서에서 위키 이름공간과 문서에 대한 접근 권한을 추가하거나 삭제할 수 있습니다.
 
diff --git a/lib/plugins/acl/lang/ko/lang.php b/lib/plugins/acl/lang/ko/lang.php
index c8e1ce5cc..5d2662ef8 100644
--- a/lib/plugins/acl/lang/ko/lang.php
+++ b/lib/plugins/acl/lang/ko/lang.php
@@ -41,4 +41,4 @@ $lang['acl_perm4']             = '만들기';
 $lang['acl_perm8']             = '올리기';
 $lang['acl_perm16']            = '삭제';
 $lang['acl_new']               = '새 항목 추가';
-$lang['acl_mod']               = '선택 항목 변경';
+$lang['acl_mod']               = '선택 항목 수정';
diff --git a/lib/plugins/config/lang/ko/intro.txt b/lib/plugins/config/lang/ko/intro.txt
index f6b76ecfc..5ef34df64 100644
--- a/lib/plugins/config/lang/ko/intro.txt
+++ b/lib/plugins/config/lang/ko/intro.txt
@@ -1,7 +1,7 @@
 ====== 환경 설정 관리 ======
 
-DokuWiki 설치할 때 설정을 변경하기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서 (영어)]]를 참고하세요.
+DokuWiki 설치할 때 설정을 바꾸기 위해 사용하는 페이지입니다. 각 설정에 대한 자세한 도움말이 필요하다면 [[doku>ko:config|설정 문서 (한국어)]]와 [[doku>config|설정 문서 (영어)]]를 참고하세요.
 
-플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 변경하지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정이 가능합니다.
+플러그인에 대한 자세한 정보가 필요하다면 [[doku>plugin:config|플러그인 설정]] 문서를 참고하세요. 빨간 배경색으로 보이는 설정은 이 플러그인에서 바꾸지 못하도록 되어있습니다. 파란 배경색으로 보이는 설정은 기본 설정값을 가지고 있습니다. 하얀 배경색으로 보이는 설정은 특별한 설치를 위해 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 수정이 가능합니다.
 
 이 페이지를 끝내기 전에 **저장** 버튼을 누르지 않으면 설정값은 적용되지 않습니다.
diff --git a/lib/plugins/config/lang/ko/lang.php b/lib/plugins/config/lang/ko/lang.php
index 5f90044e4..cd2cc6d6c 100644
--- a/lib/plugins/config/lang/ko/lang.php
+++ b/lib/plugins/config/lang/ko/lang.php
@@ -12,9 +12,9 @@
  * @author Myeongjin <aranet100@gmail.com>
  */
 $lang['menu']                  = '환경 설정';
-$lang['error']                 = '잘못된 값 때문에 설정을 변경할 수 없습니다. 수정한 값을 검토하고 확인을 누르세요.
+$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 수정한 값을 검토하고 확인을 누르세요.
 <br />잘못된 값은 빨간 선으로 둘러싸여 있습니다.';
-$lang['updated']               = '설정이 성공적으로 변경되었습니다.';
+$lang['updated']               = '설정이 성공적으로 바뀌었습니다.';
 $lang['nochoice']              = '(다른 선택이 불가능합니다.)';
 $lang['locked']                = '환경 설정 파일을 수정할 수 없습니다. 의도한 행동이 아니라면,<br />
 파일 이름과 권한이 맞는지 확인하기 바랍니다. ';
@@ -39,9 +39,9 @@ $lang['_advanced']             = '고급 설정';
 $lang['_network']              = '네트워크 설정';
 $lang['_plugin_sufix']         = '플러그인 설정';
 $lang['_template_sufix']       = '템플릿 설정';
-$lang['_msg_setting_undefined'] = '설정되지 않은 메타데이터.';
-$lang['_msg_setting_no_class'] = '설정되지 않은 클래스.';
-$lang['_msg_setting_no_default'] = '기본값 없음.';
+$lang['_msg_setting_undefined'] = '설정된 메타데이터가 없습니다.';
+$lang['_msg_setting_no_class'] = '설정된 클래스가 없습니다.';
+$lang['_msg_setting_no_default'] = '기본값이 없습니다.';
 $lang['title']                 = '위키 제목 (위키 이름)';
 $lang['start']                 = '각 이름공간에서 사용할 시작 문서 이름';
 $lang['lang']                  = '인터페이스 언어';
@@ -53,12 +53,12 @@ $lang['savedir']               = '데이타 저장 디렉토리';
 $lang['basedir']               = '서버 경로 (예를 들어 <code>/dokuwiki/</code>). 자동 감지를 하려면 비우세요.';
 $lang['baseurl']               = '서버 URL (예를 들어 <code>http://www.yourserver.com</code>). 자동 감지를 하려면 비우세요.';
 $lang['cookiedir']             = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.';
-$lang['dmode']                 = '디렉토리 생성 모드';
-$lang['fmode']                 = '파일 생성 모드';
+$lang['dmode']                 = '디렉토리 만들기 모드';
+$lang['fmode']                 = '파일 만들기 모드';
 $lang['allowdebug']            = '디버그 허용 <b>필요하지 않으면 금지!</b>';
 $lang['recent']                = '최근 바뀐 문서당 항목 수';
 $lang['recent_days']           = '최근 바뀐 문서 기준 시간 (날짜)';
-$lang['breadcrumbs']           = '위치 "추적" 수. 0으로 설정하면 비활성화함.';
+$lang['breadcrumbs']           = '위치 "추적" 수. 0으로 설정하면 비활성화합니다.';
 $lang['youarehere']            = '계층형 위치 추적 (다음 위의 옵션을 비활성화하고 싶습니다)';
 $lang['fullpath']              = '문서 하단에 전체 경로 보여주기';
 $lang['typography']            = '기호 대체';
@@ -80,21 +80,21 @@ $lang['autopasswd']            = '자동으로 만들어진 비밀번호';
 $lang['authtype']              = '인증 백-엔드';
 $lang['passcrypt']             = '비밀번호 암호화 방법';
 $lang['defaultgroup']          = '기본 그룹, 모든 새 사용자는 이 그룹에 속합니다';
-$lang['superuser']             = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자. 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
-$lang['manager']               = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자. 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
+$lang['superuser']             = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
+$lang['manager']               = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
 $lang['profileconfirm']        = '개인 정보를 바꿀 때 비밀번호 다시 확인';
 $lang['rememberme']            = '항상 로그인 정보 저장 허용 (기억하기)';
 $lang['disableactions']        = 'DokuWiki 활동 비활성화';
 $lang['disableactions_check']  = '검사';
 $lang['disableactions_subscription'] = '구독 신청/해지';
-$lang['disableactions_wikicode'] = '내용 보기/원시 내보대기';
+$lang['disableactions_wikicode'] = '내용 보기/원본 내보대기';
 $lang['disableactions_other']  = '다른 활동 (쉼표로 구분)';
 $lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)';
 $lang['securecookie']          = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.';
-$lang['remote']                = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근가능합니다.';
+$lang['remote']                = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메카니즘을 통해 다른 어플리케이션으로 접근 가능합니다.';
 $lang['remoteuser']            = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.';
 $lang['usewordblock']          = '금지 단어를 사용해 스팸 막기';
-$lang['relnofollow']           = '외부 링크에 rel="nofollow" 사용';
+$lang['relnofollow']           = '바깥 링크에 rel="nofollow" 사용';
 $lang['indexdelay']            = '색인 연기 시간 (초)';
 $lang['mailguard']             = '이메일 주소를 알아볼 수 없게 하기';
 $lang['iexssprotect']          = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사';
@@ -105,7 +105,7 @@ $lang['locktime']              = '최대 파일 잠금 시간(초)';
 $lang['cachetime']             = '최대 캐시 생존 시간 (초)';
 $lang['target____wiki']        = '내부 링크에 대한 타겟 창';
 $lang['target____interwiki']   = '인터위키 링크에 대한 타겟 창';
-$lang['target____extern']      = '외부 링크에 대한 타겟 창';
+$lang['target____extern']      = '바깥 링크에 대한 타겟 창';
 $lang['target____media']       = '미디어 링크에 대한 타겟 창';
 $lang['target____windows']     = '창 링크에 대한 타겟 창';
 $lang['mediarevisions']        = '미디어 버전 관리를 사용하겠습니까?';
@@ -114,9 +114,9 @@ $lang['refshow']               = '위의 설정이 활성화되었을 때 보여
 $lang['gdlib']                 = 'GD 라이브러리 버전';
 $lang['im_convert']            = 'ImageMagick 변환 도구 위치';
 $lang['jpg_quality']           = 'JPG 압축 품질 (0-100)';
-$lang['fetchsize']             = 'fetch.php가 외부에서 다운로드할 수도 있는 최대 크기 (바이트)';
+$lang['fetchsize']             = 'fetch.php가 바깥에서 다운로드할 수도 있는 최대 크기 (바이트)';
 $lang['subscribers']           = '사용자가 이메일로 문서 바뀜에 구독하도록 허용';
-$lang['subscribe_time']        = '구독 목록과 요약이 보내질 경과 시간 (초); 이 것은 recent_days에서 설정된 시간보다 작아야 합니다.';
+$lang['subscribe_time']        = '구독 목록과 요약이 보내질 경과 시간 (초); recent_days에서 설정된 시간보다 작아야 합니다.';
 $lang['notify']                = '항상 이 이메일 주소로 바뀜 알림을 보냄';
 $lang['registernotify']        = '항상 새 사용자한테 이 이메일 주소로 정보를 보냄';
 $lang['mailfrom']              = '자동으로 보내지는 메일 발신자';
@@ -127,7 +127,7 @@ $lang['rss_type']              = 'XML 피드 타입';
 $lang['rss_linkto']            = 'XML 피드 링크 정보';
 $lang['rss_content']           = 'XML 피드 항목에 표시되는 내용은?';
 $lang['rss_update']            = 'XML 피드 업데이트 주기 (초)';
-$lang['rss_show_summary']      = 'XML 피드 제목에서 요약정보 보여주기';
+$lang['rss_show_summary']      = 'XML 피드 제목에서 요약 보여주기';
 $lang['rss_media']             = '어떤 규격으로 XML 피드를 받아보시겠습니까?';
 $lang['updatecheck']           = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 DokuWiki를 update.dokuwiki.org에 연결해야 합니다.';
 $lang['userewrite']            = '멋진 URL 사용';
@@ -141,9 +141,8 @@ $lang['gzip_output']           = 'xhml 내용 gzip 압축 사용';
 $lang['compress']              = '최적화된 CSS, 자바스크립트 출력';
 $lang['cssdatauri']            = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! <code>400</code>에서 <code>600</code> 정도면 좋은 효율을 가져옵니다. <code>0</code>로 지정할 경우 비활성화 됩니다.';
 $lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP 404/Page Not Found" 응답';
-$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있으면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.splitbrain.org/?do=details&amp;task_id=852">Bug 852</a>를 참고하기 바랍니다.';
-$lang['xsendfile']             = '웹 서버 static 파일 전송 지원을 위해 X-Sendfile 헤더를 사용한다면 이 옵션을 사용합니다.
-웹 서버가 이 기능을 지원해야 합니다.';
+$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 <a href="http://bugs.dokuwiki.org/?do=details&amp;task_id=852">버그 852</a>를 참고하기 바랍니다.';
+$lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
 $lang['renderer_xhtml']        = '주 (xhtml) 위키 출력 처리기';
 $lang['renderer__core']        = '%s (DokuWiki 내부 기능)';
 $lang['renderer__plugin']      = '%s (플러그인)';
diff --git a/lib/plugins/popularity/lang/ko/intro.txt b/lib/plugins/popularity/lang/ko/intro.txt
index 0af7ee2cc..b9e66094e 100644
--- a/lib/plugins/popularity/lang/ko/intro.txt
+++ b/lib/plugins/popularity/lang/ko/intro.txt
@@ -1,6 +1,6 @@
 ====== 인기도 조사 ======
 
-설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|기능]]은 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+설치된 위키의 익명 정보를 DokuWiki 개발자에게 보냅니다. 이 [[doku>popularity|도구]]는 DokuWiki가 실제 사용자에게 어떻게 사용되는지  DokuWiki 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
 
 설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이타는 익명 ID로 구별되어집니다.
 
diff --git a/lib/plugins/usermanager/lang/ko/edit.txt b/lib/plugins/usermanager/lang/ko/edit.txt
index b8b13c5c8..ebb5bb002 100644
--- a/lib/plugins/usermanager/lang/ko/edit.txt
+++ b/lib/plugins/usermanager/lang/ko/edit.txt
@@ -1 +1 @@
-===== 사용자 정보 수정 =====
+===== 사용자 정보 편집 =====
diff --git a/lib/plugins/usermanager/lang/ko/lang.php b/lib/plugins/usermanager/lang/ko/lang.php
index 3754fea90..58f9bf14a 100644
--- a/lib/plugins/usermanager/lang/ko/lang.php
+++ b/lib/plugins/usermanager/lang/ko/lang.php
@@ -35,14 +35,14 @@ $lang['summary']               = '찾은 사용자 %3$d 중 %1$d-%2$d 보기. 
 $lang['nonefound']             = '찾은 사용자가 없습니다. 전체 사용자 %d명.';
 $lang['delete_ok']             = '사용자 %d명이 삭제되었습니다';
 $lang['delete_fail']           = '사용자 %d명의 삭제가 실패했습니다.';
-$lang['update_ok']             = '사용자 변경을 성공했습니다.';
-$lang['update_fail']           = '사용자 변경을 실패했습니다.';
-$lang['update_exists']         = '사용자 이름 변경이 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)';
+$lang['update_ok']             = '사용자 정보를 성공적으로 바꾸었습니다.';
+$lang['update_fail']           = '사용자 정보를 바꾸는 데 실패했습니다.';
+$lang['update_exists']         = '사용자 이름을 바꾸기는 데 실패했습니다. 사용자 이름(%s)이 이미 존재합니다. (다른 항목의 바뀜은 적용됩니다.)';
 $lang['start']                 = '시작';
 $lang['prev']                  = '이전';
 $lang['next']                  = '다음';
 $lang['last']                  = '마지막';
-$lang['edit_usermissing']      = '선택된 사용자를 찾을 수 없습니다. 사용자 이름이 삭제되거나 변경됐을 수도 있습니다.';
+$lang['edit_usermissing']      = '선택된 사용자를 찾을 수 없습니다. 사용자 이름이 삭제되거나 바뀌었을 수도 있습니다.';
 $lang['user_notify']           = '사용자에게 알림';
 $lang['note_notify']           = '사용자에게 새로운 비밀번호를 준 경우에만 알림 이메일이 보내집니다.';
 $lang['note_group']            = '새로운 사용자는 어떤 그룹도 설정하지 않은 경우에 기본 그룹(%s)에 추가됩니다.';
-- 
cgit v1.2.3