phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[9062] trunk

[<var...@us...>]

Revision: 9062
          http://sourceforge.net/p/phpwiki/code/9062
Author:   vargenau
Date:     2014-09-04 16:17:25 +0000 (Thu, 04 Sep 2014)
Log Message:
-----------
remove FrameInclude plugin (frames are not supported in HTML 5)

Modified Paths:
--------------
    trunk/admin/mkfuncs
    trunk/lib/HtmlElement.php
    trunk/lib/IniConfig.php
    trunk/lib/WikiTheme.php
    trunk/lib/display.php
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/RichTable.php
    trunk/lib/plugin/WikiTranslation.php
    trunk/locale/Makefile
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/pgsrc/Help%2FIncludePagePlugin
    trunk/pgsrc/ReleaseNotes

Removed Paths:
-------------
    trunk/lib/plugin/FrameInclude.php
    trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
    trunk/pgsrc/Help%2FFrameIncludePlugin
    trunk/themes/Sidebar/templates/frame-left.tmpl
    trunk/themes/Sidebar/templates/frameset.tmpl
    trunk/themes/default/templates/frameset.tmpl

Modified: trunk/admin/mkfuncs
===================================================================
--- trunk/admin/mkfuncs	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/admin/mkfuncs	2014-09-04 16:17:25 UTC (rev 9062)
@@ -40,6 +40,6 @@
 echo "$d"
 mkfuncs form input option select textarea label fieldset legend
 echo "$d"
-mkfuncs area map frame frameset iframe nobody object embed param
+mkfuncs area map frame iframe nobody object embed param
 echo "$d"
 mkfuncs video

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/HtmlElement.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -518,18 +518,6 @@
         return $el->_init2(func_get_args());
     }
 
-    public static function frame( /*...*/)
-    {
-        $el = new HtmlElement('frame');
-        return $el->_init2(func_get_args());
-    }
-
-    public static function frameset( /*...*/)
-    {
-        $el = new HtmlElement('frameset');
-        return $el->_init2(func_get_args());
-    }
-
     public static function iframe( /*...*/)
     {
         $el = new HtmlElement('iframe');
@@ -585,7 +573,7 @@
 define('HTMLTAG_ACCEPTS_INLINE', 4);
 
 HTML::_setTagProperty(HTMLTAG_EMPTY,
-    'area base basefont br col embed frame hr img input isindex link meta param');
+    'area base basefont br col embed hr img input isindex link meta param');
 HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE,
     // %inline elements:
     'b big i small tt ' // %fontstyle
@@ -597,7 +585,7 @@
         // %block elements which contain inline content
         . 'address h1 h2 h3 h4 h5 h6 p pre '
         // %block elements which contain either block or inline content
-        . 'div fieldset frameset'
+        . 'div fieldset '
 
         // other with inline content
         . 'caption dt label legend video '

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/IniConfig.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -708,7 +708,6 @@
         $AllAllowedPlugins[] = 'CacheTest';
         $AllAllowedPlugins[] = 'CategoryPage';
         $AllAllowedPlugins[] = 'FoafViewer';
-        $AllAllowedPlugins[] = 'FrameInclude';
         $AllAllowedPlugins[] = 'GraphViz';
         $AllAllowedPlugins[] = 'HtmlConverter';
         $AllAllowedPlugins[] = 'JabberPresence';

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/WikiTheme.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -621,8 +621,6 @@
             $link->pushContent($this->maybeSplitWikiWord($default_text));
             $link->setAttr('class', 'wiki');
         }
-        if ($request->getArg('frame'))
-            $link->setAttr('target', '_top');
         return $link;
     }
 
@@ -679,9 +677,6 @@
             $gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword));
             $link->pushContent($gbutton);
         }
-        if ($request->getArg('frame'))
-            $link->setAttr('target', '_top');
-
         return $link;
     }
 
@@ -1693,8 +1688,6 @@
         $this->_init('a', array('href' => $url));
         if ($class)
             $this->setAttr('class', $class);
-        if ($request->getArg('frame'))
-            $this->setAttr('target', '_top');
         if (!empty($options) and is_array($options)) {
             foreach ($options as $key => $val)
                 $this->setAttr($key, $val);

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/display.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -286,8 +286,6 @@
                 'class' => 'backlinks'),
             $WikiTheme->maybeSplitWikiWord($pagename));
         $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
-        if ($request->getArg('frame'))
-            $pageheader->setAttr('target', '_top');
     }
 
     $pagetitle = SplitPagename($pagename);

Deleted: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/FrameInclude.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,153 +0,0 @@
-<?php
-
-/*
- * Copyright 2002 $ThePhpWikiProgrammingTeam
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * FrameInclude:  Display a url or page in a separate frame inside our body.
- *
- * Usage:
- *  <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >>
- *  <<FrameInclude page=OtherPage >>
- *  at the VERY BEGINNING in the content!
- *
- * Author:  Reini Urban <ru...@x-...>, rewrite by Jeff Dairiki <da...@da...>
- *
- * KNOWN ISSUES:
- *
- * This is a dirty hack into the whole system. To display the page as
- * frameset we:
- *
- *  1. Discard any output buffered so far.
- *  2. Recursively call displayPage with magic arguments to generate
- *     the frameset (or individual frame contents.)
- *  3. Exit early.  (So this plugin is usually a no-return.)
- *
- *  In any cases we can now serve only specific templates with the new
- *  frame argument. The whole page is now ?frame=html (before it was
- *  named "top") For the Sidebar theme (or derived from it) we provide
- *  a left frame also, otherwise only top, content and bottom.
- */
-class WikiPlugin_FrameInclude
-    extends WikiPlugin
-{
-    function getDescription()
-    {
-        return _("Display a url in a separate frame inside our body. Only one frame allowed.");
-    }
-
-    function getDefaultArguments()
-    {
-        return array('src' => false, // the src url to include
-            'page' => false,
-            'name' => 'content', // name of our frame
-            'title' => false,
-            'rows' => '18%,*,15%', // names: top, $name, bottom
-            'cols' => '20%,*', // names: left, $name
-            // only useful on WikiTheme "Sidebar"
-            'frameborder' => 1,
-            'marginwidth' => false,
-            'marginheight' => false,
-            'noresize' => false,
-            'scrolling' => 'auto', // '[ yes | no | auto ]'
-        );
-    }
-
-    function run($dbi, $argstr, &$request, $basepage)
-    {
-
-        $args = ($this->getArgs($argstr, $request));
-        extract($args);
-
-        if ($request->getArg('action') != 'browse') {
-            return $this->disabled(_("Plugin not run: not in browse mode"));
-        }
-        if (!$request->isGetOrHead()) {
-            return $this->disabled("(method != 'GET')");
-        }
-
-        if (!$src and $page) {
-            if ($page == $request->get('pagename')) {
-                return $this->error(sprintf(_("Recursive inclusion of page %s"),
-                    $page));
-            }
-            $src = WikiURL($page);
-        }
-        if (!$src) {
-            return $this->error(sprintf(_("%s or %s parameter missing"),
-                'src', 'page'));
-        }
-
-        // FIXME: How to normalize url's to compare against recursion?
-        if ($src == $request->getURLtoSelf()) {
-            return $this->error(sprintf(_("Recursive inclusion of url %s"),
-                $src));
-        }
-
-        static $noframes = false;
-        if ($noframes) {
-            // Content for noframes version of page.
-            return HTML::p(fmt("See %s",
-                HTML::a(array('href' => $src), $src)));
-        }
-        $noframes = true;
-
-        if (($which = $request->getArg('frame'))) {
-            // Generate specialized frame output (header, footer, etc...)
-            $request->discardOutput();
-            displayPage($request, new Template("frame-$which", $request));
-            $request->finish(); //noreturn
-        }
-
-        // Generate the outer frameset
-        $frame = HTML::frame(array('name' => $name,
-            'src' => $src,
-            'title' => $title,
-            'frameborder' => (int)$frameborder,
-            'scrolling' => (string)$scrolling,
-            'noresize' => (bool)$noresize,
-        ));
-
-        if ($marginwidth)
-            $frame->setArg('marginwidth', $marginwidth);
-        if ($marginheight)
-            $frame->setArg('marginheight', $marginheight);
-
-        $tokens = array('CONTENT_FRAME' => $frame,
-            'ROWS' => $rows,
-            'COLS' => $cols,
-            'FRAMEARGS' => sprintf('frameborder="%d"', $frameborder),
-        );
-
-        // Produce the frameset.
-        $request->discardOutput();
-        displayPage($request, new Template('frameset', $request, $tokens));
-        $request->finish(); //noreturn
-        return '';
-    }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/MediawikiTable.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -100,7 +100,7 @@
             $attrs = parse_attributes($line);
             foreach ($attrs as $key => $value) {
                 if (in_array($key, array("id", "class", "title", "style",
-                    "bgcolor", "frame", "rules", "border",
+                    "bgcolor", "rules", "border",
                     "cellspacing", "cellpadding",
                     "align", "width"))
                 ) {

Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/RichTable.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -52,7 +52,7 @@
             $attrs = parse_attributes($line);
             foreach ($attrs as $key => $value) {
                 if (in_array($key, array("id", "class", "title", "style",
-                    "bgcolor", "frame", "rules", "border",
+                    "bgcolor", "rules", "border",
                     "cellspacing", "cellpadding",
                     "align", "width"))
                 ) {

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/lib/plugin/WikiTranslation.php	2014-09-04 16:17:25 UTC (rev 9062)
@@ -95,8 +95,6 @@
     _("FindPage") . ',' .
     _("FoafViewer") . ',' .
     _("FoafViewerPlugin") . ',' .
-    _("FrameInclude") . ',' .
-    _("FrameIncludePlugin") . ',' .
     _("FullRecentChanges") . ',' .
     _("FullTextSearch") . ',' .
     _("FuzzyPages") . ',' .

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/Makefile	2014-09-04 16:17:25 UTC (rev 9062)
@@ -160,7 +160,6 @@
 ${POT_FILE}: ../lib/plugin/FacebookLike.php
 ${POT_FILE}: ../lib/plugin/FileInfo.php
 ${POT_FILE}: ../lib/plugin/FoafViewer.php
-${POT_FILE}: ../lib/plugin/FrameInclude.php
 ${POT_FILE}: ../lib/plugin/FullTextSearch.php
 ${POT_FILE}: ../lib/plugin/FuzzyPages.php
 ${POT_FILE}: ../lib/plugin/GoogleMaps.php
@@ -405,7 +404,6 @@
 ${POT_FILE}: ../themes/default/templates/dialog.tmpl
 ${POT_FILE}: ../themes/default/templates/editpage.tmpl
 ${POT_FILE}: ../themes/default/templates/forumadd.tmpl
-${POT_FILE}: ../themes/default/templates/frameset.tmpl
 ${POT_FILE}: ../themes/default/templates/head.tmpl
 ${POT_FILE}: ../themes/default/templates/homepage.tmpl
 ${POT_FILE}: ../themes/default/templates/htmldump.tmpl
@@ -486,8 +484,6 @@
 ${POT_FILE}: ../themes/Sidebar/templates/content.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/debug.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/dump-footer.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/frame-left.tmpl
-${POT_FILE}: ../themes/Sidebar/templates/frameset.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/htmldump.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/html.tmpl
 ${POT_FILE}: ../themes/Sidebar/templates/logo.tmpl

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Deleted: trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
===================================================================
--- trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,36 +0,0 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
-Content-Type: application/x-phpwiki;
-  pagename=Aide%2FPluginInclureUnCadre;
-  flags="";
-  charset=UTF-8
-Content-Transfer-Encoding: binary
-
-Ce plugin créera un cadre HTML qui remplira complètement la surface de la
-page (c'est-à-dire toute la surface que l'utilisateur peut éditer). Tout
-autre texte sera rejeté quand la page est affichée (tout ce qui est en
-dehors de l'appel du plugin). Dans le langage de l'hypertexte, ça s'appelle
-la <i>transclusion</i>.
-
-Vous pouvez être intéressé également par PluginInclureUnePage.
-
-Exemples: pour inclure une page depuis un autre site, utilisez l'argument <b>src</b> :
-
-{{{
-<<FrameInclude src="http://phpwiki.fr/">>
-}}}
-
-Pour inclure une page depuis ce wiki, utilisez l'argument <b>page</b> :
-
-{{{
-<<FrameInclude page=PageAccueil>>
-}}}
-
-Pour plus d'informations sur ce plugin, lisez s'il vous plaît, la source
-PHP dans le répertoire /lib/plugin.
-
-<noinclude>
-----
-[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]]
-</noinclude>
-

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/de.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1688,32 +1688,6 @@
 msgid "Title"
 msgstr "Titel"
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-"Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der "
-"Seite. Nur ein Frame ist erlaubt."
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr "Rekursiver Selbstaufruf der Seite %s"
-
-# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr "%s oder %s Argument fehlt"
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr "Rekursiver Selbstaufruf der URL %s"
-
-#, php-format
-msgid "See %s"
-msgstr "Siehe %s"
-
 msgid "Search the content of all pages in this wiki."
 msgstr "Den Text aller Seiten dieses Wikis durchsuchen."
 
@@ -2403,6 +2377,9 @@
 "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer "
 "zufälliger ausgewählter Seite weiterleiten."
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr "ZufallsSeite"
 
@@ -2802,6 +2779,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr "Siehe %s"
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -3061,6 +3042,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Rekursiver Selbstaufruf der Seite %s"
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -3124,6 +3109,10 @@
 msgstr "%s Argument fehlt"
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr "Rekursiver Selbstaufruf der URL %s"
+
+#, php-format
 msgid "See: %s"
 msgstr "Siehe: %s"
 
@@ -4052,16 +4041,6 @@
 msgid "FoafViewerPlugin"
 msgstr "FoafViewerPlugin"
 
-# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit
-# eingeschlossenem Rahmen)
-msgid "FrameInclude"
-msgstr "FrameEinbetten"
-
-# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit
-# eingeschlossenem Rahmen)
-msgid "FrameIncludePlugin"
-msgstr "FrameEinbettenPlugin"
-
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
@@ -6083,6 +6062,10 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!)
+#~ msgid "%s or %s parameter missing"
+#~ msgstr "%s oder %s Argument fehlt"
+
 #~ msgid "Edit aborted."
 #~ msgstr "Bearbeiten abgebrochen."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/es.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1657,29 +1657,6 @@
 msgid "Title"
 msgstr ""
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
 msgid "Search the content of all pages in this wiki."
 msgstr ""
 
@@ -2337,6 +2314,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr ""
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr "PáginaAlAzar"
 
@@ -2719,6 +2699,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -2972,6 +2956,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -3030,6 +3018,10 @@
 msgstr ""
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
 msgid "See: %s"
 msgstr ""
 
@@ -3942,12 +3934,6 @@
 msgid "FoafViewerPlugin"
 msgstr ""
 
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
 msgid "FullRecentChanges"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/fr.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1659,30 +1659,6 @@
 msgid "Title"
 msgstr "Titre"
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-"Affiche une URL dans une cadre interne à la page. Un seul cadre autorisé."
-
-msgid "Plugin not run: not in browse mode"
-msgstr "Greffon non exécuté (hors navigation)"
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr "Insertion récursive de la page %s"
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr "%s ou %s paramètre manquant"
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr "Insertion récursive de l'URL %s"
-
-#, php-format
-msgid "See %s"
-msgstr "Voir %s"
-
 msgid "Search the content of all pages in this wiki."
 msgstr "Rechercher le contenu de toutes les pages de ce wiki."
 
@@ -2353,6 +2329,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr "Affiche une liste de pages prises au hasard sur ce wiki."
 
+msgid "Plugin not run: not in browse mode"
+msgstr "Greffon non exécuté (hors navigation)"
+
 msgid "RandomPage"
 msgstr "PageAléatoire"
 
@@ -2739,6 +2718,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr "Voir %s"
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr "Opérateur interdit : %s"
 
@@ -2996,6 +2979,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "Insertion récursive de la page %s"
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -3060,6 +3047,10 @@
 msgstr "%s paramètre manquant"
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr "Insertion récursive de l'URL %s"
+
+#, php-format
 msgid "See: %s"
 msgstr "Voir : %s"
 
@@ -3992,12 +3983,6 @@
 msgid "FoafViewerPlugin"
 msgstr "GreffonFoafViewer"
 
-msgid "FrameInclude"
-msgstr "InclureUnCadre"
-
-msgid "FrameIncludePlugin"
-msgstr "GreffonInclureUnCadre"
-
 msgid "FullRecentChanges"
 msgstr "DernièresModifs"
 
@@ -5976,6 +5961,9 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "%s or %s parameter missing"
+#~ msgstr "%s ou %s paramètre manquant"
+
 #~ msgid "Edit aborted."
 #~ msgstr "Modification annulée."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/it.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -1639,29 +1639,6 @@
 msgid "Title"
 msgstr ""
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
 msgid "Search the content of all pages in this wiki."
 msgstr ""
 
@@ -2315,6 +2292,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr ""
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr ""
 
@@ -2692,6 +2672,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -2945,6 +2929,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -3003,6 +2991,10 @@
 msgstr ""
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
 msgid "See: %s"
 msgstr ""
 
@@ -3908,12 +3900,6 @@
 msgid "FoafViewerPlugin"
 msgstr ""
 
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
 msgid "FullRecentChanges"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/ja.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1656,29 +1656,6 @@
 msgid "Title"
 msgstr "タイトル"
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr "%s を参照"
-
 msgid "Search the content of all pages in this wiki."
 msgstr ""
 
@@ -2339,6 +2316,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr ""
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr "ランダムページ"
 
@@ -2730,6 +2710,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr "%s を参照"
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -2985,6 +2969,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -3043,6 +3031,10 @@
 msgstr ""
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
 msgid "See: %s"
 msgstr "参照: %s"
 
@@ -3993,14 +3985,6 @@
 msgid "FoafViewerPlugin"
 msgstr "カレンダー"
 
-#, fuzzy
-msgid "FrameInclude"
-msgstr "インライン画像一覧"
-
-#, fuzzy
-msgid "FrameIncludePlugin"
-msgstr "インライン画像一覧"
-
 msgid "FullRecentChanges"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/nl.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -1630,29 +1630,6 @@
 msgid "Title"
 msgstr ""
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr "Zie %s"
-
 msgid "Search the content of all pages in this wiki."
 msgstr ""
 
@@ -2306,6 +2283,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr ""
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr ""
 
@@ -2683,6 +2663,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr "Zie %s"
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -2936,6 +2920,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -2994,6 +2982,10 @@
 msgstr ""
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
 msgid "See: %s"
 msgstr ""
 
@@ -3899,12 +3891,6 @@
 msgid "FoafViewerPlugin"
 msgstr ""
 
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
 msgid "FullRecentChanges"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/phpwiki.pot	2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1624,29 +1624,6 @@
 msgid "Title"
 msgstr ""
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
 msgid "Search the content of all pages in this wiki."
 msgstr ""
 
@@ -2300,6 +2277,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr ""
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr ""
 
@@ -2677,6 +2657,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -2930,6 +2914,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -2988,6 +2976,10 @@
 msgstr ""
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
 msgid "See: %s"
 msgstr ""
 
@@ -3893,12 +3885,6 @@
 msgid "FoafViewerPlugin"
 msgstr ""
 
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
 msgid "FullRecentChanges"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/sv.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -1625,29 +1625,6 @@
 msgid "Title"
 msgstr ""
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr ""
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of page %s"
-msgstr ""
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr ""
-
-#, php-format
-msgid "Recursive inclusion of url %s"
-msgstr ""
-
-#, php-format
-msgid "See %s"
-msgstr ""
-
 msgid "Search the content of all pages in this wiki."
 msgstr ""
 
@@ -2301,6 +2278,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr ""
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr ""
 
@@ -2678,6 +2658,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr ""
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -2931,6 +2915,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, php-format
+msgid "Recursive inclusion of page %s"
+msgstr ""
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -2989,6 +2977,10 @@
 msgstr ""
 
 #, php-format
+msgid "Recursive inclusion of url %s"
+msgstr ""
+
+#, php-format
 msgid "See: %s"
 msgstr ""
 
@@ -3894,12 +3886,6 @@
 msgid "FoafViewerPlugin"
 msgstr ""
 
-msgid "FrameInclude"
-msgstr ""
-
-msgid "FrameIncludePlugin"
-msgstr ""
-
 msgid "FullRecentChanges"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/locale/po/zh.po	2014-09-04 16:17:25 UTC (rev 9062)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 16:33+0200\n"
+"POT-Creation-Date: 2014-09-04 18:09+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1698,29 +1698,6 @@
 msgid "Title"
 msgstr "標題搜索"
 
-msgid ""
-"Display a url in a separate frame inside our body. Only one frame allowed."
-msgstr "在內容的分離框架中顯示 url. 只能放一個框架."
-
-msgid "Plugin not run: not in browse mode"
-msgstr ""
-
-#, fuzzy, php-format
-msgid "Recursive inclusion of page %s"
-msgstr "遞迴含括頁面 %s"
-
-#, php-format
-msgid "%s or %s parameter missing"
-msgstr "%s 或 %s 參數遺漏"
-
-#, fuzzy, php-format
-msgid "Recursive inclusion of url %s"
-msgstr "遞迴含括 url %s"
-
-#, php-format
-msgid "See %s"
-msgstr "參照 %s"
-
 msgid "Search the content of all pages in this wiki."
 msgstr "在此 wiki 所有頁面中搜尋內容."
 
@@ -2400,6 +2377,9 @@
 msgid "Display a list of randomly chosen pages or redirects to a random page."
 msgstr "顯示隨機選出的頁面列表或重導向到隨機選取的頁面."
 
+msgid "Plugin not run: not in browse mode"
+msgstr ""
+
 msgid "RandomPage"
 msgstr ""
 
@@ -2801,6 +2781,10 @@
 msgstr ""
 
 #, php-format
+msgid "See %s"
+msgstr "參照 %s"
+
+#, php-format
 msgid "Illegal operator: %s"
 msgstr ""
 
@@ -3060,6 +3044,10 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Recursive inclusion of page %s"
+msgstr "遞迴含括頁面 %s"
+
 msgid ""
 "Convert Tex mathematicals expressions to cached PNG files. This is for small "
 "text."
@@ -3118,6 +3106,10 @@
 msgid "%s parameter missing"
 msgstr "%s 參數遺漏"
 
+#, fuzzy, php-format
+msgid "Recursive inclusion of url %s"
+msgstr "遞迴含括 url %s"
+
 #, php-format
 msgid "See: %s"
 msgstr "參閱: %s"
@@ -4080,14 +4072,6 @@
 msgid "FoafViewerPlugin"
 msgstr ""
 
-#, fuzzy
-msgid "FrameInclude"
-msgstr "含括頁面"
-
-#, fuzzy
-msgid "FrameIncludePlugin"
-msgstr "含括頁面"
-
 msgid "FullRecentChanges"
 msgstr ""
 
@@ -6135,6 +6119,9 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "%s or %s parameter missing"
+#~ msgstr "%s 或 %s 參數遺漏"
+
 #~ msgid "Edit aborted."
 #~ msgstr "編輯中止."
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Deleted: trunk/pgsrc/Help%2FFrameIncludePlugin
===================================================================
--- trunk/pgsrc/Help%2FFrameIncludePlugin	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/pgsrc/Help%2FFrameIncludePlugin	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,32 +0,0 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
-Content-Type: application/x-phpwiki;
-  pagename=Help%2FFrameIncludePlugin;
-  flags=PAGE_LOCKED;
-  charset=UTF-8
-Content-Transfer-Encoding: binary
-
-The **~FrameInclude** [[Help:WikiPlugin|plugin]] will create an HTML frame that will fill the entire display area of the page (that is, the whole area the user is allowed to edit). All other text will be discarded when the page is rendered (anything outside the call to plugin, that is). In the language of hypertext this is called //transclusion//.
-
-You might also be interested in the [[Help:IncludePagePlugin|IncludePage]] plugin.
-
-== Examples ==
-
-To include a page from another site, use the **src** attribute:
-
-{{{
-<<FrameInclude src="http://phpwiki.fr/">>
-}}}
-
-To include a page from within this wiki, use the **page** attribute:
-
-{{{
-<<FrameInclude page=HomePage>>
-}}}
-
-For more information on this plugin please read the PHP source code in the /lib/plugin directory.
-
-<noinclude>
-----
-[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
-</noinclude>

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,4 +1,4 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
+Date: Thu,  4 Sep 2014 18:14:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagePlugin;
@@ -7,7 +7,7 @@
 Content-Transfer-Encoding: binary
 
 The **~IncludePage** [[Help:WikiPlugin|plugin]] will "include" other pages in this wiki. In the language of hypertext this is called //transclusion//.
-The pages will render in distinct tables. You can also load external pages in a more limited fashion with the [[Help:FrameIncludePlugin|FrameInclude]] plugin.
+The pages will render in distinct tables.
 
 == Usage ==
 
@@ -95,7 +95,6 @@
 
 * [[Help:IncludePagesPlugin]] (to include multiple pages)
 * [[Help:TemplatePlugin]] (to include a page with parameters)
-* [[Help:FrameIncludePlugin]] (to include an external page)
 
 <noinclude>
 ----

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/pgsrc/ReleaseNotes	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,4 +1,4 @@
-Date: Thu,  4 Sep 2014 17:37:27 +0000
+Date: Thu,  4 Sep 2014 18:14:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -11,6 +11,7 @@
 == 1.5.1 2014-09-xx Marc-Etienne Vargenau ==
 
 * fix Bug#456 'Optimizing Database' message sometimes printed on page 
+* remove FrameInclude plugin (frames are not supported in HTML 5)
 
 == 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
 

Deleted: trunk/themes/Sidebar/templates/frame-left.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frame-left.tmpl	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/themes/Sidebar/templates/frame-left.tmpl	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,14 +0,0 @@
-<?php
-/* 
- * This template is responsible mainly for the outer level <html> stuff.
- */
-?>
-<!DOCTYPE html>
-<head>
-<meta charset="UTF-8" />
-<?php echo Template('head') ?>
-<body>
-<div class="toolbar"><?php echo Template('navbar') ?></div>
-<div class="toolbar"><?php echo Template('actionbar') ?></div>
-</body>
-</html>

Deleted: trunk/themes/Sidebar/templates/frameset.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/frameset.tmpl	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/themes/Sidebar/templates/frameset.tmpl	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,26 +0,0 @@
-<?php
-/*
- * This template is used for the FrameInclude plugin.
- */
-
-$topurl = $request->getURLtoSelf(array('frame' => 'header'));
-$boturl = $request->getURLtoSelf(array('frame' => 'footer'));
-$lefturl = $request->getURLtoSelf(array('frame' => 'left'));
-
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?php echo Template('head') ?>
-
-<frameset rows="<?php echo $ROWS?>">
-  <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> />
-  <frameset cols="<?php echo $COLS?>">
-    <frame name="left" src="<?php echo $lefturl?>" <?php echo $FRAMEARGS ?> />
-    <?php echo $CONTENT_FRAME ?>
-  </frameset>
-  <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> />
-  <noframes><?php echo Template('body') ?></noframes>
-</frameset>
-</html>

Deleted: trunk/themes/default/templates/frameset.tmpl
===================================================================
--- trunk/themes/default/templates/frameset.tmpl	2014-09-04 15:38:45 UTC (rev 9061)
+++ trunk/themes/default/templates/frameset.tmpl	2014-09-04 16:17:25 UTC (rev 9062)
@@ -1,22 +0,0 @@
-<?php
-/*
- * This template is used for the FrameInclude plugin.
- */
-
-$topurl = $request->getURLtoSelf(array('frame' => 'header'));
-$boturl = $request->getURLtoSelf(array('frame' => 'footer'));
-
-printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET);
-?>
-<!DOCTYPE html   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<?php echo Template('head') ?>
-
-<frameset rows="<?php echo $ROWS?>">
-  <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> />
-  <?php echo $CONTENT_FRAME ?>
-  <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> />
-  <noframes><?php echo Template('body') ?></noframes>
-</frameset>
-</html>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9061] trunk

[<var...@us...>]

Revision: 9061
          http://sourceforge.net/p/phpwiki/code/9061
Author:   vargenau
Date:     2014-09-04 15:38:45 +0000 (Thu, 04 Sep 2014)
Log Message:
-----------
fix Bug#456 'Optimizing Database' message sometimes printed on page

Modified Paths:
--------------
    trunk/lib/WikiDB.php
    trunk/lib/main.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2014-09-01 10:14:55 UTC (rev 9060)
+++ trunk/lib/WikiDB.php	2014-09-04 15:38:45 UTC (rev 9061)
@@ -1034,8 +1034,9 @@
                 (time() % DATABASE_OPTIMISE_FREQUENCY == 0))
         ) {
             if ($backend->optimize()) {
-                if ((int)DEBUG)
+                if ((int)DEBUG) {
                     trigger_error(_("Optimizing database"), E_USER_NOTICE);
+                }
             }
         }
 

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2014-09-01 10:14:55 UTC (rev 9060)
+++ trunk/lib/main.php	2014-09-04 15:38:45 UTC (rev 9061)
@@ -107,8 +107,11 @@
             or (DATABASE_OPTIMISE_FREQUENCY > 0 and
                 (time() % DATABASE_OPTIMISE_FREQUENCY == 0))
         ) {
-            if ($this->_dbi->_backend->optimize())
-                trigger_error(_("Optimizing database"), E_USER_NOTICE);
+            if ($this->_dbi->_backend->optimize()) {
+                if ((int)DEBUG) {
+                    trigger_error(_("Optimizing database"), E_USER_NOTICE);
+                }
+            }
         }
 
         // Restore auth state. This doesn't check for proper authorization!

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2014-09-01 10:14:55 UTC (rev 9060)
+++ trunk/pgsrc/ReleaseNotes	2014-09-04 15:38:45 UTC (rev 9061)
@@ -1,4 +1,4 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
+Date: Thu,  4 Sep 2014 17:37:27 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,6 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
+== 1.5.1 2014-09-xx Marc-Etienne Vargenau ==
+
+* fix Bug#456 'Optimizing Database' message sometimes printed on page 
+
 == 1.5.0 2014-07-29 Marc-Etienne Vargenau ==
 
 === Main Changes ===

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9060] trunk/lib

[<var...@us...>]

Revision: 9060
          http://sourceforge.net/p/phpwiki/code/9060
Author:   vargenau
Date:     2014-09-01 10:14:55 +0000 (Mon, 01 Sep 2014)
Log Message:
-----------
Cosmetic

Modified Paths:
--------------
    trunk/lib/main.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RedirectTo.php

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2014-09-01 09:25:35 UTC (rev 9059)
+++ trunk/lib/main.php	2014-09-01 10:14:55 UTC (rev 9060)
@@ -387,7 +387,8 @@
         if (!empty($HTTP_GET_VARS['start_debug'])) // zend ide support
             return WikiURL($pagename, array('action' => $action, 'start_debug' => 1));
         elseif ($action == 'edit')
-            return WikiURL($pagename); else
+            return WikiURL($pagename); 
+        else
             return WikiURL($pagename, array('action' => $action));
     }
 

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2014-09-01 09:25:35 UTC (rev 9059)
+++ trunk/lib/plugin/RecentChanges.php	2014-09-01 10:14:55 UTC (rev 9060)
@@ -1302,7 +1302,9 @@
 
     function getArgs($argstr, $request = false, $defaults = array())
     {
-        if (!$defaults) $defaults = $this->getDefaultArguments();
+        if (empty($defaults)) {
+            $defaults = $this->getDefaultArguments();
+        }
         $args = WikiPlugin::getArgs($argstr, $request, $defaults);
 
         $action = $request->getArg('action');

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2014-09-01 09:25:35 UTC (rev 9059)
+++ trunk/lib/plugin/RedirectTo.php	2014-09-01 10:14:55 UTC (rev 9060)
@@ -53,7 +53,7 @@
 
     function run($dbi, $argstr, &$request, $basepage)
     {
-        $args = ($this->getArgs($argstr, $request));
+        $args = $this->getArgs($argstr, $request);
 
         $href = $args['href'];
         $page = $args['page'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9059] trunk/lib/plugin/WikiPoll.php

[<var...@us...>]

Revision: 9059
          http://sourceforge.net/p/phpwiki/code/9059
Author:   vargenau
Date:     2014-09-01 09:25:35 +0000 (Mon, 01 Sep 2014)
Log Message:
-----------
Fix wiki test, broken test caused by wiki refactoring

Modified Paths:
--------------
    trunk/lib/plugin/WikiPoll.php

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2014-08-27 16:18:17 UTC (rev 9058)
+++ trunk/lib/plugin/WikiPoll.php	2014-09-01 09:25:35 UTC (rev 9059)
@@ -72,8 +72,9 @@
 
     function getArgs($argstr, $request = false, $defaults = array())
     {
-        if ($defaults === false)
+        if (empty($defaults)) {
             $defaults = $this->getDefaultArguments();
+        }
         //Fixme: on POST argstr is empty
         $args = array();
         list ($argstr_args, $argstr_defaults) = $this->parseArgStr($argstr);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9058] trunk/lib

[<var...@us...>]

Revision: 9058
          http://sourceforge.net/p/phpwiki/code/9058
Author:   vargenau
Date:     2014-08-27 16:18:17 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
Use parent::__construct

Modified Paths:
--------------
    trunk/lib/RssWriter.php
    trunk/lib/RssWriter2.php

Modified: trunk/lib/RssWriter.php
===================================================================
--- trunk/lib/RssWriter.php	2014-08-27 14:34:23 UTC (rev 9057)
+++ trunk/lib/RssWriter.php	2014-08-27 16:18:17 UTC (rev 9058)
@@ -13,7 +13,7 @@
 {
     function __construct()
     {
-        $this->XmlElement('rdf:RDF',
+        parent::__construct('rdf:RDF',
             array('xmlns' => "http://purl.org/rss/1.0/",
                 'xmlns:rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'));
 

Modified: trunk/lib/RssWriter2.php
===================================================================
--- trunk/lib/RssWriter2.php	2014-08-27 14:34:23 UTC (rev 9057)
+++ trunk/lib/RssWriter2.php	2014-08-27 16:18:17 UTC (rev 9058)
@@ -19,8 +19,7 @@
 {
     function __construct()
     {
-        $this->XmlElement('rss',
-            array('version' => "2.0"));
+        parent::__construct('rss', array('version' => "2.0"));
 
         // not used. no namespaces should be used.
         $this->_modules = array(

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9057] trunk/locale

[<var...@us...>]

Revision: 9057
          http://sourceforge.net/p/phpwiki/code/9057
Author:   vargenau
Date:     2014-08-27 14:34:23 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/de.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/es.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/fr.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5993,15 +5993,6 @@
 #~ msgid "Views"
 #~ msgstr "Vues"
 
-#~ msgid "Prediction: %s"
-#~ msgstr "Prédiction : %s"
-
-#~ msgid "Prediction: %.1f"
-#~ msgstr "Prédiction : %.1f"
-
-#~ msgid "invalid %s ignored"
-#~ msgstr "%s non valable ignoré"
-
 #~ msgid "Version %s"
 #~ msgstr "Version %s"
 
@@ -6016,17 +6007,5 @@
 #~ msgid "Select the pages to change:"
 #~ msgstr "Sélectionnez les pages à modifier :"
 
-#, fuzzy
-#~ msgid "History of all major edits by %s to page %s."
-#~ msgstr ""
-#~ "Historique de toutes les éditions majeures et mineures par %s sur la page "
-#~ "%s."
-
-#, fuzzy
-#~ msgid "History of major modifications for any page edited by %s."
-#~ msgstr ""
-#~ "Historique des éditions majeures ou mineures pour n'importe quelle page "
-#~ "éditée par %s."
-
 #~ msgid "Spell Checker"
 #~ msgstr "Correcteur orthographique"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/it.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/ja.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -562,7 +562,7 @@
 
 #, php-format
 msgid "%s bytes written"
-msgstr "%s  バイト書き込みました。"
+msgstr "%s  バイト書き込みました"
 
 #, php-format
 msgid "... copied to %s"
@@ -713,13 +713,11 @@
 msgid "Error: Couldn't send %s to %s"
 msgstr "メール通知"
 
-#, fuzzy
 msgid "Page change"
-msgstr "変更しませんでした。"
+msgstr ""
 
-#, fuzzy
 msgid "Page creation"
-msgstr "ページバージョン"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Created by: %s"
@@ -1096,9 +1094,8 @@
 msgid "SearchReplace"
 msgstr ""
 
-#, fuzzy
 msgid "List this page and all subpages"
-msgstr "全ページ一覧"
+msgstr ""
 
 msgid "View this page and all subpages"
 msgstr ""
@@ -1193,13 +1190,13 @@
 msgid "List all pages in this wiki."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "All pages in this wiki (%d total):"
-msgstr "%s のページ履歴一覧"
+msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "List of user-created pages (%d total):"
-msgstr "%s のページ履歴一覧"
+msgstr ""
 
 #, php-format
 msgid "List of pages owned by [%s] (%d total):"
@@ -1317,9 +1314,8 @@
 msgid "AppendText to %s"
 msgstr ""
 
-#, fuzzy
 msgid "Page successfully updated."
-msgstr "パスワード"
+msgstr ""
 
 #, php-format
 msgid "Go to %s."
@@ -1559,9 +1555,9 @@
 msgid "Show a markup retransformation of page %s."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Retransform page “%s”"
-msgstr "全ページ一覧"
+msgstr ""
 
 msgid "Display differences between revisions."
 msgstr ""
@@ -1593,7 +1589,7 @@
 
 #, php-format
 msgid "Edit metadata for %s."
-msgstr "%s のMETAデータの編集"
+msgstr "%s のMETAデータの編集."
 
 #, php-format
 msgid "No metadata for %s"
@@ -1740,9 +1736,8 @@
 msgid "Make use of the Google API."
 msgstr ""
 
-#, fuzzy
 msgid "Nothing found"
-msgstr "変更点が見つかりませんでした。"
+msgstr ""
 
 msgid "Go to or create page."
 msgstr ""
@@ -1831,9 +1826,8 @@
 msgid "Search"
 msgstr "検索"
 
-#, fuzzy
 msgid "Display Jabber presence."
-msgstr "ユーザー設定"
+msgstr ""
 
 msgid "Search an LDAP directory."
 msgstr ""
@@ -2078,13 +2072,12 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-#, fuzzy
 msgid "Warning:"
-msgstr "警告!"
+msgstr "警告:"
 
-#, fuzzy, php-format
+#, php-format
 msgid "PageGroup for %s."
-msgstr "ページグループ"
+msgstr ""
 
 msgid "Contents"
 msgstr "コンテンツ"
@@ -2133,19 +2126,18 @@
 msgstr ""
 
 msgid "History of changes."
-msgstr "変更履歴"
+msgstr "変更履歴."
 
 #, php-format
 msgid "List PageHistory for %s."
-msgstr "%s のページ履歴一覧"
+msgstr "%s のページ履歴一覧."
 
 #, php-format
 msgid "Show extra page Info and statistics for %s."
 msgstr ""
 
-#, fuzzy
 msgid "Display PageTrail."
-msgstr "ページ名"
+msgstr ""
 
 msgid ""
 "Allow admin to reset any users password, allow user to request his password "
@@ -2222,7 +2214,7 @@
 msgstr ""
 
 msgid "PHP syntax highlighting."
-msgstr "PHP構文ハイライト"
+msgstr "PHP構文ハイライト."
 
 msgid "Please provide source code to PhpHighlight plugin"
 msgstr ""
@@ -2254,9 +2246,8 @@
 msgid "Submit location"
 msgstr "所在地変更"
 
-#, fuzzy
 msgid "Ploticus image creation."
-msgstr "ページバージョン"
+msgstr ""
 
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
@@ -2386,6 +2377,14 @@
 msgid "Your rating was %.1f"
 msgstr ""
 
+#, fuzzy, php-format
+msgid "Prediction: %s"
+msgstr "編集: %s"
+
+#, php-format
+msgid "Prediction: %.1f"
+msgstr ""
+
 msgid "RateIt"
 msgstr ""
 
@@ -2458,9 +2457,9 @@
 msgid "created new pages"
 msgstr "ページを作成しています。"
 
-#, fuzzy, php-format
+#, php-format
 msgid " for pages changed by %s"
-msgstr "変更しませんでした。"
+msgstr ""
 
 #, php-format
 msgid " for pages owned by %s"
@@ -2510,12 +2509,11 @@
 msgid "All %s are listed below."
 msgstr ""
 
-#, fuzzy
 msgid "No comments found"
-msgstr "変更点が見つかりませんでした。"
+msgstr ""
 
 msgid "No changes found"
-msgstr "変更点が見つかりませんでした。"
+msgstr "変更点が見つかりませんでした"
 
 msgid "Click to add this feed to your sidebar"
 msgstr ""
@@ -2813,9 +2811,9 @@
 msgid "%s force"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Postponed %s for %s."
-msgstr "%s のページ履歴一覧"
+msgstr ""
 
 msgid "skipped"
 msgstr ""
@@ -2913,7 +2911,7 @@
 
 #, php-format
 msgid "Total %d plugins: "
-msgstr "合計 %d プラグイン"
+msgstr "合計 %d プラグイン: "
 
 #, php-format
 msgid "Total of %d languages: "
@@ -2927,7 +2925,7 @@
 
 #, php-format
 msgid "Total of %d themes: "
-msgstr "総テーマ数: %d"
+msgstr "総テーマ数 %d: "
 
 msgid "Current theme"
 msgstr "現在のテーマ"
@@ -3192,13 +3190,11 @@
 msgid "Wrong password. Try again."
 msgstr ""
 
-#, fuzzy
 msgid "Password updated."
-msgstr "パスワード"
+msgstr ""
 
-#, fuzzy
 msgid "Password was not changed."
-msgstr "パスワード"
+msgstr ""
 
 msgid "Password cannot be changed."
 msgstr ""
@@ -3206,9 +3202,8 @@
 msgid "No changes."
 msgstr "変更しませんでした。"
 
-#, fuzzy
 msgid "One UserPreferences field successfully updated."
-msgstr "パスワード"
+msgstr ""
 
 #, php-format
 msgid "%d UserPreferences fields successfully updated."
@@ -3269,9 +3264,9 @@
 msgid "WantedPages"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Wanted Pages for %s (%d total):"
-msgstr "%s のページ履歴一覧"
+msgstr ""
 
 #, php-format
 msgid "Wanted Pages in this wiki (%d total):"
@@ -3288,9 +3283,9 @@
 msgid "Wanted From"
 msgstr "データフォーマット"
 
-#, fuzzy, php-format
+#, php-format
 msgid "Wanted Pages for %s:"
-msgstr "%s のページ履歴一覧"
+msgstr ""
 
 msgid "Wanted Pages in this wiki:"
 msgstr ""
@@ -3322,9 +3317,8 @@
 msgid "Watch Page"
 msgstr "幅"
 
-#, fuzzy
 msgid "You must sign in to watch pages."
-msgstr "%s としてサインインしました"
+msgstr ""
 
 msgid "ERROR: No e-mail defined! You need to do this in your "
 msgstr ""
@@ -3362,9 +3356,8 @@
 msgid "%d minutes"
 msgstr ""
 
-#, fuzzy
 msgid "Change owner of selected pages."
-msgstr "選択ページを全て削除"
+msgstr ""
 
 #, php-format
 msgid "Access denied to change page “%s”."
@@ -3378,43 +3371,39 @@
 msgid "Could not change owner of page “%s” to “%s”."
 msgstr "“%s” の削除に成功しました。"
 
-#, fuzzy
 msgid "One page has been changed:"
-msgstr "変更しませんでした。"
+msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "%d pages have been changed:"
-msgstr "変更しませんでした。"
+msgstr ""
 
-#, fuzzy
 msgid "No pages changed."
-msgstr "変更しませんでした。"
+msgstr ""
 
 msgid "Confirm ownership change"
 msgstr ""
 
-#, fuzzy
 msgid "Are you sure you want to change the owner of the selected pages?"
-msgstr "選択ページを全て削除"
+msgstr ""
 
 #, fuzzy
 msgid "Select the pages to change the owner"
 msgstr "貴方個人の言語を選択"
 
-#, fuzzy
 msgid "Change owner to: "
-msgstr "国名変更"
+msgstr ""
 
 msgid "Delete page permissions."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "ACL deleted for page “%s”"
-msgstr "全ページ一覧"
+msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "%d pages have been changed."
-msgstr "変更しませんでした。"
+msgstr ""
 
 #, fuzzy
 msgid "Delete ACL"
@@ -3427,9 +3416,8 @@
 msgid "Selected Pages: "
 msgstr ""
 
-#, fuzzy
 msgid "Permanently purge all selected pages."
-msgstr "選択ページを全て削除"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Purged page “%s” successfully."
@@ -3439,17 +3427,15 @@
 msgid "Didn't purge page “%s”. Access denied."
 msgstr "“%s” の削除に成功しました。"
 
-#, fuzzy
 msgid "One page has been permanently purged:"
-msgstr "変更しませんでした。"
+msgstr ""
 
 #, php-format
 msgid "%d pages have been permanently purged:"
 msgstr ""
 
-#, fuzzy
 msgid "No pages purged."
-msgstr "変更しませんでした。"
+msgstr ""
 
 msgid "Confirm purge"
 msgstr ""
@@ -3457,9 +3443,8 @@
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#, fuzzy
 msgid "Permanently purge selected pages"
-msgstr "選択ページを全て削除"
+msgstr ""
 
 #, fuzzy
 msgid "Select the files to purge"
@@ -3476,17 +3461,15 @@
 msgid "Didn't remove page “%s”. Access denied."
 msgstr "“%s” の削除に成功しました。"
 
-#, fuzzy
 msgid "One page has been removed:"
-msgstr "変更しませんでした。"
+msgstr ""
 
 #, php-format
 msgid "%d pages have been removed:"
 msgstr ""
 
-#, fuzzy
 msgid "No pages removed."
-msgstr "変更点が見つかりませんでした。"
+msgstr ""
 
 #, fuzzy
 msgid "Remove"
@@ -3512,9 +3495,8 @@
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
 
-#, fuzzy
 msgid "Rename selected pages."
-msgstr "選択ページを全て削除"
+msgstr ""
 
 msgid "Rename to"
 msgstr ""
@@ -3526,9 +3508,8 @@
 msgid "Rename Page"
 msgstr "ページ削除"
 
-#, fuzzy
 msgid "Rename selected pages"
-msgstr "選択ページを全て削除"
+msgstr ""
 
 msgid "Select the pages to rename:"
 msgstr ""
@@ -3541,9 +3522,9 @@
 msgid "Page “%s” already exists. Ignored."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Access denied to rename page “%s”."
-msgstr "全ページ一覧"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Renamed page from “%s” to “%s”."
@@ -3557,17 +3538,15 @@
 msgid "Couldn't rename page “%s” to “%s”."
 msgstr ""
 
-#, fuzzy
 msgid "One page has been renamed:"
-msgstr "変更しませんでした。"
+msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "%d pages have been renamed:"
-msgstr "変更点が見つかりませんでした。"
+msgstr ""
 
-#, fuzzy
 msgid "No pages renamed."
-msgstr "変更点が見つかりませんでした。"
+msgstr ""
 
 #, fuzzy
 msgid "from"
@@ -3633,7 +3612,7 @@
 msgstr ""
 
 msgid "Select: "
-msgstr "選択:"
+msgstr "選択: "
 
 msgid "Select pages"
 msgstr ""
@@ -3645,21 +3624,21 @@
 msgid "Set individual page permissions."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "ACL not changed for page “%s”."
-msgstr "全ページ一覧"
+msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "ACL changed for page “%s”"
-msgstr "全ページ一覧"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "to “%s”."
 msgstr "“%s” を読込み中です。"
 
-#, fuzzy, php-format
+#, php-format
 msgid "ACL changed for page “%s” from “%s” to “%s”."
-msgstr "全ページ一覧"
+msgstr ""
 
 msgid "Invalid ACL"
 msgstr ""
@@ -3794,16 +3773,16 @@
 msgid "Change Verification Status"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show and add blogs for %s."
-msgstr "%s のページ履歴一覧"
+msgstr ""
 
 msgid "New comment."
-msgstr "新規コメント"
+msgstr "新規コメント."
 
-#, fuzzy, php-format
+#, php-format
 msgid "%s on %s:"
-msgstr "%s バイト"
+msgstr ""
 
 msgid "Layout tables using the Wikicreole syntax."
 msgstr ""
@@ -4084,9 +4063,8 @@
 msgid "InterWikiSearch"
 msgstr "InterWiki検索"
 
-#, fuzzy
 msgid "JabberPresence"
-msgstr "ユーザー設定"
+msgstr ""
 
 msgid "LdapSearch"
 msgstr "LDAP検索"
@@ -4145,13 +4123,11 @@
 msgid "PageInfo"
 msgstr "ページ情報"
 
-#, fuzzy
 msgid "PageTrail"
-msgstr "ページ名"
+msgstr ""
 
-#, fuzzy
 msgid "PasswordReset"
-msgstr "パスワード:"
+msgstr ""
 
 msgid "PhotoAlbum"
 msgstr "フォトアルバム"
@@ -4340,9 +4316,8 @@
 msgid "WabiSabi"
 msgstr ""
 
-#, fuzzy
 msgid "WantedPagesOld"
-msgstr "%s のページ履歴一覧"
+msgstr ""
 
 #, fuzzy
 msgid "WatchPage"
@@ -4453,9 +4428,8 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#, fuzzy
 msgid "Purge Page"
-msgstr "変更しませんでした。"
+msgstr ""
 
 #, php-format
 msgid "You are about to purge “%s”!"
@@ -4552,9 +4526,9 @@
 msgid "Control characters not allowed"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Illegal chars %s removed"
-msgstr "ページ名が正しくありません。"
+msgstr ""
 
 msgid "Revision Not Found"
 msgstr "リビジョンが見つかりません"
@@ -4639,9 +4613,8 @@
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-#, fuzzy
 msgid "rename to Help: pages"
-msgstr "選択ページを全て削除"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "rename %s to %s"
@@ -4656,13 +4629,12 @@
 msgid "database"
 msgstr ""
 
-#, fuzzy
 msgid "Backend type: "
-msgstr "データベースタイプ"
+msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Check for table %s"
-msgstr "全ページ一覧"
+msgstr ""
 
 msgid "Check for new session.sess_ip column"
 msgstr ""
@@ -4890,9 +4862,8 @@
 msgid "Avg. Rating"
 msgstr ""
 
-#, fuzzy
 msgid "Top Recommendations"
-msgstr "変更点が見つかりませんでした。"
+msgstr ""
 
 msgid "Members:"
 msgstr ""
@@ -5167,9 +5138,8 @@
 msgid "Couldn't connect to %s"
 msgstr ""
 
-#, fuzzy
 msgid "Apply changes"
-msgstr "変更しませんでした。"
+msgstr ""
 
 msgid "Exit toolbar"
 msgstr ""
@@ -5267,7 +5237,7 @@
 msgstr ""
 
 msgid "View the current version."
-msgstr "現在のバージョンを表示する"
+msgstr "現在のバージョンを表示する."
 
 #, php-format
 msgid "Page Execution took %s seconds"
@@ -5291,9 +5261,8 @@
 msgid "Blog"
 msgstr "ダイアログ"
 
-#, fuzzy
 msgid "Page Trail"
-msgstr "ページ名"
+msgstr ""
 
 msgid "This page has been locked and cannot be edited."
 msgstr ""
@@ -5400,9 +5369,9 @@
 msgid "Modified on %s by %s"
 msgstr "編集: %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%s by %s"
-msgstr "%s バイト"
+msgstr ""
 
 #, fuzzy, php-format
 msgid ", Memory: %s"
@@ -5466,9 +5435,8 @@
 msgid "No"
 msgstr "なし"
 
-#, fuzzy
 msgid "ACL type"
-msgstr "データベースタイプ"
+msgstr ""
 
 #, fuzzy
 msgid "Home Page"
@@ -5600,7 +5568,7 @@
 
 #, fuzzy, php-format
 msgid "You are signed but not authenticated as %s. "
-msgstr "%s としてサインインしました"
+msgstr "%s としてサインインしました. "
 
 #, fuzzy, php-format
 msgid "Click to authenticate as %s"
@@ -5608,23 +5576,23 @@
 
 #, fuzzy
 msgid "Sign in as:"
-msgstr "サインイン"
+msgstr "サインイン:"
 
 msgid "<system theme>"
 msgstr "<システムテーマ>"
 
 msgid "Personal theme:"
-msgstr "個人テーマ"
+msgstr "個人テーマ:"
 
 msgid "<system language>"
 msgstr "<システム言語>"
 
 msgid "Personal language:"
-msgstr "個人言語"
+msgstr "個人言語:"
 
-#, fuzzy, php-format
+#, php-format
 msgid "User preferences for user %s"
-msgstr "ユーザー設定"
+msgstr ""
 
 msgid "UserId"
 msgstr "ユーザーID"
@@ -5644,9 +5612,8 @@
 msgid "Change Password"
 msgstr "パスワード変更"
 
-#, fuzzy
 msgid "Set Password"
-msgstr "パスワード:"
+msgstr ""
 
 msgid "New password"
 msgstr "新規パスワード"
@@ -5770,9 +5737,9 @@
 msgid "Reset Preferences"
 msgstr "参照一覧"
 
-#, fuzzy, php-format
+#, php-format
 msgid "Entry on %s by %s."
-msgstr "%s バイト"
+msgstr ""
 
 msgid "New Topic"
 msgstr ""
@@ -5808,9 +5775,8 @@
 msgid "Back Links"
 msgstr "ログイン"
 
-#, fuzzy
 msgid "Change Owner"
-msgstr "国名変更"
+msgstr ""
 
 msgid "Access Rights"
 msgstr ""
@@ -5869,20 +5835,17 @@
 msgid "My User Page"
 msgstr "ユーザーページ"
 
-#, fuzzy
 msgid "User Preferences"
 msgstr "ユーザー設定"
 
-#, fuzzy
 msgid "User preferences for this project"
-msgstr "ユーザー設定"
+msgstr ""
 
 msgid "E-mail Notification"
 msgstr ""
 
-#, fuzzy
 msgid "Global user preferences (for all projects)"
-msgstr "ユーザー設定"
+msgstr ""
 
 msgid "Menus"
 msgstr ""
@@ -5899,9 +5862,8 @@
 msgid "Left Menu"
 msgstr ""
 
-#, fuzzy
 msgid "Show Page Trail"
-msgstr "ページ名"
+msgstr ""
 
 msgid "Show Page Trail at top of page."
 msgstr ""
@@ -6094,10 +6056,6 @@
 #~ msgid "SetExternal"
 #~ msgstr "管理"
 
-#, fuzzy
-#~ msgid "Pagename(s): "
-#~ msgstr "ページ名"
-
 #~ msgid "Plugins"
 #~ msgstr "プラグイン一覧"
 
@@ -6111,35 +6069,11 @@
 #~ msgid "Dump pages as XHTML"
 #~ msgstr "XHTMLで出力"
 
-#, fuzzy
-#~ msgid "Change owner of selected pages"
-#~ msgstr "選択ページを全て削除"
-
 #~ msgid "<none>"
 #~ msgstr "<なし>"
 
 #~ msgid "Current language: “%s”"
 #~ msgstr "現在の言語: %s"
 
-#, fuzzy
-#~ msgid "ACL deleted for page “%s”."
-#~ msgstr "全ページ一覧"
-
-#, fuzzy
-#~ msgid "No pagename specified"
-#~ msgstr "変更点が見つかりませんでした。"
-
-#, fuzzy
-#~ msgid "No page specified."
-#~ msgstr "変更点が見つかりませんでした。"
-
 #~ msgid "too long"
 #~ msgstr "長すぎます。"
-
-#, fuzzy
-#~ msgid "Invalid pagename!"
-#~ msgstr "ユーザーIDかパスワードが無効です。"
-
-#, fuzzy
-#~ msgid "' in page name."
-#~ msgstr "“%s”: ページ名が正しくありません"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/nl.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/phpwiki.pot	2014-08-27 14:34:23 UTC (rev 9057)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/sv.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-08-27 12:23:38 UTC (rev 9056)
+++ trunk/locale/po/zh.po	2014-08-27 14:34:23 UTC (rev 9057)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-27 11:40+0200\n"
+"POT-Creation-Date: 2014-08-27 16:33+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -28,7 +28,7 @@
 
 #, fuzzy, php-format
 msgid "Relation %s to page %s"
-msgstr "版本 %s, 存於 %s."
+msgstr "版本 %s, 存於 %s"
 
 msgid "Found by "
 msgstr ""
@@ -120,7 +120,7 @@
 
 #, fuzzy, php-format
 msgid "Version %1$s was created because: %2$s"
-msgstr "版本 %s, 存於 %s."
+msgstr "版本 %s, 存於 %s"
 
 #, php-format
 msgid "%s: %s"
@@ -133,9 +133,9 @@
 msgid "RecentChanges"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported argument: %s=%s"
-msgstr "已支援的語言"
+msgstr ""
 
 #, php-format
 msgid "BackLinks for %s"
@@ -513,7 +513,6 @@
 msgid "Dump to directory"
 msgstr "目錄 “%s”"
 
-#, fuzzy
 msgid "Upload File"
 msgstr "載入檔案"
 
@@ -740,15 +739,14 @@
 
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
-msgstr "無法為頁面 “%s” 變更權限為 “%s”."
+msgstr "無法為頁面 “%s” 變更權限為 “%s”"
 
 #, fuzzy
 msgid "Page change"
-msgstr "沒有頁面被變更."
+msgstr "沒有頁面被變更"
 
-#, fuzzy
 msgid "Page creation"
-msgstr "頁面版本"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Created by: %s"
@@ -772,7 +770,7 @@
 
 #, fuzzy
 msgid "E-mail address confirmation"
-msgstr "Email 驗證."
+msgstr "Email 驗證"
 
 #, php-format
 msgid ""
@@ -814,9 +812,8 @@
 msgid "%s is disallowed on this wiki."
 msgstr "在此 wiki 上, %s 是被禁止的."
 
-#, fuzzy
 msgid "authenticated"
-msgstr "已認證的使用者"
+msgstr ""
 
 #, fuzzy
 msgid "not authenticated"
@@ -959,9 +956,8 @@
 msgid "XML-RPC access"
 msgstr "XML-RPC 存取"
 
-#, fuzzy
 msgid "SOAP access"
-msgstr "XML-RPC 存取"
+msgstr "SOAP 存取"
 
 msgid "Downloading zip dumps"
 msgstr "下載 zip dumps"
@@ -1252,9 +1248,8 @@
 msgid "Elapsed time: %s s"
 msgstr "經過時間: %s s"
 
-#, fuzzy
 msgid "List all once authenticated users."
-msgstr "已認證的使用者."
+msgstr ""
 
 #, php-format
 msgid "Authenticated users on this wiki (%d total):"
@@ -1623,9 +1618,9 @@
 msgid "Dynamically include the content from another wiki page."
 msgstr "從其他 wiki 頁面含括文字."
 
-#, fuzzy, php-format
+#, php-format
 msgid " %s :"
-msgstr "%s b"
+msgstr ""
 
 #, fuzzy
 msgid "Click to hide/show"
@@ -1633,7 +1628,7 @@
 
 #, php-format
 msgid "Edit metadata for %s."
-msgstr "為 %s 編輯中繼資料"
+msgstr "為 %s 編輯中繼資料."
 
 #, php-format
 msgid "No metadata for %s"
@@ -1653,9 +1648,8 @@
 msgid "Requires WikiAdmin privileges to edit."
 msgstr "需要 WikiAdmin 權限方能編輯."
 
-#, fuzzy
 msgid "Redirect to an external web site based on form input."
-msgstr "以表單輸入方式重導向到另外一個外部站台"
+msgstr "以表單輸入方式重導向到另外一個外部站台."
 
 #, fuzzy, php-format
 msgid "Invalid argument: %s=%s"
@@ -1748,7 +1742,7 @@
 
 #, php-format
 msgid "Search for page titles similar to %s."
-msgstr "搜尋與 %s 相似的頁面標題"
+msgstr "搜尋與 %s 相似的頁面標題."
 
 #, php-format
 msgid "These page titles match fuzzy with “%s”"
@@ -1814,7 +1808,7 @@
 
 #, fuzzy
 msgid "Simple Sample Plugin."
-msgstr "簡單的範例 Plugin"
+msgstr "簡單的範例 Plugin."
 
 #, php-format
 msgid "%s, %s"
@@ -1837,13 +1831,13 @@
 msgid "Include text from another wiki page."
 msgstr "從其他 wiki 頁面含括文字."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Recursive inclusion of page %s ignored"
 msgstr "忽略頁面 %s 的遞迴含括"
 
-#, fuzzy, php-format
+#, php-format
 msgid "Illegal inclusion of page %s: no read access."
-msgstr "忽略頁面 %s 的遞迴含括"
+msgstr ""
 
 msgid "Error: rev must be a positive integer."
 msgstr ""
@@ -1897,7 +1891,7 @@
 
 #, php-format
 msgid "List page names which share an initial or final title word with “%s”."
-msgstr "列出分享為 “%s” 開頭或結尾的標題字的頁面名稱"
+msgstr "列出分享為 “%s” 開頭或結尾的標題字的頁面名稱."
 
 #, php-format
 msgid "Page names with prefix “%s”"
@@ -1909,7 +1903,7 @@
 
 #, php-format
 msgid "These pages share an initial or final title word with “%s”"
-msgstr "這些頁面分享為 “%s” 開頭或結尾的標題字."
+msgstr "這些頁面分享為 “%s” 開頭或結尾的標題字"
 
 msgid ""
 "List all pages with all links in various formats for some Java Visualization "
@@ -1964,11 +1958,10 @@
 msgid "You must be logged in to view ratings."
 msgstr "你必須登入才能 %s."
 
-#, fuzzy
 msgid ""
 "Display the list of all defined relations and optionnally attributes in this "
 "entire wiki."
-msgstr "變更頁面屬性"
+msgstr ""
 
 msgid "Lists the names of all SubPages of the current page."
 msgstr "列出目前頁面的所有子頁面名稱."
@@ -1984,9 +1977,8 @@
 msgid "Layout tables using a Mediawiki-like markup style."
 msgstr "使用豐富標記風格進行佈局的表格."
 
-#, fuzzy
 msgid "Support moderated pages."
-msgstr "已支援的語言"
+msgstr ""
 
 msgid "No e-mails for the moderators defined"
 msgstr ""
@@ -2059,9 +2051,8 @@
 msgid "Visited pages on this wiki, ordered by popularity:"
 msgstr "在此 wiki 已被參訪頁面, 以受歡迎程度排序:"
 
-#, fuzzy
 msgid "List all new pages per month per user."
-msgstr "已認證的使用者"
+msgstr ""
 
 msgid "Don't cache this page."
 msgstr "不要快取此頁面."
@@ -2143,7 +2134,7 @@
 
 #, fuzzy, php-format
 msgid "PageGroup for %s."
-msgstr "頁面群組 - %s"
+msgstr "頁面群組 - %s."
 
 msgid "Contents"
 msgstr "內容"
@@ -2194,9 +2185,9 @@
 msgid "History of changes."
 msgstr "變更的歷程."
 
-#, fuzzy, php-format
+#, php-format
 msgid "List PageHistory for %s."
-msgstr "列出 PageHistory (頁面歷程) - %s"
+msgstr "列出 PageHistory (頁面歷程) - %s."
 
 #, php-format
 msgid "Show extra page Info and statistics for %s."
@@ -2228,13 +2219,12 @@
 msgid "E-mail sent to the stored e-mail address for user %s"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "Error sending e-mail with password for user %s."
-msgstr "錯誤的密碼或使用者帳號."
+msgstr ""
 
-#, fuzzy
 msgid "Reset password of user: "
-msgstr "錯誤的密碼或使用者帳號."
+msgstr ""
 
 msgid "Send e-mail"
 msgstr ""
@@ -2252,9 +2242,8 @@
 msgid "No e-mail stored for user %s."
 msgstr ""
 
-#, fuzzy
 msgid "You need to ask an Administrator to reset this password. See below: "
-msgstr "你必須是管理者才能使用此 plugin."
+msgstr ""
 
 #, php-format
 msgid "Do you really want to reset the password of user %s?"
@@ -2263,10 +2252,9 @@
 msgid "An e-mail will be sent."
 msgstr ""
 
-#, fuzzy
 msgid ""
 "Display a set of photos listed in a text file with optional descriptions."
-msgstr "顯示帶有簡單描述的文字檔內的相片集合"
+msgstr "顯示帶有簡單描述的文字檔內的相片集合."
 
 msgid "Bad url in src: remove all of <, >, \""
 msgstr "在 src 中錯誤的 url: 移除所有的 <, .>, \""
@@ -2283,7 +2271,7 @@
 msgstr "無法讀取 %s"
 
 msgid "PHP syntax highlighting."
-msgstr "PHP 語法效果"
+msgstr "PHP 語法效果."
 
 msgid "Please provide source code to PhpHighlight plugin"
 msgstr ""
@@ -2293,7 +2281,7 @@
 msgstr "錯誤的顏色值: %s"
 
 msgid "Provide weather reports from the Internet."
-msgstr "PhpWeather plugin 由網路取得資訊並提供天氣報告"
+msgstr "PhpWeather plugin 由網路取得資訊並提供天氣報告."
 
 msgid "You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"
 msgstr ""
@@ -2315,9 +2303,8 @@
 msgid "Submit location"
 msgstr "送出地區"
 
-#, fuzzy
 msgid "Ploticus image creation."
-msgstr "頁面版本"
+msgstr ""
 
 msgid "shell commands not allowed in Ploticus"
 msgstr ""
@@ -2397,9 +2384,9 @@
 msgid "Get preferences information for current user %s."
 msgstr "為目前使用者 %s 取得偏好設定資訊."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Easy navigation buttons for %s."
-msgstr "簡單的巡覽按鈕 - %s"
+msgstr "簡單的巡覽按鈕 - %s."
 
 msgid "Up"
 msgstr "上"
@@ -2423,25 +2410,21 @@
 msgid "Rating: %.1f (%d votes)"
 msgstr ""
 
-#, fuzzy
 msgid "Your current rating: "
-msgstr "你的評比是 %.1f"
+msgstr ""
 
-#, fuzzy
 msgid "Your current prediction: "
-msgstr "確認目前動作"
+msgstr ""
 
-#, fuzzy
 msgid "Change your rating from "
-msgstr "你的評比是 %.1f"
+msgstr ""
 
 #, fuzzy
 msgid " to "
 msgstr "到"
 
-#, fuzzy
 msgid "Add your rating: "
-msgstr "你的評比是 %.1f"
+msgstr ""
 
 msgid "Thanks!"
 msgstr ""
@@ -2684,9 +2667,8 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr "%s 只允許在鎖定的頁面中."
 
-#, fuzzy
 msgid "'href' or 'page' parameter missing."
-msgstr "%s 或 %s 參數遺漏"
+msgstr "'href' 或 'page' 參數遺漏."
 
 #, php-format
 msgid "Recursive redirect to self: “%s”"
@@ -2716,9 +2698,8 @@
 msgid "Layout tables using a very rich markup style."
 msgstr "使用豐富標記風格進行佈局的表格."
 
-#, fuzzy
 msgid "Simple RSS Feed aggregator."
-msgstr "簡單的 RSS Feed aggregator Plugin"
+msgstr "簡單的 RSS Feed aggregator Plugin."
 
 msgid "no RSS items"
 msgstr ""
@@ -2733,9 +2714,8 @@
 msgid "%s: Found %s through %s"
 msgstr ""
 
-#, fuzzy
 msgid "Display the list of relations and attributes on this page."
-msgstr "變更頁面屬性"
+msgstr ""
 
 msgid "SemanticSearch"
 msgstr ""
@@ -2774,9 +2754,8 @@
 msgid "Relation"
 msgstr "相關連結"
 
-#, fuzzy
 msgid "Search relations and attributes."
-msgstr "變更頁面屬性"
+msgstr ""
 
 msgid "Filter by this relation. With autocompletion."
 msgstr ""
@@ -2836,7 +2815,7 @@
 msgstr ""
 
 msgid "Recursively get BackLinks or links."
-msgstr "遞迴地取得 BackLinks 或連結"
+msgstr "遞迴地取得 BackLinks 或連結."
 
 #, php-format
 msgid "(max. recursion level: %d)"
@@ -2856,7 +2835,7 @@
 msgstr ""
 
 msgid "Display arbitrary SQL result tables."
-msgstr "顯示不受限制的 SQL 結果表格"
+msgstr "顯示不受限制的 SQL 結果表格."
 
 msgid "No DSN alias for SqlResult.ini specified"
 msgstr ""
@@ -2865,9 +2844,8 @@
 msgid "No DSN for alias %s in SqlResult.ini found"
 msgstr ""
 
-#, fuzzy
 msgid "Synchronize pages with external PhpWiki."
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 #, fuzzy
 msgid "Syncing this PhpWiki"
@@ -2893,9 +2871,8 @@
 msgid "Checking all local pages newer than %s..."
 msgstr ""
 
-#, fuzzy
 msgid "Now upload all locally newer uploads."
-msgstr "沒有要上傳的檔案?"
+msgstr ""
 
 #, php-format
 msgid "Checking all local uploads newer than %s..."
@@ -2907,7 +2884,7 @@
 
 #, fuzzy, php-format
 msgid "Postponed %s for %s."
-msgstr "遺失了 %s 的 %s"
+msgstr "遺失了 %s 的 %s."
 
 #, fuzzy
 msgid "skipped"
@@ -3009,11 +2986,11 @@
 
 #, php-format
 msgid "Total %d plugins: "
-msgstr "共有 %d 個 plugin:"
+msgstr "共有 %d 個 plugin: "
 
 #, php-format
 msgid "Total of %d languages: "
-msgstr "共有 %d 種語言:"
+msgstr "共有 %d 種語言: "
 
 msgid "Current language"
 msgstr "目前語言"
@@ -3098,7 +3075,7 @@
 msgstr "抱歉, 這個版本的 PHP 無法建立 PNG 圖片檔."
 
 msgid "Convert text into a PNG image using GD."
-msgstr "使用 GD 轉換文字為 PNG 圖片"
+msgstr "使用 GD 轉換文字為 PNG 圖片."
 
 msgid ""
 "PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png."
@@ -3193,7 +3170,7 @@
 
 #, php-format
 msgid "From english to %s: "
-msgstr "從英文到 %s:"
+msgstr "從英文到 %s: "
 
 msgid "Translate"
 msgstr "轉換"
@@ -3210,7 +3187,7 @@
 
 #, fuzzy
 msgid "You cannot upload files."
-msgstr "錯誤: 無法開啟上傳日誌檔案"
+msgstr "錯誤: 無法開啟上傳日誌檔案."
 
 msgid "Check you are logged in."
 msgstr ""
@@ -3222,28 +3199,28 @@
 msgstr ""
 
 msgid "ACCESS DENIED: You must log in to upload files."
-msgstr "拒絕存取: 請先登入才能上傳檔案"
+msgstr "拒絕存取: 請先登入才能上傳檔案."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Error uploading “%s”"
-msgstr "載入 “%s”"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Files with extension %s are not allowed."
-msgstr "副檔名 %s 不被允許"
+msgstr "副檔名 %s 不被允許."
 
 #, fuzzy, php-format
 msgid "Only files with the extension %s are allowed."
-msgstr "副檔名 %s 不被允許"
+msgstr "副檔名 %s 不被允許."
 
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "There is already a file with name “%s” uploaded."
-msgstr "已經有個名為 %s 的檔案存在"
+msgstr "已經有個名為 %s 的檔案存在."
 
 #, fuzzy
 msgid "Sorry but this file is too big."
@@ -3256,20 +3233,19 @@
 msgid "uploaded %s"
 msgstr "已上傳 %s"
 
-#, fuzzy
 msgid "Uploading failed."
-msgstr "上傳失敗:"
+msgstr "上傳失敗."
 
 msgid "No file selected. Please select one."
 msgstr ""
 
 #, fuzzy
 msgid "The upload logfile exists but is not writable."
-msgstr "錯誤: 上傳日誌無法寫入"
+msgstr "錯誤: 上傳日誌無法寫入."
 
 #, fuzzy
 msgid "Can't open the upload logfile."
-msgstr "錯誤: 無法開啟上傳日誌檔案"
+msgstr "錯誤: 無法開啟上傳日誌檔案."
 
 msgid "Converts an URI-escaped identifier back to an unique XML-ID."
 msgstr ""
@@ -3346,9 +3322,8 @@
 msgid "Display video in Flash or HTML5."
 msgstr ""
 
-#, fuzzy
 msgid "Both 'url' or 'file' parameters missing."
-msgstr "%s 或 %s 參數遺漏"
+msgstr ""
 
 msgid "Choose only one of 'url' or 'file' parameters."
 msgstr ""
@@ -3485,11 +3460,11 @@
 
 #, fuzzy
 msgid "One page has been changed:"
-msgstr "%s pages 已經永久更名了."
+msgstr "%s pages 已經永久更名了:"
 
 #, fuzzy, php-format
 msgid "%d pages have been changed:"
-msgstr "%s 頁面已經變更."
+msgstr "%s 頁面已經變更:"
 
 msgid "No pages changed."
 msgstr "沒有頁面被變更."
@@ -3501,17 +3476,14 @@
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#, fuzzy
 msgid "Select the pages to change the owner"
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
-#, fuzzy
 msgid "Change owner to: "
-msgstr "變更國家"
+msgstr ""
 
-#, fuzzy
 msgid "Delete page permissions."
-msgstr "預設頁面權限"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "ACL deleted for page “%s”"
@@ -3525,9 +3497,8 @@
 msgid "Delete ACL"
 msgstr "已刪除."
 
-#, fuzzy
 msgid "Select the pages where to delete access rights"
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 #, fuzzy
 msgid "Selected Pages: "
@@ -3548,9 +3519,9 @@
 msgid "One page has been permanently purged:"
 msgstr ""
 
-#, fuzzy, php-format
+#, php-format
 msgid "%d pages have been permanently purged:"
-msgstr "%d pages 已經永久更名了:"
+msgstr ""
 
 #, fuzzy
 msgid "No pages purged."
@@ -3567,9 +3538,8 @@
 msgid "Permanently purge selected pages"
 msgstr "永久移除選定的頁面."
 
-#, fuzzy
 msgid "Select the files to purge"
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 msgid "Permanently remove all selected pages."
 msgstr "永久移除選定的頁面."
@@ -3582,17 +3552,15 @@
 msgid "Didn't remove page “%s”. Access denied."
 msgstr "成功地移除頁面 “%s”."
 
-#, fuzzy
 msgid "One page has been removed:"
-msgstr "%s pages 已經永久更名了."
+msgstr ""
 
 #, fuzzy, php-format
 msgid "%d pages have been removed:"
-msgstr "%s 頁面已經變更."
+msgstr "%s 頁面已經變更:"
 
-#, fuzzy
 msgid "No pages removed."
-msgstr "沒有頁面被更名"
+msgstr ""
 
 msgid "Remove"
 msgstr "移除"
@@ -3607,9 +3575,8 @@
 msgid "Remove selected pages"
 msgstr "移除選定頁面"
 
-#, fuzzy
 msgid "Select the files to remove"
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
@@ -3617,11 +3584,10 @@
 
 #, fuzzy, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
-msgstr "(列出過去 %s 天內已被刪除且檢查過的頁面.)"
+msgstr "列出過去 %s 天內已被刪除且檢查過的頁面."
 
-#, fuzzy
 msgid "Rename selected pages."
-msgstr "更名已選定的頁面"
+msgstr "更名已選定的頁面."
 
 msgid "Rename to"
 msgstr "更名為"
@@ -3665,15 +3631,14 @@
 
 #, fuzzy
 msgid "One page has been renamed:"
-msgstr "%s pages 已經永久更名了."
+msgstr "%s pages 已經永久更名了:"
 
 #, fuzzy, php-format
 msgid "%d pages have been renamed:"
-msgstr "%s 頁面已經變更."
+msgstr "%s 頁面已經變更:"
 
-#, fuzzy
 msgid "No pages renamed."
-msgstr "沒有頁面被更名"
+msgstr "沒有頁面被更名."
 
 msgid "from"
 msgstr "從"
@@ -3738,7 +3703,7 @@
 msgstr "允許選擇多個已傳遞的頁面到其他 WikiAdmin plugin."
 
 msgid "Select: "
-msgstr "選擇"
+msgstr "選擇: "
 
 msgid "Select pages"
 msgstr "選擇頁面"
@@ -3758,15 +3723,14 @@
 msgid "ACL changed for page “%s”"
 msgstr "為 page “%s” 設定 acl."
 
-#, fuzzy, php-format
+#, php-format
 msgid "to “%s”."
-msgstr "載入 “%s”"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "ACL changed for page “%s” from “%s” to “%s”."
 msgstr "為 page “%s” 設定 acl."
 
-#, fuzzy
 msgid "Invalid ACL"
 msgstr "錯誤的 acl"
 
@@ -3779,9 +3743,8 @@
 msgid "Change Access Rights"
 msgstr ""
 
-#, fuzzy
 msgid "Select the pages where to change access rights"
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 #, fuzzy
 msgid "Type"
@@ -3807,17 +3770,15 @@
 msgid "(Currently not working)"
 msgstr "現在不建議使用!"
 
-#, fuzzy
 msgid "Mark selected pages as external."
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "change page “%s” to external."
 msgstr "改變頁面 “%s” 權限為 “%s”."
 
-#, fuzzy
 msgid "Set pages to external"
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 #, fuzzy
 msgid "Select the pages to set as external"
@@ -3910,14 +3871,14 @@
 
 #, fuzzy, php-format
 msgid "Show and add blogs for %s."
-msgstr "顯示並增加 blogs - %s"
+msgstr "顯示並增加 blogs - %s."
 
 msgid "New comment."
 msgstr "新意見."
 
-#, fuzzy, php-format
+#, php-format
 msgid "%s on %s:"
-msgstr "%s 在 %s"
+msgstr "%s 在 %s:"
 
 #, fuzzy
 msgid "Layout tables using the Wikicreole syntax."
@@ -3936,13 +3897,12 @@
 msgid "Handles threaded topics with comments/news and provide a input form."
 msgstr ""
 
-#, fuzzy
 msgid "Enable configurable polls."
-msgstr "啟動設定好的投票"
+msgstr "啟動設定好的投票."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Argument “%s” not declared by plugin."
-msgstr "引數 “%s” 沒有被 plugin 宣告"
+msgstr "引數 “%s” 沒有被 plugin 宣告."
 
 msgid "Sorry! You must wait at least 20 minutes until you can vote again!"
 msgstr "抱歉! 你必須等至少 20 分鐘才能在投票!"
@@ -4242,16 +4202,14 @@
 msgid "OrphanedPages"
 msgstr ""
 
-#, fuzzy
 msgid "PageGroup"
-msgstr "頁面群組 - %s"
+msgstr "頁面群組"
 
 msgid "PageInfo"
 msgstr ""
 
-#, fuzzy
 msgid "PageTrail"
-msgstr "頁面版本"
+msgstr ""
 
 #, fuzzy
 msgid "PasswordReset"
@@ -4517,9 +4475,8 @@
 msgid "YouTube"
 msgstr ""
 
-#, fuzzy
 msgid "Show translations of various words or pages."
-msgstr "顯示多個字或頁面的轉換"
+msgstr "顯示多個字或頁面的轉換."
 
 #, php-format
 msgid ""
@@ -4738,9 +4695,8 @@
 msgid "Check for necessary theme %s updates"
 msgstr "為 page “%s” 設定 acl."
 
-#, fuzzy
 msgid "rename to Help: pages"
-msgstr "更名已選定的頁面"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "rename %s to %s"
@@ -4756,9 +4712,8 @@
 msgid "database"
 msgstr "資料庫"
 
-#, fuzzy
 msgid "Backend type: "
-msgstr "錯誤的檔案型態: "
+msgstr ""
 
 #, fuzzy, php-format
 msgid "Check for table %s"
@@ -4842,9 +4797,8 @@
 msgid "Rebuild entire database to upgrade relation links"
 msgstr ""
 
-#, fuzzy
 msgid "plugin argument"
-msgstr "錯誤的顏色值: %s"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "%s not found in %s"
@@ -5110,9 +5064,8 @@
 msgid "External Links"
 msgstr "外部連結"
 
-#, fuzzy
 msgid "Invalid username."
-msgstr "錯誤的 acl"
+msgstr ""
 
 #, fuzzy, php-format
 msgid "%s is missing"
@@ -5162,9 +5115,9 @@
 msgid "Could not connect to LDAP host %s"
 msgstr "無法為頁面 “%s” 變更權限為 “%s”"
 
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid username “%s” for LDAP Auth"
-msgstr "錯誤的 acl"
+msgstr ""
 
 msgid ""
 "Automatically created user homepage to be able to store UserPreferences."
@@ -5246,9 +5199,9 @@
 msgid "Please set a password in UserPreferences."
 msgstr "請在 UserPreferences 中設定你的密碼."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Given password ignored."
-msgstr "錯誤的密碼或使用者帳號."
+msgstr ""
 
 #, fuzzy
 msgid ""
@@ -5574,7 +5527,6 @@
 msgid "Supplanted on"
 msgstr "代替為"
 
-#, fuzzy
 msgid "Page Version"
 msgstr "頁面版本"
 
@@ -5928,9 +5880,8 @@
 msgid "Back Links"
 msgstr ""
 
-#, fuzzy
 msgid "Change Owner"
-msgstr "變更國家"
+msgstr ""
 
 msgid "Access Rights"
 msgstr ""
@@ -5963,9 +5914,8 @@
 msgid "Make the page public?"
 msgstr ""
 
-#, fuzzy
 msgid "Make the page external?"
-msgstr "選擇頁面以進行更名:"
+msgstr ""
 
 msgid "Recent Changes"
 msgstr ""
@@ -6207,9 +6157,6 @@
 #~ msgid "Are you sure you want to permanently change the selected files?"
 #~ msgstr "你確定你想要永久變更選定的檔案?"
 
-#~ msgid "Select the pages to change:"
-#~ msgstr "選擇頁面以進行更名:"
-
 #~ msgid "This plugin is currently under development and does not work!"
 #~ msgstr "此 plugin 正在開發還不能運作!"
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9056] trunk/locale/po

[<var...@us...>]

Revision: 9056
          http://sourceforge.net/p/phpwiki/code/9056
Author:   vargenau
Date:     2014-08-27 12:23:38 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
Remove fuzzy translations

Modified Paths:
--------------
    trunk/locale/po/fr.po
    trunk/locale/po/ja.po
    trunk/locale/po/sv.po

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-08-27 10:04:39 UTC (rev 9055)
+++ trunk/locale/po/fr.po	2014-08-27 12:23:38 UTC (rev 9056)
@@ -5993,6 +5993,15 @@
 #~ msgid "Views"
 #~ msgstr "Vues"
 
+#~ msgid "Prediction: %s"
+#~ msgstr "Prédiction : %s"
+
+#~ msgid "Prediction: %.1f"
+#~ msgstr "Prédiction : %.1f"
+
+#~ msgid "invalid %s ignored"
+#~ msgstr "%s non valable ignoré"
+
 #~ msgid "Version %s"
 #~ msgstr "Version %s"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-08-27 10:04:39 UTC (rev 9055)
+++ trunk/locale/po/ja.po	2014-08-27 12:23:38 UTC (rev 9056)
@@ -2386,14 +2386,6 @@
 msgid "Your rating was %.1f"
 msgstr ""
 
-#, fuzzy, php-format
-msgid "Prediction: %s"
-msgstr "編集: %s"
-
-#, fuzzy, php-format
-msgid "Prediction: %.1f"
-msgstr "編集: %s"
-
 msgid "RateIt"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-08-27 10:04:39 UTC (rev 9055)
+++ trunk/locale/po/sv.po	2014-08-27 12:23:38 UTC (rev 9056)
@@ -5812,7 +5812,3 @@
 
 msgid "Edit this page"
 msgstr ""
-
-#, fuzzy
-#~ msgid "%s not found"
-#~ msgstr "%s: fila ingen funna"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9055] trunk/lib/plugin/RateIt.php

[<var...@us...>]

Revision: 9055
          http://sourceforge.net/p/phpwiki/code/9055
Author:   vargenau
Date:     2014-08-27 10:04:39 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
elseif

Modified Paths:
--------------
    trunk/lib/plugin/RateIt.php

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2014-08-27 09:41:07 UTC (rev 9054)
+++ trunk/lib/plugin/RateIt.php	2014-08-27 10:04:39 UTC (rev 9055)
@@ -373,7 +373,7 @@
                 $img_attr['src'] = $ok[$i % 2];
                 $img_attr['onmouseover'] = "displayRating('$reImgId','$reImgPrefix',$j,0,1)";
                 $img_attr['onmouseout'] = "displayRating('$reImgId','$reImgPrefix',$this->rating,0,1)";
-            } else if (!$this->rating and $this->pred) {
+            } elseif (!$this->rating and $this->pred) {
                 $img_attr['src'] = $rk[$i % 2];
                 $img_attr['onmouseover'] = "displayRating('$reImgId','$reImgPrefix',$j,1,1)";
                 $img_attr['onmouseout'] = "displayRating('$reImgId','$reImgPrefix',$this->pred,1,1)";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9054] trunk/locale

[<var...@us...>]

Revision: 9054
          http://sourceforge.net/p/phpwiki/code/9054
Author:   vargenau
Date:     2014-08-27 09:41:07 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/Makefile
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/Makefile	2014-08-27 09:41:07 UTC (rev 9054)
@@ -413,7 +413,6 @@
 ${POT_FILE}: ../themes/default/templates/info.tmpl
 ${POT_FILE}: ../themes/default/templates/login.tmpl
 ${POT_FILE}: ../themes/default/templates/navbar.tmpl
-${POT_FILE}: ../themes/default/templates/nochanges.tmpl
 ${POT_FILE}: ../themes/default/templates/online.tmpl
 ${POT_FILE}: ../themes/default/templates/pagelink.tmpl
 ${POT_FILE}: ../themes/default/templates/redirect.tmpl

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/de.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5366,6 +5366,9 @@
 "Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version "
 "überschrieben."
 
+msgid ":"
+msgstr ":"
+
 msgid "H"
 msgstr "H."
 
@@ -5461,9 +5464,6 @@
 msgid "%s words"
 msgstr "%s Wörter"
 
-msgid ":"
-msgstr ":"
-
 msgid "Saved on"
 msgstr "Gespeichert am"
 
@@ -5540,14 +5540,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr "Bearbeiten abgebrochen."
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-"Sie haben keine Änderungen vorgenommen, deshalb konnte keine neue Version "
-"gespeichert werden."
-
 msgid "Switch to detailed list"
 msgstr "Wechsle zu detallierter Liste"
 
@@ -6091,6 +6083,14 @@
 msgid "Edit this page"
 msgstr "Diese Seite bearbeiten"
 
+#~ msgid "Edit aborted."
+#~ msgstr "Bearbeiten abgebrochen."
+
+#~ msgid "You have not made any changes so no new version has been saved."
+#~ msgstr ""
+#~ "Sie haben keine Änderungen vorgenommen, deshalb konnte keine neue Version "
+#~ "gespeichert werden."
+
 #~ msgid "PageChange Notification of %s sent to %s"
 #~ msgstr "SeitenÄnderung Benachrichtigung von %s an %s gesendet"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/es.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5225,6 +5225,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr "Ahorrando esta página sobreescribirá la versión actual."
 
+msgid ":"
+msgstr ":"
+
 msgid "H"
 msgstr "Al"
 
@@ -5319,9 +5322,6 @@
 msgid "%s words"
 msgstr ""
 
-msgid ":"
-msgstr ":"
-
 msgid "Saved on"
 msgstr ""
 
@@ -5391,12 +5391,6 @@
 msgid "Article"
 msgstr "Artículo"
 
-msgid "Edit aborted."
-msgstr ""
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-
 msgid "Switch to detailed list"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/fr.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5279,6 +5279,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr "Enregistrer cette page écrasera la version actuelle."
 
+msgid ":"
+msgstr " :"
+
 msgid "H"
 msgstr "H"
 
@@ -5373,9 +5376,6 @@
 msgid "%s words"
 msgstr "%s mots"
 
-msgid ":"
-msgstr " :"
-
 msgid "Saved on"
 msgstr "Enregistrée le"
 
@@ -5450,14 +5450,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr "Modification annulée."
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-"Vous n'avez effectué aucun changement, aucune nouvelle version n'a donc été "
-"enregistrée."
-
 msgid "Switch to detailed list"
 msgstr "Aller à la liste détaillée"
 
@@ -5984,6 +5976,14 @@
 msgid "Edit this page"
 msgstr "Modifier cette page"
 
+#~ msgid "Edit aborted."
+#~ msgstr "Modification annulée."
+
+#~ msgid "You have not made any changes so no new version has been saved."
+#~ msgstr ""
+#~ "Vous n'avez effectué aucun changement, aucune nouvelle version n'a donc "
+#~ "été enregistrée."
+
 #~ msgid "PageChange Notification of %s sent to %s"
 #~ msgstr "La notification de changement de la page %s a été envoyée à %s"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/it.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5161,6 +5161,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
+msgid ":"
+msgstr ""
+
 msgid "H"
 msgstr "A"
 
@@ -5255,9 +5258,6 @@
 msgid "%s words"
 msgstr ""
 
-msgid ":"
-msgstr ""
-
 msgid "Saved on"
 msgstr "Salvata"
 
@@ -5327,12 +5327,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr ""
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-
 msgid "Switch to detailed list"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/ja.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5358,6 +5358,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
+msgid ":"
+msgstr ""
+
 msgid "H"
 msgstr "高さ"
 
@@ -5455,9 +5458,6 @@
 msgid "%s words"
 msgstr ""
 
-msgid ":"
-msgstr ""
-
 msgid "Saved on"
 msgstr ""
 
@@ -5532,12 +5532,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr "編集を中断しました。"
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-
 msgid "Switch to detailed list"
 msgstr ""
 
@@ -6078,6 +6072,9 @@
 msgid "Edit this page"
 msgstr "ページを編集しています。"
 
+#~ msgid "Edit aborted."
+#~ msgstr "編集を中断しました。"
+
 #~ msgid "Version %s"
 #~ msgstr "バージョン %s"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/nl.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5152,6 +5152,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
+msgid ":"
+msgstr ""
+
 msgid "H"
 msgstr "H"
 
@@ -5246,9 +5249,6 @@
 msgid "%s words"
 msgstr ""
 
-msgid ":"
-msgstr ""
-
 msgid "Saved on"
 msgstr ""
 
@@ -5318,12 +5318,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr ""
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-
 msgid "Switch to detailed list"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/phpwiki.pot	2014-08-27 09:41:07 UTC (rev 9054)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5144,6 +5144,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
+msgid ":"
+msgstr ""
+
 msgid "H"
 msgstr ""
 
@@ -5238,9 +5241,6 @@
 msgid "%s words"
 msgstr ""
 
-msgid ":"
-msgstr ""
-
 msgid "Saved on"
 msgstr ""
 
@@ -5310,12 +5310,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr ""
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-
 msgid "Switch to detailed list"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/sv.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5145,6 +5145,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
+msgid ":"
+msgstr ""
+
 msgid "H"
 msgstr "H"
 
@@ -5239,9 +5242,6 @@
 msgid "%s words"
 msgstr ""
 
-msgid ":"
-msgstr ""
-
 msgid "Saved on"
 msgstr "Sparade"
 
@@ -5311,12 +5311,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr ""
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr ""
-
 msgid "Switch to detailed list"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2014-08-27 08:28:20 UTC (rev 9053)
+++ trunk/locale/po/zh.po	2014-08-27 09:41:07 UTC (rev 9054)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 10:39+0200\n"
+"POT-Creation-Date: 2014-08-27 11:40+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5465,6 +5465,9 @@
 msgid "Saving this page will overwrite the current version."
 msgstr "儲存此頁面將會覆寫掉目前版本."
 
+msgid ":"
+msgstr ":"
+
 msgid "H"
 msgstr "高"
 
@@ -5563,9 +5566,6 @@
 msgid "%s words"
 msgstr "共 %s 字"
 
-msgid ":"
-msgstr ":"
-
 #, fuzzy
 msgid "Saved on"
 msgstr "已存放在:"
@@ -5646,12 +5646,6 @@
 msgid "Article"
 msgstr ""
 
-msgid "Edit aborted."
-msgstr "編輯中止."
-
-msgid "You have not made any changes so no new version has been saved."
-msgstr "你沒有做任何更動,所以沒有存入任何新版本."
-
 msgid "Switch to detailed list"
 msgstr "切換到明細列表"
 
@@ -6191,6 +6185,12 @@
 msgid "Edit this page"
 msgstr "編輯此頁面"
 
+#~ msgid "Edit aborted."
+#~ msgstr "編輯中止."
+
+#~ msgid "You have not made any changes so no new version has been saved."
+#~ msgstr "你沒有做任何更動,所以沒有存入任何新版本."
+
 #~ msgid "PageChange Notification of %s sent to %s"
 #~ msgstr "%s 的 PageChange 通知已送給 %s"
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9053] trunk/lib

[<var...@us...>]

Revision: 9053
          http://sourceforge.net/p/phpwiki/code/9053
Author:   vargenau
Date:     2014-08-27 08:28:20 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
protected function embedMap

Modified Paths:
--------------
    trunk/lib/PageType.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/editpage.php
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/DynamicIncludePage.php
    trunk/lib/plugin/GoTo.php
    trunk/lib/plugin/PageHistory.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/RandomPage.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/TitleSearch.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/WikiTranslation.php

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/PageType.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -561,7 +561,7 @@
         $pdf = new PDF();
         $pdf->SetTitle($pagename);
         $pdf->SetAuthor($this->_page->get('author'));
-        $pdf->SetCreator(WikiURL($pagename, false, 1));
+        $pdf->SetCreator(WikiURL($pagename, array(), 1));
         $pdf->AliasNbPages();
         $pdf->AddPage();
         //TODO: define fonts

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/WikiPluginCached.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -411,7 +411,7 @@
      * @param  $request  Request
      * @return string html output
      */
-    private function embedMap($id, $url, $map, &$dbi, $argarray, &$request)
+    protected function embedMap($id, $url, $map, &$dbi, $argarray, &$request)
     {
         // id is not unique if the same map is produced twice
         $key = substr($id, 0, 8) . substr(microtime(), 0, 6);

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/editpage.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -718,7 +718,7 @@
 
     private function _redirectToBrowsePage()
     {
-        $this->request->redirect(WikiURL($this->page, false, 'absolute_url'));
+        $this->request->redirect(WikiURL($this->page, array(), 'absolute_url'));
     }
 
     function _restoreState()

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/AppendText.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -78,7 +78,7 @@
         if (empty($args['s'])) {
             if ($request->isPost()) {
                 if ($pagename != _("AppendText"))
-                    return HTML($request->redirect(WikiURL($pagename, false, 'absurl'), false));
+                    return HTML($request->redirect(WikiURL($pagename, array(), 'absurl'), false));
             }
             return HTML();
         }
@@ -133,11 +133,11 @@
             // TODO: Just invalidate the cache, if AppendText didn't
             // change anything before.
             //
-            return $request->redirect(WikiURL($pagename, false, 'absurl'), false);
+            return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
 
             // The user asked to be redirected to the modified page
         } elseif ($args['redirect']) {
-            return $request->redirect(WikiURL($pagename, false, 'absurl'), false);
+            return $request->redirect(WikiURL($pagename, array(), 'absurl'), false);
 
         } else {
             $link = HTML::em(WikiLink($pagename));

Modified: trunk/lib/plugin/DynamicIncludePage.php
===================================================================
--- trunk/lib/plugin/DynamicIncludePage.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/DynamicIncludePage.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -48,7 +48,7 @@
     function run($dbi, $argstr, &$request, $basepage)
     {
         global $WikiTheme;
-        $args = $this->getArgs($argstr, $request, false);
+        $args = $this->getArgs($argstr, $request, array());
         $page =& $args['page'];
         if (ENABLE_AJAX) {
             if ($args['state'])

Modified: trunk/lib/plugin/GoTo.php
===================================================================
--- trunk/lib/plugin/GoTo.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/GoTo.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -54,7 +54,7 @@
             $request->setArg('goto', false);
             $target = $goto['target'];
             if ($dbi->isWikiPage($target))
-                $url = WikiURL($target, 0, 1);
+                $url = WikiURL($target, array(), 1);
             else
                 $url = WikiURL($target, array('action' => 'edit'), 1);
 

Modified: trunk/lib/plugin/PageHistory.php
===================================================================
--- trunk/lib/plugin/PageHistory.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/PageHistory.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -241,7 +241,7 @@
     {
         global $request;
 
-        $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
+        $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
 
         $title = sprintf(_("%s: %s"),
             WIKI_NAME,

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/PhotoAlbum.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -181,7 +181,7 @@
             $align = 'center';
         }
         if (count($photos) == 0) {
-            return HTML::raw();
+            return HTML::raw('');
         }
 
         if (in_array("sort", $attributes))

Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/RandomPage.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -76,7 +76,7 @@
             $page = $pagearray[array_rand($pagearray)];
             $pagename = $page->getName();
             if ($redirect)
-                $request->redirect(WikiURL($pagename, false, 'absurl')); // noreturn
+                $request->redirect(WikiURL($pagename, array(), 'absurl')); // noreturn
             if ($hidename)
                 return WikiLink($pagename, false, _("RandomPage"));
             else

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/RateIt.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -283,7 +283,7 @@
             }
             return $html;
         }
-        return HTML::raw();
+        return HTML::raw('');
     }
 
     // box is used to display a fixed-width, narrow version with common header
@@ -291,7 +291,7 @@
     {
         if (!$request) $request =& $GLOBALS['request'];
         if (!$request->_user->isSignedIn()) {
-            return HTML::raw();
+            return HTML::raw('');
         }
         if (!isset($args)) $args = array();
         $args['small'] = 1;

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/RecentChanges.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -829,7 +829,7 @@
 
     function pageURI($rev)
     {
-        return WikiURL($rev, '', 'absurl');
+        return WikiURL($rev, array(), 'absurl');
     }
 
     function format($changes)
@@ -878,7 +878,7 @@
             return false;
 
         return array('title' => WIKI_NAME,
-            'link' => WikiURL(HOME_PAGE, false, 'absurl'),
+            'link' => WikiURL(HOME_PAGE, array(), 'absurl'),
             'url' => $img_url);
     }
 
@@ -887,14 +887,14 @@
         return array('title' => _("Search"),
             'description' => _("Title Search"),
             'name' => 's',
-            'link' => WikiURL(_("TitleSearch"), false, 'absurl'));
+            'link' => WikiURL(_("TitleSearch"), array(), 'absurl'));
     }
 
     function channel_properties()
     {
         global $request;
 
-        $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
+        $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
         extract($this->_args);
         $title = WIKI_NAME;
         $description = $this->title();
@@ -1029,7 +1029,7 @@
         $rss = new AtomFeed;
 
         // "channel" is called "feed" in atom
-        $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
+        $rc_url = WikiURL($request->getArg('pagename'), array(), 'absurl');
         extract($this->_args);
         $description = $this->title();
         $feed_props = array('title' => $description,
@@ -1089,9 +1089,8 @@
 class NonDeletedRevisionIterator extends WikiDB_PageRevisionIterator
 {
     /**
-     * @param $revisions object a WikiDB_PageRevisionIterator.
+     * @param WikiDB_PageRevisionIterator $revisions
      * @param bool $check_current_revision
-     * @return void
      */
     function __construct($revisions, $check_current_revision = true)
     {
@@ -1301,7 +1300,7 @@
         );
     }
 
-    function getArgs($argstr, $request, $defaults = false)
+    function getArgs($argstr, $request = false, $defaults = array())
     {
         if (!$defaults) $defaults = $this->getDefaultArguments();
         $args = WikiPlugin::getArgs($argstr, $request, $defaults);

Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/TitleSearch.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -103,7 +103,7 @@
 
         if ($args['auto_redirect'] && ($pagelist->getTotal() == 1)) {
             $page = $pagelist->first();
-            $request->redirect(WikiURL($page->getName(), false, 'absurl'), false);
+            $request->redirect(WikiURL($page->getName(), array(), 'absurl'), false);
         }
 
         return $pagelist;

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WatchPage.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -143,8 +143,7 @@
                     return '';
                 }
                 if ($request->getArg('edit')) {
-                    $request->redirect(WikiURL(_("UserPreferences"),
-                        false, 'absolute_url')); // noreturn
+                    $request->redirect(WikiURL(_("UserPreferences"), array(), 'absolute_url')); // noreturn
                     return '';
                 }
                 $add = $request->getArg('add');

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WikiAdminUtils.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -295,7 +295,7 @@
                     Button('cancel', _("Cancel")))
             );
         }
-    return HTML::raw();
+    return HTML::raw('');
     }
 }
 

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WikiPoll.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -70,7 +70,7 @@
         );
     }
 
-    function getArgs($argstr, $request = false, $defaults = false)
+    function getArgs($argstr, $request = false, $defaults = array())
     {
         if ($defaults === false)
             $defaults = $this->getDefaultArguments();

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2014-08-26 13:17:13 UTC (rev 9052)
+++ trunk/lib/plugin/WikiTranslation.php	2014-08-27 08:28:20 UTC (rev 9053)
@@ -393,14 +393,14 @@
                 if (in_array($from_lang, array('en', 'fr'))) {
                     $url = "http://translate.google.com/translate";
                     $url .= "?langpair=" . urlencode($from_lang . "|" . $to_lang);
-                    $url .= "&u=" . urlencode(WikiURL($pagename, false, true));
+                    $url .= "&u=" . urlencode(WikiURL($pagename, array(), true));
                 }
                 // redirect or transclude?
                 if ($url) {
                     return $request->redirect($url);
                 }
                 return HTML(fmt("TODO: Google can only translate from english and french. Find a translation service for %s to language %s",
-                    WikiURL($pagename, false, true),
+                    WikiURL($pagename, array(), true),
                     $to_lang));
             } else {
                 return $this->error(fmt("%s is empty.", $pagename));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9052] trunk/pgsrc

[<var...@us...>]

Revision: 9052
          http://sourceforge.net/p/phpwiki/code/9052
Author:   vargenau
Date:     2014-08-26 13:17:13 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Remove obsolete links

Modified Paths:
--------------
    trunk/pgsrc/Help%2FCreateTocPlugin
    trunk/pgsrc/Help%2FRssFeedPlugin

Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2014-08-26 13:05:08 UTC (rev 9051)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2014-08-26 13:17:13 UTC (rev 9052)
@@ -1,4 +1,4 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
+Date: Tue, 26 Aug 2014 15:16:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCreateTocPlugin;
@@ -132,7 +132,7 @@
 }}}
 
 == See Also ==
-* [[PhpWikiDemo:en/TextFormattingRules]]
+* [[Help:TextFormattingRules]]
 
 == Known Problems ==
 

Modified: trunk/pgsrc/Help%2FRssFeedPlugin
===================================================================
--- trunk/pgsrc/Help%2FRssFeedPlugin	2014-08-26 13:05:08 UTC (rev 9051)
+++ trunk/pgsrc/Help%2FRssFeedPlugin	2014-08-26 13:17:13 UTC (rev 9052)
@@ -1,4 +1,4 @@
-Date: Tue, 29 Jul 2014 10:42:12 +0000
+Date: Tue, 26 Aug 2014 15:16:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRssFeedPlugin;
@@ -52,10 +52,6 @@
                  url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>>
 }}}
 
-=== Example as sidebar box ===
-
-[[PhpWikiDemo:sidebar/]]
-
 <noinclude>
 ----
 [[PhpWikiDocumentation]] [[CategoryWikiPlugin]]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9051] trunk/lib/plugin/CreateToc.php

[<var...@us...>]

Revision: 9051
          http://sourceforge.net/p/phpwiki/code/9051
Author:   vargenau
Date:     2014-08-26 13:05:08 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Fix warnings

Modified Paths:
--------------
    trunk/lib/plugin/CreateToc.php

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2014-08-26 12:10:14 UTC (rev 9050)
+++ trunk/lib/plugin/CreateToc.php	2014-08-26 13:05:08 UTC (rev 9051)
@@ -160,9 +160,9 @@
             if ($theading)
                 return preg_quote($theading->asXML(), "/");
             else
-                return XmlContent::_quote(preg_quote($heading, "/"));
+                return htmlspecialchars(preg_quote($heading, "/"), ENT_COMPAT, 'UTF-8');
         } else {
-            return XmlContent::_quote(preg_quote($heading, "/"));
+            return htmlspecialchars(preg_quote($heading, "/"), ENT_COMPAT, 'UTF-8');
         }
     }
 
@@ -245,8 +245,8 @@
     // We must omit lines starting with "!" if inside a Mediawiki table
     // (they represent a table header)
     // Feature request: proper nesting; multiple levels (e.g. 1,3)
-    private function extractHeaders(&$content, &$markup, $backlink = 0,
-                            $counter = 0, $levels = false, $firstlevelstyle = 'number', $basepage = '')
+    private function extractHeaders(&$content, &$markup, $backlink,
+                            $counter, $levels, $firstlevelstyle, $basepage)
     {
         if (!$levels) $levels = array(1, 2);
         $tocCounter = $this->initTocCounter();
@@ -425,7 +425,6 @@
             $r = $page->getCurrentRevision();
         }
 
-        $current = $page->getCurrentRevision();
         $content = $r->getContent();
 
         $html = HTML::div(array('class' => 'toc', 'id' => GenerateId("toc")));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9050] trunk/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php

[<var...@us...>]

Revision: 9050
          http://sourceforge.net/p/phpwiki/code/9050
Author:   vargenau
Date:     2014-08-26 12:10:14 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Update adodb

Removed Paths:
-------------
    trunk/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php

Deleted: trunk/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
+++ trunk/lib/WikiDB/adodb/lang/adodb-bgutf8.inc.php	2014-08-26 12:10:14 UTC (rev 9050)
@@ -1,36 +0,0 @@
-<?php
-/*
-	Bulgarian language, v1.0, 25.03.2004, encoding by UTF-8 charset
-	contributed by Valentin Sheiretsky <valio#valio.eu.org>
-*/
-
-$ADODB_LANG_ARRAY = array (
-            'LANG'                      => 'bgutf8',
-            DB_ERROR                    => 'неизвестна грешка',
-            DB_ERROR_ALREADY_EXISTS     => 'вече съществува',
-            DB_ERROR_CANNOT_CREATE      => 'не може да бъде създадена',
-            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
-            DB_ERROR_CANNOT_DROP        => 'не може да бъде унищожена',
-            DB_ERROR_CONSTRAINT         => 'нарушено условие',
-            DB_ERROR_DIVZERO            => 'деление на нула',
-            DB_ERROR_INVALID            => 'неправилно',
-            DB_ERROR_INVALID_DATE       => 'некоректна дата или час',
-            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
-            DB_ERROR_MISMATCH           => 'погрешна употреба',
-            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
-            DB_ERROR_NOSUCHFIELD        => 'несъществуващо поле',
-            DB_ERROR_NOSUCHTABLE        => 'несъществуваща таблица',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'не е намерена',
-            DB_ERROR_NOT_LOCKED         => 'не е заключена',
-            DB_ERROR_SYNTAX             => 'грешен синтаксис',
-            DB_ERROR_UNSUPPORTED        => 'не се поддържа',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
-            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
-            DB_ERROR_CONNECT_FAILED     => 'връзката не може да бъде осъществена',
-            0	                        => 'няма грешки', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'предоставените данни са недостатъчни',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'разширението не е намерено',
-            DB_ERROR_NOSUCHDB           => 'несъществуваща база данни',
-            DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
-);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9049] trunk/lib/WikiDB/adodb/lang

[<var...@us...>]

Revision: 9049
          http://sourceforge.net/p/phpwiki/code/9049
Author:   vargenau
Date:     2014-08-26 12:09:05 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
Update adodb

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/lang/adodb-ar.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-bg.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-cn.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-cz.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-da.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-de.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-fr.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-hu.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-it.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-pl.inc.php

Added Paths:
-----------
    trunk/lib/WikiDB/adodb/lang/adodb-eo.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-ru.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-th.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-uk.inc.php

Removed Paths:
-------------
    trunk/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb_th.inc.php

Modified: trunk/lib/WikiDB/adodb/lang/adodb-ar.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-ar.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-ar.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -2,31 +2,31 @@
 // by "El-Shamaa, Khaled" <k.el-shamaa#cgiar.org>
 $ADODB_LANG_ARRAY = array (
 			'LANG'			    => 'ar',
-	    DB_ERROR			=> '\xCE\xD8\xC3 \xDB\xED\xD1 \xE3\xCD\xCF\xCF',
-	    DB_ERROR_ALREADY_EXISTS	=> '\xE3\xE6\xCC\xE6\xCF \xE3\xD3\xC8\xDE\xC7',
-	    DB_ERROR_CANNOT_CREATE	=> '\xE1\xC7 \xED\xE3\xDF\xE4 \xC5\xE4\xD4\xC7\xC1',
-	    DB_ERROR_CANNOT_DELETE	=> '\xE1\xC7 \xED\xE3\xDF\xE4 \xCD\xD0\xDD',
-	    DB_ERROR_CANNOT_DROP	=> '\xE1\xC7 \xED\xE3\xDF\xE4 \xCD\xD0\xDD',
-	    DB_ERROR_CONSTRAINT 	=> '\xDA\xE3\xE1\xED\xC9 \xC5\xCF\xCE\xC7\xE1 \xE3\xE3\xE4\xE6\xDA\xC9',
-	    DB_ERROR_DIVZERO		=> '\xDA\xE3\xE1\xED\xC9 \xC7\xE1\xCA\xDE\xD3\xED\xE3 \xDA\xE1\xEC \xD5\xDD\xD1',
-	    DB_ERROR_INVALID		=> '\xDB\xED\xD1 \xD5\xCD\xED\xCD',
-	    DB_ERROR_INVALID_DATE	=> '\xD5\xED\xDB\xC9 \xE6\xDE\xCA \xC3\xE6 \xCA\xC7\xD1\xED\xCE \xDB\xED\xD1 \xD5\xCD\xED\xCD\xC9',
-	    DB_ERROR_INVALID_NUMBER	=> '\xD5\xED\xDB\xC9 \xD1\xDE\xE3 \xDB\xED\xD1 \xD5\xCD\xED\xCD\xC9',
-	    DB_ERROR_MISMATCH		=> '\xDB\xED\xD1 \xE3\xCA\xD8\xC7\xC8\xDE',
-	    DB_ERROR_NODBSELECTED	=> '\xE1\xE3 \xED\xCA\xE3 \xC5\xCE\xCA\xED\xC7\xD1 \xDE\xC7\xDA\xCF\xC9 \xC7\xE1\xC8\xED\xC7\xE4\xC7\xCA \xC8\xDA\xCF',
-	    DB_ERROR_NOSUCHFIELD	=> '\xE1\xED\xD3 \xE5\xE4\xC7\xE1\xDF \xCD\xDE\xE1 \xC8\xE5\xD0\xC7 \xC7\xE1\xC7\xD3\xE3',
-	    DB_ERROR_NOSUCHTABLE	=> '\xE1\xED\xD3 \xE5\xE4\xC7\xE1\xDF \xCC\xCF\xE6\xE1 \xC8\xE5\xD0\xC7 \xC7\xE1\xC7\xD3\xE3',
-	    DB_ERROR_NOT_CAPABLE	=> '\xDE\xC7\xDA\xCF\xC9 \xC7\xE1\xC8\xED\xC7\xE4\xC7\xCA \xC7\xE1\xE3\xD1\xCA\xC8\xD8 \xC8\xE5\xC7 \xDB\xED\xD1 \xDE\xC7\xCF\xD1\xC9',
-	    DB_ERROR_NOT_FOUND		=> '\xE1\xE3 \xED\xCA\xE3 \xC5\xED\xCC\xC7\xCF\xE5',
-	    DB_ERROR_NOT_LOCKED 	=> '\xDB\xED\xD1 \xE3\xDE\xDD\xE6\xE1',
-	    DB_ERROR_SYNTAX		=> '\xCE\xD8\xC3 \xDD\xED \xC7\xE1\xD5\xED\xDB\xC9',
-	    DB_ERROR_UNSUPPORTED	=> '\xDB\xED\xD1 \xE3\xCF\xDA\xE6\xE3',
-	    DB_ERROR_VALUE_COUNT_ON_ROW => '\xDA\xCF\xCF \xC7\xE1\xDE\xED\xE3 \xDD\xED \xC7\xE1\xD3\xCC\xE1',
-	    DB_ERROR_INVALID_DSN	=> 'DSN \xDB\xED\xD1 \xD5\xCD\xED\xCD',
-	    DB_ERROR_CONNECT_FAILED	=> '\xDD\xD4\xE1 \xDA\xE3\xE1\xED\xC9 \xC7\xE1\xC5\xCA\xD5\xC7\xE1',
-	    0			       => '\xE1\xED\xD3 \xE5\xE4\xC7\xE1\xDF \xC3\xCE\xD8\xC7\xC1', // DB_OK
-	    DB_ERROR_NEED_MORE_DATA	=> '\xC7\xE1\xC8\xED\xC7\xE4\xC7\xCA \xC7\xE1\xE3\xD2\xE6\xCF\xC9 \xDB\xED\xD1 \xDF\xC7\xDD\xED\xC9',
-	    DB_ERROR_EXTENSION_NOT_FOUND=> '\xE1\xE3 \xED\xCA\xE3 \xC5\xED\xCC\xC7\xCF \xC7\xE1\xC5\xD6\xC7\xDD\xC9 \xC7\xE1\xE3\xCA\xDA\xE1\xDE\xC9',
-	    DB_ERROR_NOSUCHDB		=> '\xE1\xED\xD3 \xE5\xE4\xC7\xE1\xDF \xDE\xC7\xDA\xCF\xC9 \xC8\xED\xC7\xE4\xC7\xCA \xC8\xE5\xD0\xC7 \xC7\xE1\xC7\xD3\xE3',
-	    DB_ERROR_ACCESS_VIOLATION	=> '\xD3\xE3\xC7\xCD\xED\xC7\xCA \xDB\xED\xD1 \xDF\xC7\xDD\xED\xC9'
+	    DB_ERROR			=> 'خطأ غير محدد',
+	    DB_ERROR_ALREADY_EXISTS	=> 'موجود مسبقا',
+	    DB_ERROR_CANNOT_CREATE	=> 'لا يمكن إنشاء',
+	    DB_ERROR_CANNOT_DELETE	=> 'لا يمكن حذف',
+	    DB_ERROR_CANNOT_DROP	=> 'لا يمكن حذف',
+	    DB_ERROR_CONSTRAINT 	=> 'عملية إدخال ممنوعة',
+	    DB_ERROR_DIVZERO		=> 'عملية التقسيم على صفر',
+	    DB_ERROR_INVALID		=> 'غير صحيح',
+	    DB_ERROR_INVALID_DATE	=> 'صيغة وقت أو تاريخ غير صحيحة',
+	    DB_ERROR_INVALID_NUMBER	=> 'صيغة رقم غير صحيحة',
+	    DB_ERROR_MISMATCH		=> 'غير متطابق',
+	    DB_ERROR_NODBSELECTED	=> 'لم يتم إختيار قاعدة البيانات بعد',
+	    DB_ERROR_NOSUCHFIELD	=> 'ليس هنالك حقل بهذا الاسم',
+	    DB_ERROR_NOSUCHTABLE	=> 'ليس هنالك جدول بهذا الاسم',
+	    DB_ERROR_NOT_CAPABLE	=> 'قاعدة البيانات المرتبط بها غير قادرة',
+	    DB_ERROR_NOT_FOUND		=> 'لم يتم إيجاده',
+	    DB_ERROR_NOT_LOCKED 	=> 'غير مقفول',
+	    DB_ERROR_SYNTAX		=> 'خطأ في الصيغة',
+	    DB_ERROR_UNSUPPORTED	=> 'غير مدعوم',
+	    DB_ERROR_VALUE_COUNT_ON_ROW => 'عدد القيم في السجل',
+	    DB_ERROR_INVALID_DSN	=> 'DSN غير صحيح',
+	    DB_ERROR_CONNECT_FAILED	=> 'فشل عملية الإتصال',
+	    0			       => 'ليس هنالك أخطاء', // DB_OK
+	    DB_ERROR_NEED_MORE_DATA	=> 'البيانات المزودة غير كافية',
+	    DB_ERROR_EXTENSION_NOT_FOUND=> 'لم يتم إيجاد الإضافة المتعلقة',
+	    DB_ERROR_NOSUCHDB		=> 'ليس هنالك قاعدة بيانات بهذا الاسم',
+	    DB_ERROR_ACCESS_VIOLATION	=> 'سماحيات غير كافية'
 );

Modified: trunk/lib/WikiDB/adodb/lang/adodb-bg.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-bg.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-bg.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,36 +1,36 @@
 <?php
 /*
-	Bulgarian language, v1.0, 25.03.2004, encoding by Windows-1251 charset
+	Bulgarian language, v1.0, 25.03.2004, encoding by UTF-8 charset
 	contributed by Valentin Sheiretsky <valio#valio.eu.org>
 */
 
 $ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'bg',
-            DB_ERROR                    => '\xED\xE5\xE8\xE7\xE2\xE5\xF1\xF2\xED\xE0 \xE3\xF0\xE5\xF8\xEA\xE0',
-            DB_ERROR_ALREADY_EXISTS     => '\xE2\xE5\xF7\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0',
-            DB_ERROR_CANNOT_CREATE      => '\xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xE1\xFA\xE4\xE5 \xF1\xFA\xE7\xE4\xE0\xE4\xE5\xED\xE0',
-            DB_ERROR_CANNOT_DELETE      => '\xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xE1\xFA\xE4\xE5 \xE8\xE7\xF2\xF0\xE8\xF2\xE0',
-            DB_ERROR_CANNOT_DROP        => '\xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xE1\xFA\xE4\xE5 \xF3\xED\xE8\xF9\xEE\xE6\xE5\xED\xE0',
-            DB_ERROR_CONSTRAINT         => '\xED\xE0\xF0\xF3\xF8\xE5\xED\xEE \xF3\xF1\xEB\xEE\xE2\xE8\xE5',
-            DB_ERROR_DIVZERO            => '\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xED\xE0 \xED\xF3\xEB\xE0',
-            DB_ERROR_INVALID            => '\xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xED\xEE',
-            DB_ERROR_INVALID_DATE       => '\xED\xE5\xEA\xEE\xF0\xE5\xEA\xF2\xED\xE0 \xE4\xE0\xF2\xE0 \xE8\xEB\xE8 \xF7\xE0\xF1',
-            DB_ERROR_INVALID_NUMBER     => '\xED\xE5\xE2\xE0\xEB\xE8\xE4\xE5\xED \xED\xEE\xEC\xE5\xF0',
-            DB_ERROR_MISMATCH           => '\xEF\xEE\xE3\xF0\xE5\xF8\xED\xE0 \xF3\xEF\xEE\xF2\xF0\xE5\xE1\xE0',
-            DB_ERROR_NODBSELECTED       => '\xED\xE5 \xE5 \xE8\xE7\xE1\xF0\xE0\xED\xE0 \xE1\xE0\xE7\xE0 \xE4\xE0\xED\xED\xE8',
-            DB_ERROR_NOSUCHFIELD        => '\xED\xE5\xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9\xEE \xEF\xEE\xEB\xE5',
-            DB_ERROR_NOSUCHTABLE        => '\xED\xE5\xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9\xE0 \xF2\xE0\xE1\xEB\xE8\xF6\xE0',
+            'LANG'                      => 'bg',
+            DB_ERROR                    => 'неизвестна грешка',
+            DB_ERROR_ALREADY_EXISTS     => 'вече съществува',
+            DB_ERROR_CANNOT_CREATE      => 'не може да бъде създадена',
+            DB_ERROR_CANNOT_DELETE      => 'не може да бъде изтрита',
+            DB_ERROR_CANNOT_DROP        => 'не може да бъде унищожена',
+            DB_ERROR_CONSTRAINT         => 'нарушено условие',
+            DB_ERROR_DIVZERO            => 'деление на нула',
+            DB_ERROR_INVALID            => 'неправилно',
+            DB_ERROR_INVALID_DATE       => 'некоректна дата или час',
+            DB_ERROR_INVALID_NUMBER     => 'невалиден номер',
+            DB_ERROR_MISMATCH           => 'погрешна употреба',
+            DB_ERROR_NODBSELECTED       => 'не е избрана база данни',
+            DB_ERROR_NOSUCHFIELD        => 'несъществуващо поле',
+            DB_ERROR_NOSUCHTABLE        => 'несъществуваща таблица',
             DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => '\xED\xE5 \xE5 \xED\xE0\xEC\xE5\xF0\xE5\xED\xE0',
-            DB_ERROR_NOT_LOCKED         => '\xED\xE5 \xE5 \xE7\xE0\xEA\xEB\xFE\xF7\xE5\xED\xE0',
-            DB_ERROR_SYNTAX             => '\xE3\xF0\xE5\xF8\xE5\xED \xF1\xE8\xED\xF2\xE0\xEA\xF1\xE8\xF1',
-            DB_ERROR_UNSUPPORTED        => '\xED\xE5 \xF1\xE5 \xEF\xEE\xE4\xE4\xFA\xF0\xE6\xE0',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '\xED\xE5\xEA\xEE\xF0\xE5\xEA\xF2\xE5\xED \xE1\xF0\xEE\xE9 \xEA\xEE\xEB\xEE\xED\xE8 \xE2 \xF0\xE5\xE4\xE0',
-            DB_ERROR_INVALID_DSN        => '\xED\xE5\xE2\xE0\xEB\xE8\xE4\xE5\xED DSN',
-            DB_ERROR_CONNECT_FAILED     => '\xE2\xF0\xFA\xE7\xEA\xE0\xF2\xE0 \xED\xE5 \xEC\xEE\xE6\xE5 \xE4\xE0 \xE1\xFA\xE4\xE5 \xEE\xF1\xFA\xF9\xE5\xF1\xF2\xE2\xE5\xED\xE0',
-            0	                        => '\xED\xFF\xEC\xE0 \xE3\xF0\xE5\xF8\xEA\xE8', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '\xEF\xF0\xE5\xE4\xEE\xF1\xF2\xE0\xE2\xE5\xED\xE8\xF2\xE5 \xE4\xE0\xED\xED\xE8 \xF1\xE0 \xED\xE5\xE4\xEE\xF1\xF2\xE0\xF2\xFA\xF7\xED\xE8',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '\xF0\xE0\xE7\xF8\xE8\xF0\xE5\xED\xE8\xE5\xF2\xEE \xED\xE5 \xE5 \xED\xE0\xEC\xE5\xF0\xE5\xED\xEE',
-            DB_ERROR_NOSUCHDB           => '\xED\xE5\xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0\xF9\xE0 \xE1\xE0\xE7\xE0 \xE4\xE0\xED\xED\xE8',
-            DB_ERROR_ACCESS_VIOLATION   => '\xED\xFF\xEC\xE0\xF2\xE5 \xE4\xEE\xF1\xF2\xE0\xF2\xFA\xF7\xED\xEE \xEF\xF0\xE0\xE2\xE0'
+            DB_ERROR_NOT_FOUND          => 'не е намерена',
+            DB_ERROR_NOT_LOCKED         => 'не е заключена',
+            DB_ERROR_SYNTAX             => 'грешен синтаксис',
+            DB_ERROR_UNSUPPORTED        => 'не се поддържа',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'некоректен брой колони в реда',
+            DB_ERROR_INVALID_DSN        => 'невалиден DSN',
+            DB_ERROR_CONNECT_FAILED     => 'връзката не може да бъде осъществена',
+            0	                        => 'няма грешки', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'предоставените данни са недостатъчни',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'разширението не е намерено',
+            DB_ERROR_NOSUCHDB           => 'несъществуваща база данни',
+            DB_ERROR_ACCESS_VIOLATION   => 'нямате достатъчно права'
 );

Modified: trunk/lib/WikiDB/adodb/lang/adodb-cn.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-cn.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-cn.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,34 +1,33 @@
 <?php
 // Chinese language file contributed by "Cuiyan (cysoft)" cysoft#php.net.
-// Encode by GB2312
 // Simplified Chinese
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'cn',
-            DB_ERROR                    => 'δ֪\xB4\xED\xCE\xF3',
-            DB_ERROR_ALREADY_EXISTS     => '\xD2Ѿ\xAD\xB4\xE6\xD4\xDA',
-            DB_ERROR_CANNOT_CREATE      => '\xB2\xBB\xC4ܴ\xB4\xBD\xA8',
-            DB_ERROR_CANNOT_DELETE      => '\xB2\xBB\xC4\xDCɾ\xB3\xFD',
-            DB_ERROR_CANNOT_DROP        => '\xB2\xBB\xC4ܶ\xAA\xC6\xFA',
-            DB_ERROR_CONSTRAINT         => 'Լ\xCA\xF8\xCF\xDE\xD6\xC6',
-            DB_ERROR_DIVZERO            => '\xB1\xBB0\xB3\xFD',
-            DB_ERROR_INVALID            => '\xCE\xDEЧ',
-            DB_ERROR_INVALID_DATE       => '\xCE\xDEЧ\xB5\xC4\xC8\xD5\xC6ڻ\xF2\xD5\xDFʱ\xBC\xE4',
-            DB_ERROR_INVALID_NUMBER     => '\xCE\xDEЧ\xB5\xC4\xCA\xFD\xD7\xD6',
-            DB_ERROR_MISMATCH           => '\xB2\xBBƥ\xC5\xE4',
-            DB_ERROR_NODBSELECTED       => 'û\xD3\xD0\xCA\xFD\xBEݿⱻѡ\xD4\xF1',
-            DB_ERROR_NOSUCHFIELD        => 'û\xD3\xD0\xCF\xE0Ӧ\xB5\xC4\xD7ֶ\xCE',
-            DB_ERROR_NOSUCHTABLE        => 'û\xD3\xD0\xCF\xE0Ӧ\xB5ı\xED',
-            DB_ERROR_NOT_CAPABLE        => '\xCA\xFD\xBEݿ\xE2\xBA\xF3̨\xB2\xBB\xBC\xE6\xC8\xDD',
-            DB_ERROR_NOT_FOUND          => 'û\xD3з\xA2\xCF\xD6',
-            DB_ERROR_NOT_LOCKED         => 'û\xD3б\xBB\xCB\xF8\xB6\xA8',
-            DB_ERROR_SYNTAX             => '\xD3﷨\xB4\xED\xCE\xF3',
-            DB_ERROR_UNSUPPORTED        => '\xB2\xBB֧\xB3\xD6',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '\xD4\xDA\xD0\xD0\xC9\xCF\xC0ۼ\xC6ֵ',
-            DB_ERROR_INVALID_DSN        => '\xCE\xDEЧ\xB5\xC4\xCA\xFD\xBE\xDDԴ (DSN)',
-            DB_ERROR_CONNECT_FAILED     => '\xC1\xAC\xBD\xD3ʧ\xB0\xDC',
-            0	                       => 'û\xD3д\xED\xCE\xF3', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '\xCCṩ\xB5\xC4\xCA\xFD\xBEݲ\xBB\xC4ܷ\xFB\xBA\xCFҪ\xC7\xF3',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '\xC0\xA9չû\xD3б\xBB\xB7\xA2\xCF\xD6',
-            DB_ERROR_NOSUCHDB           => 'û\xD3\xD0\xCF\xE0Ӧ\xB5\xC4\xCA\xFD\xBEݿ\xE2',
-            DB_ERROR_ACCESS_VIOLATION   => 'û\xD3к\xCF\xCAʵ\xC4Ȩ\xCF\xDE'
+            DB_ERROR                    => '未知错误',
+            DB_ERROR_ALREADY_EXISTS     => '已经存在',
+            DB_ERROR_CANNOT_CREATE      => '不能创建',
+            DB_ERROR_CANNOT_DELETE      => '不能删除',
+            DB_ERROR_CANNOT_DROP        => '不能丢弃',
+            DB_ERROR_CONSTRAINT         => '约束限制',
+            DB_ERROR_DIVZERO            => '被0除',
+            DB_ERROR_INVALID            => '无效',
+            DB_ERROR_INVALID_DATE       => '无效的日期或者时间',
+            DB_ERROR_INVALID_NUMBER     => '无效的数字',
+            DB_ERROR_MISMATCH           => '不匹配',
+            DB_ERROR_NODBSELECTED       => '没有数据库被选择',
+            DB_ERROR_NOSUCHFIELD        => '没有相应的字段',
+            DB_ERROR_NOSUCHTABLE        => '没有相应的表',
+            DB_ERROR_NOT_CAPABLE        => '数据库后台不兼容',
+            DB_ERROR_NOT_FOUND          => '没有发现',
+            DB_ERROR_NOT_LOCKED         => '没有被锁定',
+            DB_ERROR_SYNTAX             => '语法错误',
+            DB_ERROR_UNSUPPORTED        => '不支持',
+            DB_ERROR_VALUE_COUNT_ON_ROW => '在行上累计值',
+            DB_ERROR_INVALID_DSN        => '无效的数据源 (DSN)',
+            DB_ERROR_CONNECT_FAILED     => '连接失败',
+            0	                       => '没有错误', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => '提供的数据不能符合要求',
+            DB_ERROR_EXTENSION_NOT_FOUND=> '扩展没有被发现',
+            DB_ERROR_NOSUCHDB           => '没有相应的数据库',
+            DB_ERROR_ACCESS_VIOLATION   => '没有合适的权限'
 );

Modified: trunk/lib/WikiDB/adodb/lang/adodb-cz.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-cz.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-cz.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,39 +1,35 @@
 <?php
 
-# Czech language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# For convert to MS Windows use shell command:
-#    iconv -f ISO_8859-2 -t CP1250 < adodb-cz.inc.php
-# For convert to ASCII use shell command:
-#    unaccent ISO_8859-2 < adodb-cz.inc.php
+# Czech language
 # v1.0, 19.06.2003 Kamil Jakubovic <ja...@ho...>
 
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'cz',
-            DB_ERROR                    => 'nezn\xE1m\xE1 chyba',
+            DB_ERROR                    => 'neznámá chyba',
             DB_ERROR_ALREADY_EXISTS     => 'ji? existuje',
             DB_ERROR_CANNOT_CREATE      => 'nelze vytvo?it',
             DB_ERROR_CANNOT_DELETE      => 'nelze smazat',
             DB_ERROR_CANNOT_DROP        => 'nelze odstranit',
-            DB_ERROR_CONSTRAINT         => 'poru?en\xED omezuj\xEDc\xED podm\xEDnky',
-            DB_ERROR_DIVZERO            => 'd?len\xED nulou',
-            DB_ERROR_INVALID            => 'neplatn\xE9',
-            DB_ERROR_INVALID_DATE       => 'neplatn\xE9 datum nebo ?as',
-            DB_ERROR_INVALID_NUMBER     => 'neplatn\xE9 ?\xEDslo',
-            DB_ERROR_MISMATCH           => 'nesouhlas\xED',
-            DB_ERROR_NODBSELECTED       => '?\xE1dn\xE1 datab\xE1ze nen\xED vybr\xE1na',
+            DB_ERROR_CONSTRAINT         => 'poru?ení omezující podmínky',
+            DB_ERROR_DIVZERO            => 'd?lení nulou',
+            DB_ERROR_INVALID            => 'neplatné',
+            DB_ERROR_INVALID_DATE       => 'neplatné datum nebo ?as',
+            DB_ERROR_INVALID_NUMBER     => 'neplatné ?íslo',
+            DB_ERROR_MISMATCH           => 'nesouhlasí',
+            DB_ERROR_NODBSELECTED       => '?ádná databáze není vybrána',
             DB_ERROR_NOSUCHFIELD        => 'pole nenalezeno',
             DB_ERROR_NOSUCHTABLE        => 'tabulka nenalezena',
-            DB_ERROR_NOT_CAPABLE        => 'nepodporov\xE1no',
+            DB_ERROR_NOT_CAPABLE        => 'nepodporováno',
             DB_ERROR_NOT_FOUND          => 'nenalezeno',
             DB_ERROR_NOT_LOCKED         => 'nezam?eno',
-            DB_ERROR_SYNTAX             => 'syntaktick\xE1 chyba',
-            DB_ERROR_UNSUPPORTED        => 'nepodporov\xE1no',
+            DB_ERROR_SYNTAX             => 'syntaktická chyba',
+            DB_ERROR_UNSUPPORTED        => 'nepodporováno',
             DB_ERROR_VALUE_COUNT_ON_ROW => '',
-            DB_ERROR_INVALID_DSN        => 'neplatn\xE9 DSN',
-            DB_ERROR_CONNECT_FAILED     => 'p?ipojen\xED selhalo',
+            DB_ERROR_INVALID_DSN        => 'neplatné DSN',
+            DB_ERROR_CONNECT_FAILED     => 'p?ipojení selhalo',
             0	                        => 'bez chyb', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'm\xE1lo zdrojov\xFDch dat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz?\xED?en\xED nenalezeno',
-            DB_ERROR_NOSUCHDB           => 'datab\xE1ze neexistuje',
-            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?n\xE1 pr\xE1va'
+            DB_ERROR_NEED_MORE_DATA     => 'málo zdrojových dat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'roz?í?ení nenalezeno',
+            DB_ERROR_NOSUCHDB           => 'databáze neexistuje',
+            DB_ERROR_ACCESS_VIOLATION   => 'nedostate?ná práva'
 );

Modified: trunk/lib/WikiDB/adodb/lang/adodb-da.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-da.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-da.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -7,7 +7,7 @@
             DB_ERROR_CANNOT_CREATE      => 'kan ikke oprette',
             DB_ERROR_CANNOT_DELETE      => 'kan ikke slette',
             DB_ERROR_CANNOT_DROP        => 'kan ikke droppe',
-            DB_ERROR_CONSTRAINT         => 'begr&aelig;nsning kr&aelig;nket',
+            DB_ERROR_CONSTRAINT         => 'begrænsning krænket',
             DB_ERROR_DIVZERO            => 'division med nul',
             DB_ERROR_INVALID            => 'ugyldig',
             DB_ERROR_INVALID_DATE       => 'ugyldig dato eller klokkeslet',
@@ -18,15 +18,15 @@
             DB_ERROR_NOSUCHTABLE        => 'tabel findes ikke',
             DB_ERROR_NOT_CAPABLE        => 'DB backend opgav',
             DB_ERROR_NOT_FOUND          => 'ikke fundet',
-            DB_ERROR_NOT_LOCKED         => 'ikke l&aring;st',
+            DB_ERROR_NOT_LOCKED         => 'ikke låst',
             DB_ERROR_SYNTAX             => 'syntaksfejl',
-            DB_ERROR_UNSUPPORTED        => 'ikke underst&oslash;ttet',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'resulterende antal felter svarer ikke til foresp&oslash;rgslens antal felter',
+            DB_ERROR_UNSUPPORTED        => 'ikke understøttet',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'resulterende antal felter svarer ikke til forespørgslens antal felter',
             DB_ERROR_INVALID_DSN        => 'ugyldig DSN',
             DB_ERROR_CONNECT_FAILED     => 'tilslutning mislykkedes',
             0	                        => 'ingen fejl', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'utilstr&aelig;kkelige data angivet',
+            DB_ERROR_NEED_MORE_DATA     => 'utilstrækkelige data angivet',
             DB_ERROR_EXTENSION_NOT_FOUND=> 'udvidelse ikke fundet',
             DB_ERROR_NOSUCHDB           => 'database ikke fundet',
-            DB_ERROR_ACCESS_VIOLATION   => 'utilstr&aelig;kkelige rettigheder'
+            DB_ERROR_ACCESS_VIOLATION   => 'utilstrækkelige rettigheder'
 );

Modified: trunk/lib/WikiDB/adodb/lang/adodb-de.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-de.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-de.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -5,28 +5,28 @@
 			DB_ERROR                    => 'Unbekannter Fehler',
             DB_ERROR_ALREADY_EXISTS     => 'existiert bereits',
             DB_ERROR_CANNOT_CREATE      => 'kann nicht erstellen',
-            DB_ERROR_CANNOT_DELETE      => 'kann nicht l&ouml;schen',
-            DB_ERROR_CANNOT_DROP        => 'Tabelle oder Index konnte nicht gel&ouml;scht werden',
+            DB_ERROR_CANNOT_DELETE      => 'kann nicht löschen',
+            DB_ERROR_CANNOT_DROP        => 'Tabelle oder Index konnte nicht gelöscht werden',
             DB_ERROR_CONSTRAINT         => 'Constraint Verletzung',
             DB_ERROR_DIVZERO            => 'Division durch Null',
-            DB_ERROR_INVALID            => 'ung&uml;ltig',
-            DB_ERROR_INVALID_DATE       => 'ung&uml;ltiges Datum oder Zeit',
-            DB_ERROR_INVALID_NUMBER     => 'ung&uml;ltige Zahl',
-            DB_ERROR_MISMATCH           => 'Unvertr&auml;glichkeit',
-            DB_ERROR_NODBSELECTED       => 'keine Dantebank ausgew&auml;hlt',
+            DB_ERROR_INVALID            => 'ungültig',
+            DB_ERROR_INVALID_DATE       => 'ungültiges Datum oder Zeit',
+            DB_ERROR_INVALID_NUMBER     => 'ungültige Zahl',
+            DB_ERROR_MISMATCH           => 'Unverträglichkeit',
+            DB_ERROR_NODBSELECTED       => 'keine Dantebank ausgewählt',
             DB_ERROR_NOSUCHFIELD        => 'Feld nicht vorhanden',
             DB_ERROR_NOSUCHTABLE        => 'Tabelle nicht vorhanden',
             DB_ERROR_NOT_CAPABLE        => 'Funktion nicht installiert',
             DB_ERROR_NOT_FOUND          => 'nicht gefunden',
             DB_ERROR_NOT_LOCKED         => 'nicht gesperrt',
             DB_ERROR_SYNTAX             => 'Syntaxfehler',
-            DB_ERROR_UNSUPPORTED        => 'nicht Unterst&uml;tzt',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'Anzahl der zur&uml;ckgelieferten Felder entspricht nicht der Anzahl der Felder in der Abfrage',
-            DB_ERROR_INVALID_DSN        => 'ung&uml;ltiger DSN',
+            DB_ERROR_UNSUPPORTED        => 'nicht Unterstützt',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'Anzahl der zurückgelieferten Felder entspricht nicht der Anzahl der Felder in der Abfrage',
+            DB_ERROR_INVALID_DSN        => 'ungültiger DSN',
             DB_ERROR_CONNECT_FAILED     => 'Verbindung konnte nicht hergestellt werden',
             0	                       => 'kein Fehler', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'Nicht gen&uml;gend Daten geliefert',
+            DB_ERROR_NEED_MORE_DATA     => 'Nicht genügend Daten geliefert',
             DB_ERROR_EXTENSION_NOT_FOUND=> 'erweiterung nicht gefunden',
             DB_ERROR_NOSUCHDB           => 'keine Datenbank',
-            DB_ERROR_ACCESS_VIOLATION   => 'ungen&uml;gende Rechte'
+            DB_ERROR_ACCESS_VIOLATION   => 'ungenügende Rechte'
 );

Copied: trunk/lib/WikiDB/adodb/lang/adodb-eo.inc.php (from rev 9048, trunk/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php)
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-eo.inc.php	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/lang/adodb-eo.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -0,0 +1,34 @@
+<?php
+// Vivu Esperanto ĉiam!
+// Traduko fare de Antono Vasiljev (anders[#]brainactive.org)
+
+$ADODB_LANG_ARRAY = array (
+             'LANG'                      => 'eo',
+            DB_ERROR                    => 'nekonata eraro',
+            DB_ERROR_ALREADY_EXISTS     => 'jam ekzistas',
+            DB_ERROR_CANNOT_CREATE      => 'maleblas krei',
+            DB_ERROR_CANNOT_DELETE      => 'maleblas elimini',
+            DB_ERROR_CANNOT_DROP        => 'maleblas elimini (drop)',
+            DB_ERROR_CONSTRAINT         => 'rompo de kondiĉoj de provo',
+            DB_ERROR_DIVZERO            => 'divido per 0 (nul)',
+            DB_ERROR_INVALID            => 'malregule',
+            DB_ERROR_INVALID_DATE       => 'malregula dato kaj tempo',
+            DB_ERROR_INVALID_NUMBER     => 'malregula nombro',
+            DB_ERROR_MISMATCH           => 'eraro',
+            DB_ERROR_NODBSELECTED       => 'datumbazo ne elektita',
+            DB_ERROR_NOSUCHFIELD        => 'ne ekzistas kampo',
+            DB_ERROR_NOSUCHTABLE        => 'ne ekzistas tabelo',
+            DB_ERROR_NOT_CAPABLE        => 'DBMS ne povas',
+            DB_ERROR_NOT_FOUND          => 'ne trovita',
+            DB_ERROR_NOT_LOCKED         => 'ne blokita',
+            DB_ERROR_SYNTAX             => 'sintaksa eraro',
+            DB_ERROR_UNSUPPORTED        => 'ne apogata',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'nombrilo de valoroj en linio',
+            DB_ERROR_INVALID_DSN        => 'malregula DSN-o',
+            DB_ERROR_CONNECT_FAILED     => 'konekto malsukcesa',
+            0                               => 'ĉio bone', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'ne sufiĉe da datumo',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'etendo ne trovita',
+            DB_ERROR_NOSUCHDB           => 'datumbazo ne ekzistas',
+            DB_ERROR_ACCESS_VIOLATION   => 'ne sufiĉe da rajto por atingo'
+);

Deleted: trunk/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-esperanto.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,34 +0,0 @@
-<?php
-// Vivu Esperanto cxiam!
-// Traduko fare de Antono Vasiljev (anders[#]brainactive.org)
-
-$ADODB_LANG_ARRAY = array (
-             'LANG'                      => 'eo',
-            DB_ERROR                    => 'nekonata eraro',
-            DB_ERROR_ALREADY_EXISTS     => 'jam ekzistas',
-            DB_ERROR_CANNOT_CREATE      => 'maleblas krei',
-            DB_ERROR_CANNOT_DELETE      => 'maleblas elimini',
-            DB_ERROR_CANNOT_DROP        => 'maleblas elimini (drop)',
-            DB_ERROR_CONSTRAINT         => 'rompo de kondicxoj de provo',
-            DB_ERROR_DIVZERO            => 'divido per 0 (nul)',
-            DB_ERROR_INVALID            => 'malregule',
-            DB_ERROR_INVALID_DATE       => 'malregula dato kaj tempo',
-            DB_ERROR_INVALID_NUMBER     => 'malregula nombro',
-            DB_ERROR_MISMATCH           => 'eraro',
-            DB_ERROR_NODBSELECTED       => 'datumbazo ne elektita',
-            DB_ERROR_NOSUCHFIELD        => 'ne ekzistas kampo',
-            DB_ERROR_NOSUCHTABLE        => 'ne ekzistas tabelo',
-            DB_ERROR_NOT_CAPABLE        => 'DBMS ne povas',
-            DB_ERROR_NOT_FOUND          => 'ne trovita',
-            DB_ERROR_NOT_LOCKED         => 'ne blokita',
-            DB_ERROR_SYNTAX             => 'sintaksa eraro',
-            DB_ERROR_UNSUPPORTED        => 'ne apogata',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'nombrilo de valoroj en linio',
-            DB_ERROR_INVALID_DSN        => 'malregula DSN-o',
-            DB_ERROR_CONNECT_FAILED     => 'konekto malsukcesa',
-            0                               => 'cxio bone', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ne suficxe da datumo',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'etendo ne trovita',
-            DB_ERROR_NOSUCHDB           => 'datumbazo ne ekzistas',
-            DB_ERROR_ACCESS_VIOLATION   => 'ne suficxe da rajto por atingo'
-);

Modified: trunk/lib/WikiDB/adodb/lang/adodb-fr.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-fr.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-fr.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -3,30 +3,30 @@
 $ADODB_LANG_ARRAY = array (
 	'LANG'                      => 'fr',
 	DB_ERROR                    => 'erreur inconnue',
-	DB_ERROR_ALREADY_EXISTS     => 'existe d&eacute;j&agrave;',
-	DB_ERROR_CANNOT_CREATE      => 'cr&eacute;tion impossible',
+	DB_ERROR_ALREADY_EXISTS     => 'existe déjà',
+	DB_ERROR_CANNOT_CREATE      => 'création impossible',
 	DB_ERROR_CANNOT_DELETE      => 'effacement impossible',
 	DB_ERROR_CANNOT_DROP        => 'suppression impossible',
 	DB_ERROR_CONSTRAINT         => 'violation de contrainte',
-	DB_ERROR_DIVZERO            => 'division par z&eacute;ro',
+	DB_ERROR_DIVZERO            => 'division par zéro',
 	DB_ERROR_INVALID            => 'invalide',
 	DB_ERROR_INVALID_DATE       => 'date ou heure invalide',
 	DB_ERROR_INVALID_NUMBER     => 'nombre invalide',
 	DB_ERROR_MISMATCH           => 'erreur de concordance',
-	DB_ERROR_NODBSELECTED       => 'pas de base de donn&eacute;ess&eacute;lectionn&eacute;e',
+	DB_ERROR_NODBSELECTED       => 'pas de base de données sélectionnée',
 	DB_ERROR_NOSUCHFIELD        => 'nom de colonne invalide',
 	DB_ERROR_NOSUCHTABLE        => 'table ou vue inexistante',
-	DB_ERROR_NOT_CAPABLE        => 'fonction optionnelle non install&eacute;e',
-	DB_ERROR_NOT_FOUND          => 'pas trouv&eacute;',
-	DB_ERROR_NOT_LOCKED         => 'non verrouill&eacute;',
+	DB_ERROR_NOT_CAPABLE        => 'fonction optionnelle non installée',
+	DB_ERROR_NOT_FOUND          => 'pas trouvé',
+	DB_ERROR_NOT_LOCKED         => 'non verrouillé',
 	DB_ERROR_SYNTAX             => 'erreur de syntaxe',
-	DB_ERROR_UNSUPPORTED        => 'non support&eacute;',
-	DB_ERROR_VALUE_COUNT_ON_ROW => 'valeur ins&eacute;r&eacute;e trop grande pour colonne',
+	DB_ERROR_UNSUPPORTED        => 'non supporté',
+	DB_ERROR_VALUE_COUNT_ON_ROW => 'valeur insérée trop grande pour colonne',
 	DB_ERROR_INVALID_DSN        => 'DSN invalide',
-	DB_ERROR_CONNECT_FAILED     => '&eacute;chec &agrave; la connexion',
+	DB_ERROR_CONNECT_FAILED     => 'échec à la connexion',
 	0                        => "pas d'erreur", // DB_OK
-	DB_ERROR_NEED_MORE_DATA     => 'donn&eacute;es fournies insuffisantes',
-	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension non trouv&eacute;e',
-	DB_ERROR_NOSUCHDB           => 'base de donn&eacute;es inconnue',
+	DB_ERROR_NEED_MORE_DATA     => 'données fournies insuffisantes',
+	DB_ERROR_EXTENSION_NOT_FOUND=> 'extension non trouvée',
+	DB_ERROR_NOSUCHDB           => 'base de données inconnue',
 	DB_ERROR_ACCESS_VIOLATION   => 'droits insuffisants'
 );

Modified: trunk/lib/WikiDB/adodb/lang/adodb-hu.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-hu.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-hu.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,33 +1,33 @@
 <?php
 # Hungarian language, encoding by ISO 8859-2 charset (Iso Latin-2)
-# Hal\xE1szv\xE1ri G\xE1bor <g.halaszvari#portmax.hu>
+# Halászvári Gábor <g.halaszvari#portmax.hu>
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'hu',
             DB_ERROR                    => 'ismeretlen hiba',
-            DB_ERROR_ALREADY_EXISTS     => 'm\xE1r l\xE9tezik',
-            DB_ERROR_CANNOT_CREATE      => 'nem siker\xFClt l\xE9trehozni',
-            DB_ERROR_CANNOT_DELETE      => 'nem siker\xFClt t\xF6r\xF6lni',
-            DB_ERROR_CANNOT_DROP        => 'nem siker\xFClt eldobni',
-            DB_ERROR_CONSTRAINT         => 'szab\xE1lyok megszeg\xE9se',
-            DB_ERROR_DIVZERO            => 'oszt\xE1s null\xE1val',
-            DB_ERROR_INVALID            => '\xE9rv\xE9nytelen',
-            DB_ERROR_INVALID_DATE       => '\xE9rv\xE9nytelen d\xE1tum vagy id\xF5',
-            DB_ERROR_INVALID_NUMBER     => '\xE9rv\xE9nytelen sz\xE1m',
-            DB_ERROR_MISMATCH           => 'nem megfelel\xF5',
-            DB_ERROR_NODBSELECTED       => 'nincs kiv\xE1lasztott adatb\xE1zis',
-            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mez\xF5',
-            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen t\xE1bla',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend nem t\xE1mogatja',
-            DB_ERROR_NOT_FOUND          => 'nem tal\xE1lhat\xF3',
-            DB_ERROR_NOT_LOCKED         => 'nincs lez\xE1rva',
+            DB_ERROR_ALREADY_EXISTS     => 'már létezik',
+            DB_ERROR_CANNOT_CREATE      => 'nem sikerült létrehozni',
+            DB_ERROR_CANNOT_DELETE      => 'nem sikerült törölni',
+            DB_ERROR_CANNOT_DROP        => 'nem sikerült eldobni',
+            DB_ERROR_CONSTRAINT         => 'szabályok megszegése',
+            DB_ERROR_DIVZERO            => 'osztás nullával',
+            DB_ERROR_INVALID            => 'érvénytelen',
+            DB_ERROR_INVALID_DATE       => 'érvénytelen dátum vagy idő',
+            DB_ERROR_INVALID_NUMBER     => 'érvénytelen szám',
+            DB_ERROR_MISMATCH           => 'nem megfelelő',
+            DB_ERROR_NODBSELECTED       => 'nincs kiválasztott adatbázis',
+            DB_ERROR_NOSUCHFIELD        => 'nincs ilyen mező',
+            DB_ERROR_NOSUCHTABLE        => 'nincs ilyen tábla',
+            DB_ERROR_NOT_CAPABLE        => 'DB backend nem támogatja',
+            DB_ERROR_NOT_FOUND          => 'nem található',
+            DB_ERROR_NOT_LOCKED         => 'nincs lezárva',
             DB_ERROR_SYNTAX             => 'szintaktikai hiba',
-            DB_ERROR_UNSUPPORTED        => 'nem t\xE1mogatott',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron v\xE9gzett \xE9rt\xE9k sz\xE1ml\xE1l\xE1s',
-            DB_ERROR_INVALID_DSN        => 'hib\xE1s DSN',
-            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakoz\xE1s',
+            DB_ERROR_UNSUPPORTED        => 'nem támogatott',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'soron végzett érték számlálás',
+            DB_ERROR_INVALID_DSN        => 'hibás DSN',
+            DB_ERROR_CONNECT_FAILED     => 'sikertelen csatlakozás',
             0	                       => 'nincs hiba', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 't\xFAl kev\xE9s az adat',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'b\xF5v\xEDtm\xE9ny nem tal\xE1lhat\xF3',
-            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatb\xE1zis',
-            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosults\xE1g'
+            DB_ERROR_NEED_MORE_DATA     => 'túl kevés az adat',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'bővítmény nem található',
+            DB_ERROR_NOSUCHDB           => 'nincs ilyen adatbázis',
+            DB_ERROR_ACCESS_VIOLATION   => 'nincs jogosultság'
 );

Modified: trunk/lib/WikiDB/adodb/lang/adodb-it.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-it.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-it.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -4,7 +4,7 @@
 $ADODB_LANG_ARRAY = array (
             'LANG'                      => 'it',
             DB_ERROR                    => 'errore sconosciuto',
-            DB_ERROR_ALREADY_EXISTS     => 'esiste gi&agrave;',
+            DB_ERROR_ALREADY_EXISTS     => 'esiste già',
             DB_ERROR_CANNOT_CREATE      => 'non posso creare',
             DB_ERROR_CANNOT_DELETE      => 'non posso cancellare',
             DB_ERROR_CANNOT_DROP        => 'non posso eliminare',

Modified: trunk/lib/WikiDB/adodb/lang/adodb-pl.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-pl.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-pl.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -4,30 +4,30 @@
 
 $ADODB_LANG_ARRAY = array (
 			'LANG'                      => 'pl',
-            DB_ERROR                    => 'niezidentyfikowany b\xB3\xB1d',
-            DB_ERROR_ALREADY_EXISTS     => 'ju\xBF istniej\xB1',
-            DB_ERROR_CANNOT_CREATE      => 'nie mo\xBFna stworzy\xE6',
-            DB_ERROR_CANNOT_DELETE      => 'nie mo\xBFna usun\xB1\xE6',
-            DB_ERROR_CANNOT_DROP        => 'nie mo\xBFna porzuci\xE6',
-            DB_ERROR_CONSTRAINT         => 'pogwa\xB3cenie uprawnie\xF1',
+            DB_ERROR                    => 'niezidentyfikowany błąd',
+            DB_ERROR_ALREADY_EXISTS     => 'już istnieją',
+            DB_ERROR_CANNOT_CREATE      => 'nie można stworzyć',
+            DB_ERROR_CANNOT_DELETE      => 'nie można usunąć',
+            DB_ERROR_CANNOT_DROP        => 'nie można porzucić',
+            DB_ERROR_CONSTRAINT         => 'pogwałcenie uprawnień',
             DB_ERROR_DIVZERO            => 'dzielenie przez zero',
-            DB_ERROR_INVALID            => 'b\xB3\xEAdny',
-            DB_ERROR_INVALID_DATE       => 'b\xB3\xEAdna godzina lub data',
-            DB_ERROR_INVALID_NUMBER     => 'b\xB3\xEAdny numer',
+            DB_ERROR_INVALID            => 'błędny',
+            DB_ERROR_INVALID_DATE       => 'błędna godzina lub data',
+            DB_ERROR_INVALID_NUMBER     => 'błędny numer',
             DB_ERROR_MISMATCH           => 'niedopasowanie',
-            DB_ERROR_NODBSELECTED       => 'baza danych nie zosta\xB3a wybrana',
+            DB_ERROR_NODBSELECTED       => 'baza danych nie została wybrana',
             DB_ERROR_NOSUCHFIELD        => 'nie znaleziono pola',
             DB_ERROR_NOSUCHTABLE        => 'nie znaleziono tabeli',
             DB_ERROR_NOT_CAPABLE        => 'nie zdolny',
             DB_ERROR_NOT_FOUND          => 'nie znaleziono',
-            DB_ERROR_NOT_LOCKED         => 'nie zakmni\xEAty',
-            DB_ERROR_SYNTAX             => 'b\xB3\xB1d sk\xB3adni',
-            DB_ERROR_UNSUPPORTED        => 'nie obs\xB3uguje',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'warto\xB6\xE6 liczona w szeregu',
-            DB_ERROR_INVALID_DSN        => 'b\xB3\xEAdny DSN',
-            DB_ERROR_CONNECT_FAILED     => 'po\xB3\xB1czenie nie zosta\xB3o zrealizowane',
-            0	                       => 'brak b\xB3\xEAd\xF3w', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilo\xB6\xE6 informacji',
+            DB_ERROR_NOT_LOCKED         => 'nie zakmnięty',
+            DB_ERROR_SYNTAX             => 'błąd składni',
+            DB_ERROR_UNSUPPORTED        => 'nie obsługuje',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'wartość liczona w szeregu',
+            DB_ERROR_INVALID_DSN        => 'błędny DSN',
+            DB_ERROR_CONNECT_FAILED     => 'połączenie nie zostało zrealizowane',
+            0	                       => 'brak błędów', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'niedostateczna ilość informacji',
             DB_ERROR_EXTENSION_NOT_FOUND=> 'nie znaleziono rozszerzenia',
             DB_ERROR_NOSUCHDB           => 'nie znaleziono bazy',
             DB_ERROR_ACCESS_VIOLATION   => 'niedostateczne uprawnienia'

Copied: trunk/lib/WikiDB/adodb/lang/adodb-ru.inc.php (from rev 9048, trunk/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php)
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-ru.inc.php	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/lang/adodb-ru.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -0,0 +1,34 @@
+<?php
+
+// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
+
+$ADODB_LANG_ARRAY = array (
+             'LANG'                      => 'ru',
+            DB_ERROR                    => 'неизвестная ошибка',
+            DB_ERROR_ALREADY_EXISTS     => 'уже существует',
+            DB_ERROR_CANNOT_CREATE      => 'невозможно создать',
+            DB_ERROR_CANNOT_DELETE      => 'невозможно удалить',
+            DB_ERROR_CANNOT_DROP        => 'невозможно удалить (drop)',
+            DB_ERROR_CONSTRAINT         => 'нарушение условий проверки',
+            DB_ERROR_DIVZERO            => 'деление на 0',
+            DB_ERROR_INVALID            => 'неправильно',
+            DB_ERROR_INVALID_DATE       => 'некорректная дата или время',
+            DB_ERROR_INVALID_NUMBER     => 'некорректное число',
+            DB_ERROR_MISMATCH           => 'ошибка',
+            DB_ERROR_NODBSELECTED       => 'БД не выбрана',
+            DB_ERROR_NOSUCHFIELD        => 'не существует поле',
+            DB_ERROR_NOSUCHTABLE        => 'не существует таблица',
+            DB_ERROR_NOT_CAPABLE        => 'СУБД не в состоянии',
+            DB_ERROR_NOT_FOUND          => 'не найдено',
+            DB_ERROR_NOT_LOCKED         => 'не заблокировано',
+            DB_ERROR_SYNTAX             => 'синтаксическая ошибка',
+            DB_ERROR_UNSUPPORTED        => 'не поддерживается',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'счетчик значений в строке',
+            DB_ERROR_INVALID_DSN        => 'неправильная DSN',
+            DB_ERROR_CONNECT_FAILED     => 'соединение неуспешно',
+            0                               => 'нет ошибки', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'предоставлено недостаточно данных',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'расширение не найдено',
+            DB_ERROR_NOSUCHDB           => 'не существует БД',
+            DB_ERROR_ACCESS_VIOLATION   => 'недостаточно прав доступа'
+);

Deleted: trunk/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-ru1251.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,34 +0,0 @@
-<?php
-
-// Russian language file contributed by "Cyrill Malevanov" cyrill#malevanov.spb.ru.
-
-$ADODB_LANG_ARRAY = array (
-             'LANG'                      => 'ru1251',
-            DB_ERROR                    => '\xED\xE5\xE8\xE7\xE2\xE5\xF1\xF2\xED\xE0\xFF \xEE\xF8\xE8\xE1\xEA\xE0',
-            DB_ERROR_ALREADY_EXISTS     => '\xF3\xE6\xE5 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2',
-            DB_ERROR_CANNOT_CREATE      => '\xED\xE5\xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE \xF1\xEE\xE7\xE4\xE0\xF2\xFC',
-            DB_ERROR_CANNOT_DELETE      => '\xED\xE5\xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE \xF3\xE4\xE0\xEB\xE8\xF2\xFC',
-            DB_ERROR_CANNOT_DROP        => '\xED\xE5\xE2\xEE\xE7\xEC\xEE\xE6\xED\xEE \xF3\xE4\xE0\xEB\xE8\xF2\xFC (drop)',
-            DB_ERROR_CONSTRAINT         => '\xED\xE0\xF0\xF3\xF8\xE5\xED\xE8\xE5 \xF3\xF1\xEB\xEE\xE2\xE8\xE9 \xEF\xF0\xEE\xE2\xE5\xF0\xEA\xE8',
-            DB_ERROR_DIVZERO            => '\xE4\xE5\xEB\xE5\xED\xE8\xE5 \xED\xE0 0',
-            DB_ERROR_INVALID            => '\xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xEE',
-            DB_ERROR_INVALID_DATE       => '\xED\xE5\xEA\xEE\xF0\xF0\xE5\xEA\xF2\xED\xE0\xFF \xE4\xE0\xF2\xE0 \xE8\xEB\xE8 \xE2\xF0\xE5\xEC\xFF',
-            DB_ERROR_INVALID_NUMBER     => '\xED\xE5\xEA\xEE\xF0\xF0\xE5\xEA\xF2\xED\xEE\xE5 \xF7\xE8\xF1\xEB\xEE',
-            DB_ERROR_MISMATCH           => '\xEE\xF8\xE8\xE1\xEA\xE0',
-            DB_ERROR_NODBSELECTED       => '\xC1\xC4 \xED\xE5 \xE2\xFB\xE1\xF0\xE0\xED\xE0',
-            DB_ERROR_NOSUCHFIELD        => '\xED\xE5 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2 \xEF\xEE\xEB\xE5',
-            DB_ERROR_NOSUCHTABLE        => '\xED\xE5 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2 \xF2\xE0\xE1\xEB\xE8\xF6\xE0',
-            DB_ERROR_NOT_CAPABLE        => '\xD1\xD3\xC1\xC4 \xED\xE5 \xE2 \xF1\xEE\xF1\xF2\xEE\xFF\xED\xE8\xE8',
-            DB_ERROR_NOT_FOUND          => '\xED\xE5 \xED\xE0\xE9\xE4\xE5\xED\xEE',
-            DB_ERROR_NOT_LOCKED         => '\xED\xE5 \xE7\xE0\xE1\xEB\xEE\xEA\xE8\xF0\xEE\xE2\xE0\xED\xEE',
-            DB_ERROR_SYNTAX             => '\xF1\xE8\xED\xF2\xE0\xEA\xF1\xE8\xF7\xE5\xF1\xEA\xE0\xFF \xEE\xF8\xE8\xE1\xEA\xE0',
-            DB_ERROR_UNSUPPORTED        => '\xED\xE5 \xEF\xEE\xE4\xE4\xE5\xF0\xE6\xE8\xE2\xE0\xE5\xF2\xF1\xFF',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '\xF1\xF7\xE5\xF2\xF7\xE8\xEA \xE7\xED\xE0\xF7\xE5\xED\xE8\xE9 \xE2 \xF1\xF2\xF0\xEE\xEA\xE5',
-            DB_ERROR_INVALID_DSN        => '\xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xE0\xFF DSN',
-            DB_ERROR_CONNECT_FAILED     => '\xF1\xEE\xE5\xE4\xE8\xED\xE5\xED\xE8\xE5 \xED\xE5\xF3\xF1\xEF\xE5\xF8\xED\xEE',
-            0                               => '\xED\xE5\xF2 \xEE\xF8\xE8\xE1\xEA\xE8', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '\xEF\xF0\xE5\xE4\xEE\xF1\xF2\xE0\xE2\xEB\xE5\xED\xEE \xED\xE5\xE4\xEE\xF1\xF2\xE0\xF2\xEE\xF7\xED\xEE \xE4\xE0\xED\xED\xFB\xF5',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '\xF0\xE0\xF1\xF8\xE8\xF0\xE5\xED\xE8\xE5 \xED\xE5 \xED\xE0\xE9\xE4\xE5\xED\xEE',
-            DB_ERROR_NOSUCHDB           => '\xED\xE5 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2 \xC1\xC4',
-            DB_ERROR_ACCESS_VIOLATION   => '\xED\xE5\xE4\xEE\xF1\xF2\xE0\xF2\xEE\xF7\xED\xEE \xEF\xF0\xE0\xE2 \xE4\xEE\xF1\xF2\xF3\xEF\xE0'
-);

Copied: trunk/lib/WikiDB/adodb/lang/adodb-th.inc.php (from rev 9048, trunk/lib/WikiDB/adodb/lang/adodb_th.inc.php)
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-th.inc.php	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/lang/adodb-th.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -0,0 +1,32 @@
+<?php
+// by Trirat Petchsingh <rosskouk#gmail.com>
+$ADODB_LANG_ARRAY = array (
+			'LANG'						=> 'th',
+			DB_ERROR					=> 'error ไม่รู้สาเหตุ',
+			DB_ERROR_ALREADY_EXISTS		=> 'มี�?ล้ว',
+			DB_ERROR_CANNOT_CREATE		=> 'สร้างไม่ได้',
+			DB_ERROR_CANNOT_DELETE		=> 'ลบไม่ได้',
+			DB_ERROR_CANNOT_DROP		=> 'drop ไม่ได้',
+			DB_ERROR_CONSTRAINT			=> 'constraint violation',
+			DB_ERROR_DIVZERO			=> 'หา�?ด้วยสู�?',
+			DB_ERROR_INVALID			=> 'ไม่ valid',
+			DB_ERROR_INVALID_DATE		=> 'วันที่ เวลา ไม่ valid',
+			DB_ERROR_INVALID_NUMBER		=> 'เลขไม่ valid',
+			DB_ERROR_MISMATCH			=> 'mismatch',
+			DB_ERROR_NODBSELECTED		=> 'ไม่ได้เลือ�?�?านข้อมูล',
+			DB_ERROR_NOSUCHFIELD		=> 'ไม่มีฟีลด์นี้',
+			DB_ERROR_NOSUCHTABLE		=> 'ไม่มีตารางนี้',
+			DB_ERROR_NOT_CAPABLE		=> 'DB backend not capable',
+			DB_ERROR_NOT_FOUND			=> 'ไม่พบ',
+			DB_ERROR_NOT_LOCKED			=> 'ไม่ได้ล๊อ�?',
+			DB_ERROR_SYNTAX				=> 'ผิด syntax',
+			DB_ERROR_UNSUPPORTED		=> 'ไม่ support',
+			DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+			DB_ERROR_INVALID_DSN		=> 'invalid DSN',
+			DB_ERROR_CONNECT_FAILED		=> 'ไม่สามารถ connect',
+			0							=> 'no error',
+			DB_ERROR_NEED_MORE_DATA		=> 'ข้อมูลไม่เพียงพอ',
+			DB_ERROR_EXTENSION_NOT_FOUND=> 'ไม่พบ extension',
+			DB_ERROR_NOSUCHDB			=> 'ไม่มีข้อมูลนี้',
+			DB_ERROR_ACCESS_VIOLATION	=> 'permissions ไม่พอ'
+);

Copied: trunk/lib/WikiDB/adodb/lang/adodb-uk.inc.php (from rev 9048, trunk/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php)
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-uk.inc.php	                        (rev 0)
+++ trunk/lib/WikiDB/adodb/lang/adodb-uk.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -0,0 +1,34 @@
+<?php
+
+// Ukrainian language file contributed by  Alex Rootoff rootoff{AT}pisem.net.
+
+$ADODB_LANG_ARRAY = array (
+             'LANG'                      => 'uk',
+            DB_ERROR                    => 'невідома помилка',
+            DB_ERROR_ALREADY_EXISTS     => 'вже існує',
+            DB_ERROR_CANNOT_CREATE      => 'неможливо створити',
+            DB_ERROR_CANNOT_DELETE      => 'неможливо видалити',
+            DB_ERROR_CANNOT_DROP        => 'неможливо знищити (drop)',
+            DB_ERROR_CONSTRAINT         => 'порушення умов перевірки',
+            DB_ERROR_DIVZERO            => 'ділення на 0',
+            DB_ERROR_INVALID            => 'неправильно',
+            DB_ERROR_INVALID_DATE       => 'неправильна дата чи час',
+            DB_ERROR_INVALID_NUMBER     => 'неправильне число',
+            DB_ERROR_MISMATCH           => 'помилка',
+            DB_ERROR_NODBSELECTED       => 'не вибрано БД',
+            DB_ERROR_NOSUCHFIELD        => 'не існує поле',
+            DB_ERROR_NOSUCHTABLE        => 'не існує таблиця',
+            DB_ERROR_NOT_CAPABLE        => 'СУБД не в стані',
+            DB_ERROR_NOT_FOUND          => 'не знайдено',
+            DB_ERROR_NOT_LOCKED         => 'не заблоковано',
+            DB_ERROR_SYNTAX             => 'синтаксична помилка',
+            DB_ERROR_UNSUPPORTED        => 'не підтримується',
+            DB_ERROR_VALUE_COUNT_ON_ROW => 'рахівник значень в стрічці',
+            DB_ERROR_INVALID_DSN        => 'неправильна DSN',
+            DB_ERROR_CONNECT_FAILED     => 'з\'єднання неуспішне',
+            0                               => 'все гаразд', // DB_OK
+            DB_ERROR_NEED_MORE_DATA     => 'надано недостатньо даних',
+            DB_ERROR_EXTENSION_NOT_FOUND=> 'розширення не знайдено',
+            DB_ERROR_NOSUCHDB           => 'не існує БД',
+            DB_ERROR_ACCESS_VIOLATION   => 'недостатньо прав доступа'
+);

Deleted: trunk/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb-uk1251.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,34 +0,0 @@
-<?php
-
-// Ukrainian language file contributed by  Alex Rootoff rootoff{AT}pisem.net.
-
-$ADODB_LANG_ARRAY = array (
-             'LANG'                      => 'uk1251',
-            DB_ERROR                    => '\xED\xE5\xE2\xB3\xE4\xEE\xEC\xE0 \xEF\xEE\xEC\xE8\xEB\xEA\xE0',
-            DB_ERROR_ALREADY_EXISTS     => '\xE2\xE6\xE5 \xB3\xF1\xED\xF3\xBA',
-            DB_ERROR_CANNOT_CREATE      => '\xED\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xF1\xF2\xE2\xEE\xF0\xE8\xF2\xE8',
-            DB_ERROR_CANNOT_DELETE      => '\xED\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE2\xE8\xE4\xE0\xEB\xE8\xF2\xE8',
-            DB_ERROR_CANNOT_DROP        => '\xED\xE5\xEC\xEE\xE6\xEB\xE8\xE2\xEE \xE7\xED\xE8\xF9\xE8\xF2\xE8 (drop)',
-            DB_ERROR_CONSTRAINT         => '\xEF\xEE\xF0\xF3\xF8\xE5\xED\xED\xFF \xF3\xEC\xEE\xE2 \xEF\xE5\xF0\xE5\xE2\xB3\xF0\xEA\xE8',
-            DB_ERROR_DIVZERO            => '\xE4\xB3\xEB\xE5\xED\xED\xFF \xED\xE0 0',
-            DB_ERROR_INVALID            => '\xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xEE',
-            DB_ERROR_INVALID_DATE       => '\xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xE0 \xE4\xE0\xF2\xE0 \xF7\xE8 \xF7\xE0\xF1',
-            DB_ERROR_INVALID_NUMBER     => '\xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xE5 \xF7\xE8\xF1\xEB\xEE',
-            DB_ERROR_MISMATCH           => '\xEF\xEE\xEC\xE8\xEB\xEA\xE0',
-            DB_ERROR_NODBSELECTED       => '\xED\xE5 \xE2\xE8\xE1\xF0\xE0\xED\xEE \xC1\xC4',
-            DB_ERROR_NOSUCHFIELD        => '\xED\xE5 \xB3\xF1\xED\xF3\xBA \xEF\xEE\xEB\xE5',
-            DB_ERROR_NOSUCHTABLE        => '\xED\xE5 \xB3\xF1\xED\xF3\xBA \xF2\xE0\xE1\xEB\xE8\xF6\xFF',
-            DB_ERROR_NOT_CAPABLE        => '\xD1\xD3\xC1\xC4 \xED\xE5 \xE2 \xF1\xF2\xE0\xED\xB3',
-            DB_ERROR_NOT_FOUND          => '\xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xEE',
-            DB_ERROR_NOT_LOCKED         => '\xED\xE5 \xE7\xE0\xE1\xEB\xEE\xEA\xEE\xE2\xE0\xED\xEE',
-            DB_ERROR_SYNTAX             => '\xF1\xE8\xED\xF2\xE0\xEA\xF1\xE8\xF7\xED\xE0 \xEF\xEE\xEC\xE8\xEB\xEA\xE0',
-            DB_ERROR_UNSUPPORTED        => '\xED\xE5 \xEF\xB3\xE4\xF2\xF0\xE8\xEC\xF3\xBA\xF2\xFC\xF1\xFF',
-            DB_ERROR_VALUE_COUNT_ON_ROW => '\xF0\xE0\xF5\xB3\xE2\xED\xE8\xEA \xE7\xED\xE0\xF7\xE5\xED\xFC \xE2 \xF1\xF2\xF0\xB3\xF7\xF6\xB3',
-            DB_ERROR_INVALID_DSN        => '\xED\xE5\xEF\xF0\xE0\xE2\xE8\xEB\xFC\xED\xE0 DSN',
-            DB_ERROR_CONNECT_FAILED     => '\xE7\'\xBA\xE4\xED\xE0\xED\xED\xFF \xED\xE5\xF3\xF1\xEF\xB3\xF8\xED\xE5',
-            0                               => '\xE2\xF1\xE5 \xE3\xE0\xF0\xE0\xE7\xE4', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => '\xED\xE0\xE4\xE0\xED\xEE \xED\xE5\xE4\xEE\xF1\xF2\xE0\xF2\xED\xFC\xEE \xE4\xE0\xED\xE8\xF5',
-            DB_ERROR_EXTENSION_NOT_FOUND=> '\xF0\xEE\xE7\xF8\xE8\xF0\xE5\xED\xED\xFF \xED\xE5 \xE7\xED\xE0\xE9\xE4\xE5\xED\xEE',
-            DB_ERROR_NOSUCHDB           => '\xED\xE5 \xB3\xF1\xED\xF3\xBA \xC1\xC4',
-            DB_ERROR_ACCESS_VIOLATION   => '\xED\xE5\xE4\xEE\xF1\xF2\xE0\xF2\xED\xFC\xEE \xEF\xF0\xE0\xE2 \xE4\xEE\xF1\xF2\xF3\xEF\xE0'
-);

Deleted: trunk/lib/WikiDB/adodb/lang/adodb_th.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/lang/adodb_th.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
+++ trunk/lib/WikiDB/adodb/lang/adodb_th.inc.php	2014-08-26 12:09:05 UTC (rev 9049)
@@ -1,32 +0,0 @@
-<?php
-// by Trirat Petchsingh <rosskouk#gmail.com>
-$ADODB_LANG_ARRAY = array (
-			'LANG'                      => 'th',
-            DB_ERROR                    => 'error ไม่รู้สาเหตุ',
-            DB_ERROR_ALREADY_EXISTS     => 'มี\xE0\xB9?ล้ว',
-            DB_ERROR_CANNOT_CREATE      => 'สร้างไม่ได้',
-            DB_ERROR_CANNOT_DELETE      => 'ลบไม่ได้',
-            DB_ERROR_CANNOT_DROP        => 'drop ไม่ได้',
-            DB_ERROR_CONSTRAINT         => 'constraint violation',
-            DB_ERROR_DIVZERO            => 'หา\xE0\xB8?ด้วยสู\xE0\xB8?',
-            DB_ERROR_INVALID            => 'ไม่ valid',
-            DB_ERROR_INVALID_DATE       => 'วันที่ เวลา ไม่ valid',
-            DB_ERROR_INVALID_NUMBER     => 'เลขไม่ valid',
-            DB_ERROR_MISMATCH           => 'mismatch',
-            DB_ERROR_NODBSELECTED       => 'ไม่ได้เลือ\xE0\xB8?\xE0\xB8?านข้อมูล',
-            DB_ERROR_NOSUCHFIELD        => 'ไม่มีฟีลด์นี้',
-            DB_ERROR_NOSUCHTABLE        => 'ไม่มีตารางนี้',
-            DB_ERROR_NOT_CAPABLE        => 'DB backend not capable',
-            DB_ERROR_NOT_FOUND          => 'ไม่พบ',
-            DB_ERROR_NOT_LOCKED         => 'ไม่ได้ล๊อ\xE0\xB8?',
-            DB_ERROR_SYNTAX             => 'ผิด syntax',
-            DB_ERROR_UNSUPPORTED        => 'ไม่ support',
-            DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
-            DB_ERROR_INVALID_DSN        => 'invalid DSN',
-            DB_ERROR_CONNECT_FAILED     => 'ไม่สามารถ connect',
-            0	                        => 'no error', // DB_OK
-            DB_ERROR_NEED_MORE_DATA     => 'ข้อมูลไม่เพียงพอ',
-            DB_ERROR_EXTENSION_NOT_FOUND=> 'ไม่พบ extension',
-            DB_ERROR_NOSUCHDB           => 'ไม่มีข้อมูลนี้',
-            DB_ERROR_ACCESS_VIOLATION   => 'permissions ไม่พอ'
-);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9048] trunk/lib/WikiDB/adodb

[<var...@us...>]

Revision: 9048
          http://sourceforge.net/p/phpwiki/code/9048
Author:   vargenau
Date:     2014-08-25 13:35:28 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
Update adodb

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
    trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
    trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
    trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
    trunk/lib/WikiDB/adodb/adodb-error.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
    trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
    trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
    trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
    trunk/lib/WikiDB/adodb/adodb-lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
    trunk/lib/WikiDB/adodb/adodb-pager.inc.php
    trunk/lib/WikiDB/adodb/adodb-pear.inc.php
    trunk/lib/WikiDB/adodb/adodb-perf.inc.php
    trunk/lib/WikiDB/adodb/adodb-php4.inc.php
    trunk/lib/WikiDB/adodb/adodb-time.inc.php
    trunk/lib/WikiDB/adodb/adodb.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
    trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
    trunk/lib/WikiDB/adodb/docs/docs-adodb.htm
    trunk/lib/WikiDB/adodb/docs/docs-datadict.htm
    trunk/lib/WikiDB/adodb/docs/docs-perf.htm
    trunk/lib/WikiDB/adodb/docs/docs-session.htm
    trunk/lib/WikiDB/adodb/docs/docs-session.old.htm
    trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-ca.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-pt-br.inc.php
    trunk/lib/WikiDB/adodb/lang/adodb-sv.inc.php
    trunk/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php
    trunk/lib/WikiDB/adodb/perf/perf-db2.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-informix.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-mysql.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-oci8.inc.php
    trunk/lib/WikiDB/adodb/perf/perf-postgres.inc.php
    trunk/lib/WikiDB/adodb/pivottable.inc.php
    trunk/lib/WikiDB/adodb/rsfilter.inc.php
    trunk/lib/WikiDB/adodb/server.php
    trunk/lib/WikiDB/adodb/session/adodb-compress-bzip2.php
    trunk/lib/WikiDB/adodb/session/adodb-compress-gzip.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/adodb-cryptsession2.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-md5.php
    trunk/lib/WikiDB/adodb/session/adodb-encrypt-secret.php
    trunk/lib/WikiDB/adodb/session/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/adodb-session-clob2.php
    trunk/lib/WikiDB/adodb/session/adodb-session.php
    trunk/lib/WikiDB/adodb/session/adodb-session2.php
    trunk/lib/WikiDB/adodb/session/old/adodb-cryptsession.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session-clob.php
    trunk/lib/WikiDB/adodb/session/old/adodb-session.php
    trunk/lib/WikiDB/adodb/tests/benchmark.php
    trunk/lib/WikiDB/adodb/tests/client.php
    trunk/lib/WikiDB/adodb/tests/test-datadict.php
    trunk/lib/WikiDB/adodb/tests/test-php5.php
    trunk/lib/WikiDB/adodb/tests/test.php
    trunk/lib/WikiDB/adodb/tests/test3.php
    trunk/lib/WikiDB/adodb/tests/test4.php
    trunk/lib/WikiDB/adodb/tests/test5.php
    trunk/lib/WikiDB/adodb/tests/testcache.php
    trunk/lib/WikiDB/adodb/tests/testdatabases.inc.php
    trunk/lib/WikiDB/adodb/tests/testmssql.php
    trunk/lib/WikiDB/adodb/tests/testoci8.php
    trunk/lib/WikiDB/adodb/tests/testoci8cursor.php
    trunk/lib/WikiDB/adodb/tests/testpaging.php
    trunk/lib/WikiDB/adodb/tests/testpear.php
    trunk/lib/WikiDB/adodb/tests/testsessions.php
    trunk/lib/WikiDB/adodb/toexport.inc.php
    trunk/lib/WikiDB/adodb/tohtml.inc.php

Added Paths:
-----------
    trunk/lib/WikiDB/adodb/drivers/adodb-text.inc.php

Modified: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 /*
 
-@version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+@version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
 
   Released under both BSD license and Lesser GPL library license.

Modified: trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 /*
 
-@version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+@version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Latest version is available at http://adodb.sourceforge.net
 
   Released under both BSD license and Lesser GPL library license.

Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -8,7 +8,7 @@
 
 /*
 
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: trunk/lib/WikiDB/adodb/adodb-datadict.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-datadict.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-datadict.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-error.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-error.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.
@@ -29,9 +29,9 @@
 	{
 		switch($fn) {
 		case 'EXECUTE':
-			$this->sql = $p1;
+			$this->sql = is_array($p1) ? $p1[0] : $p1;
 			$this->params = $p2;
-			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$p1\")\n";
+			$s = "$dbms error: [$errno: $errmsg] in $fn(\"$this->sql\")\n";
 			break;
 
 		case 'PCONNECT':

Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -6,7 +6,7 @@
 $ADODB_INCLUDED_LIB = 1;
 
 /*
-  @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.
@@ -543,7 +543,7 @@
 	return $rsreturn;
 }
 
-// Iv\xE1n Oliva version
+// Iván Oliva version
 function _adodb_pageexecute_no_last_page(&$zthis, $sql, $nrows, $page, $inputarr=false, $secs2cache=0)
 {
 

Modified: trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -7,11 +7,11 @@
 $ADODB_INCLUDED_MEMCACHE = 1;
 
 global $ADODB_INCLUDED_CSV;
-if (empty($ADODB_INCLUDED_CSV)) include(ADODB_DIR.'/adodb-csvlib.inc.php');
+if (empty($ADODB_INCLUDED_CSV)) include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
 
 /*
 
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: trunk/lib/WikiDB/adodb/adodb-pager.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pager.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-pager.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /*
-	V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+	V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
 	  Released under both BSD license and Lesser GPL library license.
 	  Whenever there is any discrepancy between the two licenses,
 	  the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ * @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
  * Released under both BSD license and Lesser GPL library license.
  * Whenever there is any discrepancy between the two licenses,
  * the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-perf.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-perf.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-perf.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /*
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb-time.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb-time.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
 ADOdb Date Library, part of the ADOdb abstraction library
 Download: http://phplens.com/phpeverywhere/
 

Modified: trunk/lib/WikiDB/adodb/adodb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/adodb.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/adodb.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -14,7 +14,7 @@
 /**
 	\mainpage
 
-	 @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+	 @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
 
 	Released under both BSD license and Lesser GPL library license. You can choose which license
 	you prefer.
@@ -179,7 +179,7 @@
 		/**
 		 * ADODB version as a string.
 		 */
-		$ADODB_vers = 'V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
+		$ADODB_vers = 'V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved. Released BSD & LGPL.';
 
 		/**
 		 * Determines whether recordset->RecordCount() is used.
@@ -294,8 +294,8 @@
 
 			if (strlen($ADODB_CACHE_DIR) > 1) {
 				$rez = $this->_dirFlush($ADODB_CACHE_DIR);
-	         	if ($debug) ADOConnection::outp( "flushall: $dir<br><pre>\n". $rez."</pre>");
-	   		}
+				if ($debug) ADOConnection::outp( "flushall: $ADODB_CACHE_DIR<br><pre>\n". $rez."</pre>");
+			}
 			return $rez;
 		}
 
@@ -461,7 +461,7 @@
 	{
 	global $ADODB_vers;
 
-		$ok = preg_match( '/^[Vv]?([0-9]\.[0-9]+(dev|[a-z]))?/', $ADODB_vers, $matches );
+		$ok = preg_match( '/^[Vv]?([0-9]\.[0-9]+(dev|[a-z])?)/', $ADODB_vers, $matches );
 		if (!$ok) return (float) substr($ADODB_vers,1);
 		else return $matches[1];
 	}
@@ -1899,38 +1899,37 @@
 
 		$forceUpdate means that even if the data has not changed, perform update.
 	 */
-	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = FALSE, $forceUpdate=true, $magicq=false)
+	function AutoExecute($table, $fields_values, $mode = 'INSERT', $where = false, $forceUpdate = true, $magicq = false)
 	{
-		$false = false;
-		$sql = 'SELECT * FROM '.$table;
-		if ($where!==FALSE) $sql .= ' WHERE '.$where;
-		else if ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) {
-			$this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause','AutoExecute');
-			return $false;
+		if ($where === false && ($mode == 'UPDATE' || $mode == 2 /* DB_AUTOQUERY_UPDATE */) ) {
+			$this->outp_throw('AutoExecute: Illegal mode=UPDATE with empty WHERE clause', 'AutoExecute');
+			return false;
 		}
 
-		$rs = $this->SelectLimit($sql,1);
-		if (!$rs) return $false; // table does not exist
+		$sql = "SELECT * FROM $table";
+		$rs = $this->SelectLimit($sql, 1);
+		if (!$rs) return false; // table does not exist
+
 		$rs->tableName = $table;
+		if ($where !== false) {
+			$sql .= " WHERE $where";
+		}
 		$rs->sql = $sql;
 
-		switch((string) $mode) {
-		case 'UPDATE':
-		case '2':
-			$sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq);
-			break;
-		case 'INSERT':
-		case '1':
-			$sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
-			break;
-		default:
-			$this->outp_throw("AutoExecute: Unknown mode=$mode",'AutoExecute');
-			return $false;
+		switch($mode) {
+			case 'UPDATE':
+			case DB_AUTOQUERY_UPDATE:
+				$sql = $this->GetUpdateSQL($rs, $fields_values, $forceUpdate, $magicq);
+				break;
+			case 'INSERT':
+			case DB_AUTOQUERY_INSERT:
+				$sql = $this->GetInsertSQL($rs, $fields_values, $magicq);
+				break;
+			default:
+				$this->outp_throw("AutoExecute: Unknown mode=$mode", 'AutoExecute');
+				return false;
 		}
-		$ret = false;
-		if ($sql) $ret = $this->Execute($sql);
-		if ($ret) $ret = true;
-		return $ret;
+		return $sql && $this->Execute($sql);
 	}
 
 
@@ -2716,7 +2715,7 @@
 	/**
 	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
 	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
-	* and/or last one of the recordset. Added by Iv\xE1n Oliva to provide recordset pagination.
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
 	* See docs-adodb.htm#ex8 for an example of usage.
 	*
@@ -2743,7 +2742,7 @@
 	/**
 	* Will select the supplied $page number from a recordset, given that it is paginated in pages of
 	* $nrows rows per page. It also saves two boolean values saying if the given page is the first
-	* and/or last one of the recordset. Added by Iv\xE1n Oliva to provide recordset pagination.
+	* and/or last one of the recordset. Added by Iván Oliva to provide recordset pagination.
 	*
 	* @param secs2cache	seconds to cache data, set to 0 to force query
 	* @param sql
@@ -2943,9 +2942,9 @@
 	var $_obj; 				/** Used by FetchObj */
 	var $_names;			/** Used by FetchObj */
 
-	var $_currentPage = -1;	/** Added by Iv\xE1n Oliva to implement recordset pagination */
-	var $_atFirstPage = false;	/** Added by Iv\xE1n Oliva to implement recordset pagination */
-	var $_atLastPage = false;	/** Added by Iv\xE1n Oliva to implement recordset pagination */
+	var $_currentPage = -1;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atFirstPage = false;	/** Added by Iván Oliva to implement recordset pagination */
+	var $_atLastPage = false;	/** Added by Iván Oliva to implement recordset pagination */
 	var $_lastPageNo = -1;
 	var $_maxRecordCount = 0;
 	var $datetime = false;

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
@@ -24,7 +24,7 @@
 	var $typeX = 'VARCHAR(4000)';
 	var $typeXL = 'CLOB';
 
-	function MetaType($t,$len=-1)
+	function MetaType($t, $len=-1, $fieldobj=false)
 	{
 		if (is_object($t)) {
 			$fieldobj = $t;
@@ -128,7 +128,7 @@
 		return $sql;
 	}
 
-	function AlterColumnSQL($tabname, $flds)
+	function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		$f = array();
 		list($lines,$pkey) = $this->_GenFields($flds);
@@ -141,7 +141,7 @@
 		return $sql;
 	}
 
-	function DropColumnSQL($tabname, $flds)
+	function DropColumnSQL($tabname, $flds, $tableflds='', $tableoptions='')
 	{
 		if (!is_array($flds)) $flds = explode(',',$flds);
 		foreach ($flds as $k => $v) $flds[$k] = $this->NameQuote($v);

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/docs/docs-adodb.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-adodb.htm	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-adodb.htm	2014-08-25 13:35:28 UTC (rev 9048)
@@ -620,7 +620,7 @@
 
 <h2>ADOdb Library for PHP</h2>
 
-<p>V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
+<p>V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
 
 <p><span style='font-size:7.5pt'>This software is dual licensed using BSD-Style
 and LGPL. This means you can use it in compiled proprietary and commercial
@@ -6170,8 +6170,15 @@
 
 <h2>Change Log<a name=changes></a><a name=changelog></a></h2>
 
+<p><a name=5.20><b>5.20 - ??-???-2014</b>
+<p>adodb: AutoExecute correctly handles empty result set in case of updates. See Github #13.
+<p>adodb: Fix regex in Version(). See Github #16
+<p>datadict: oci8 strict-standards compliance. See Github #18
+<p>memcache: use include_once() to avoid issues with PHPUnit. See http://phplens.com/lens/lensforum/msgs.php?id=19489
+<p>mssqlnative: Use ADOConnection::outp instead of error_log. See Github #12
+<p>postgres7: fix system warning in MetaColumns() with schema. See http://phplens.com/lens/lensforum/msgs.php?id=19481
+
 <p><a name=5.19><b>5.19 - 23-Apr-2014</b>
-<p>
 <p>adodb: GetRowAssoc will return null as required. See http://phplens.com/lens/lensforum/msgs.php?id=19289
 <p>adodb: Fix GetRowAssoc bug introduced in 5.17, causing function to return data from previous fetch for NULL fields. See http://phplens.com/lens/lensforum/msgs.php?id=17539
 <p>adodb: GetAssoc will return a zero-based array when 2nd column is null. See https://sourceforge.net/p/adodb/bugs/130/

Modified: trunk/lib/WikiDB/adodb/docs/docs-datadict.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-datadict.htm	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-datadict.htm	2014-08-25 13:35:28 UTC (rev 9048)
@@ -20,7 +20,7 @@
 </head>
 <body style="background-color: rgb(255, 255, 255);">
 <h2>ADOdb Data Dictionary Library for PHP</h2>
-<p>V5.19  23-Apr-2014  (c) 2000-2014 John Lim (<a
+<p>V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (<a
  href="mailto:jlim#natsoft.com">jlim#natsoft.com</a>).<br>
 AXMLS (c) 2004 ars Cognita, Inc</p>
 <p><font size="1">This software is dual licensed using BSD-Style and

Modified: trunk/lib/WikiDB/adodb/docs/docs-perf.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-perf.htm	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-perf.htm	2014-08-25 13:35:28 UTC (rev 9048)
@@ -18,7 +18,7 @@
 </head>
 <body>
 <h3>The ADOdb Performance Monitoring Library</h3>
-<p>V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
+<p>V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)</p>
 <p><font size="1">This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial
 products.</font></p>

Modified: trunk/lib/WikiDB/adodb/docs/docs-session.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-session.htm	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-session.htm	2014-08-25 13:35:28 UTC (rev 9048)
@@ -21,7 +21,7 @@
 <body style="background-color: rgb(255, 255, 255);">
 <h1>ADODB Session 2 Management Manual</h1>
 <p>
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
 </p>
 <p> <font size="1">This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial

Modified: trunk/lib/WikiDB/adodb/docs/docs-session.old.htm
===================================================================
--- trunk/lib/WikiDB/adodb/docs/docs-session.old.htm	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/docs/docs-session.old.htm	2014-08-25 13:35:28 UTC (rev 9048)
@@ -21,7 +21,7 @@
 <body style="background-color: rgb(255, 255, 255);">
 <h3>ADODB Session Management Manual</h3>
 <p>
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com)
 </p>
 <p> <font size="1">This software is dual licensed using BSD-Style and
 LGPL. This means you can use it in compiled proprietary and commercial

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence. See License.txt.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
 Released under both BSD license and Lesser GPL library license.
 Whenever there is any discrepancy between the two licenses,
 the BSD license will take precedence. See License.txt.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-  V5.19  23-Apr-2014  (c) 2000-2012 (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2012 (jlim#natsoft.com). All rights reserved.
 
   This is a version of the ADODB driver for DB2.  It uses the 'ibm_db2' PECL extension
   for PHP (http://pecl.php.net/package/ibm_db2), which in turn requires DB2 V8.2.2 or

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
- @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+ @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
  Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+* @version V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
 * Released under both BSD license and Lesser GPL library license.
 * Whenever there is any discrepancy between the two licenses,
 * the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim. All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-  V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+  V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
    Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2014-08-01 08:47:57 UTC (rev 9047)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php	2014-08-25 13:35:28 UTC (rev 9048)
@@ -1,6 +1,6 @@
 <?php
 /*
-V5.19  23-Apr-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
+V5.20dev  ??-???-2014  (c) 2000-2014 John Lim (jlim#natsoft.com). All rights reserved.
   Released under both BSD license and Lesser GPL library license.
   Whenever there is any discrepancy between the two licenses,
   the BSD license will take precedence.
@@ -128,18 +128,18 @@
 
 	function ADODB_mssqlnative()
 	{
-        if ($this->debug) {
-            error_log("<pre>");
-            sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
-            sqlsrv_log_set_severity( SQLSRV_LOG_SEVERITY_ALL );
-            sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
-            sqlsrv_configure('warnings_return_as_errors', 0);
-        } else {
-            sqlsrv_set_error_handling(0);
-            sqlsrv_log_set_severity(0);
-            sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
-            sqlsrv_configure('warnings_return_as_errors', 0);
-        }
+		if ($this->debug) {
+			ADOConnection::outp("<pre>");
+			sqlsrv_set_error_handling( SQLSRV_ERRORS_LOG_ALL );
+			sqlsrv_log_set_severity( SQLSRV_LOG_SEVERITY_ALL );
+			sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+			sqlsrv_configure('warnings_return_as_errors', 0);
+		} else {
+			sqlsrv_set_error_handling(0);
+			sqlsrv_log_set_severity(0);
+			sqlsrv_log_set_subsystems(SQLSRV_LOG_SYSTEM_ALL);
+			sqlsrv_configure('warnings_return_as_errors', 0);
+		}
 	}
 	function ServerVersion() {
 		$data = $this->ServerInfo();
@@ -239,13 +239,13 @@
 	 */
 	function CreateSequence2008($seq='adodbseq',$start=1)
 	{
-		if($this->debug) error_log("<hr>CreateSequence($seq,$start)");
+		if($this->debug) ADOConnection::outp("<hr>CreateSequence($seq,$start)");
 		sqlsrv_begin_transaction($this->_connectionID);
 		$start -= 1;
 		$this->Execute("create table $seq (id int)");//was float(53)
 		$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
 		if (!$ok) {
-			if($this->debug) error_log("<hr>Error: ROLLBACK");
+			if($this->debug) ADOConnection::outp("<hr>Error: ROLLBACK");
 			sqlsrv_rollback($this->_connectionID);
 			return false;
 		}
@@ -272,7 +272,7 @@
 	 */
 	function GenID2008($seq='adodbseq',$start=1)
 	{
-		if($this->debug) error_log("<hr>CreateSequence($seq,$start)");
+		if($this->debug) ADOConnection::outp("<hr>CreateSequence($seq,$start)");
 		sqlsrv_begin_transaction($this->_connectionID);
 		$ok = $this->Execute("update $seq with (tablock,holdlock) set id = id + 1");
 		if (!$ok) {
@@ -280,7 +280,7 @@
 			$this->Execute("create table $seq (id int)");//was float(53)
 			$ok = $this->Execute("insert into $seq with (tablock,holdlock) values($start)");
 			if (!$ok) {
-				if($this->debug) error_log("<hr>Error: ROLLBACK");
+				if($this->debug) ADOConnection::outp("<hr>Error: ROLLBACK");
 				sqlsrv_rollback($this->_connectionID);
 				return false;
 			}
@@ -383,7 +383,7 @@
 	{
 		if ($this->transOff) return true;
 		$this->transCnt += 1;
-		if ($this->debug) error_log('<hr>begin transaction');
+		if ($this->debug) ADOConnection::outp('<hr>begin transaction');
 		sqlsrv_begin_transaction($this->_connectionID);
 		return true;
 	}
@@ -391,7 +391,7 @@
 	function CommitTrans($ok=true)
 	{
 		if ($this->transOff) return true;
-		if ($this->debug) error_log('<hr>commit transaction');
+		if ($this->debug) ADOConnection::outp('<hr>commit transaction');
 		if (!$ok) return $this->RollbackTrans();
 		if ($this->transCnt) $this->transCnt -= 1;
 		sqlsrv_commit($this->_connectionID);
@@ -400,7 +400,7 @@
 	function RollbackTrans()
 	{
 		if ($this->transOff) return true;
-		if ($this->debug) error_log('<hr>rollback transaction');
+		if ($this->debug) ADOConnection::outp('<hr>rollback transaction');
 		if ($this->transCnt) $this->transCnt -= 1;
 		sqlsrv_rollback($this->_connectionID);
 		return true;
@@ -480,14 +480,14 @@
 		$connectionInfo["Database"]=$argDatabasename;
 		$connectionInfo["UID"]=$argUsername;
 		$connectionInfo["PWD"]=$argPassword;
-		if ($this->debug) error_log("<hr>connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
-		//if ($this->debug) error_log("<hr>_connectionID before: ".serialize($this->_connectionID));
+		if ($this->debug) ADOConnection::outp("<hr>connecting... hostname: $argHostname params: ".var_export($connectionInfo,true));
+		//if ($this->debug) ADOConnection::outp("<hr>_connectionID before: ".serialize($this->_connectionID));
 		if(!($this->_connectionID = sqlsrv_connect($argHostname,$connectionInfo))) {
-			if ($this->debug) error_log( "<hr><b>errors</b>: ".print_r( sqlsrv_errors(), true));
+			if ($this->debug) ADOConnection::outp( "<hr><b>errors</b>: ".print_r( sqlsrv_errors(), true));
 			return false;
 		}
-		//if ($this->debug) error_log(" _connectionID after: ".serialize($this->_connectionID));
-		//if ($this->debug) error_log("<hr>defined functions: <pre>".var_export(get_defined_functions(),true)."</pre>");
+		//if ($this->debug) ADOConnection::outp(" _connectionID after: ".serialize($this->_connectionID));
+		//if ($this->debug) ADOConnection::outp("<hr>defined functions: <pre>".var_export(get_defined_functions(),true)."</pre>");
 		return true;
 	}
 
@@ -558,9 +558,9 @@
 	function _query($sql,$inputarr=false)
 	{
 		$this->_errorMsg = false;
-		
+
 		if (is_array($sql)) $sql = $sql[1];
-		
+
 		$insert = false;
 		// handle native driver flaw for retrieving the last insert ID
 		if(preg_match('/^\W*(insert [^;]+);?$/i', $sql)) {
@@ -573,7 +573,7 @@
 			$rez = sqlsrv_query($this->_connectionID,$sql);
 		}
 
-		if ($this->debug) error_log("<hr>running query: ".var_export($sql,true)."<hr>input array: ".var_export($inputarr,true)."<hr>result: ".var_export($rez,true));
+		if ($this->debug) ADOConnection::outp("<hr>running query: ".var_export($sql,true)."<hr>input array: ".var_export($inputarr,true)."<hr>result: ".var_export($rez,true));
 
 		if(!$rez) {
 			$rez = false;
@@ -852,14 +852,14 @@
 	function _initrs()
 	{
 		global $ADODB_COUNTRECS;
-		# KMN # if ($this->connection->debug) error_log("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+		# KMN # if ($this->connection->debug) ADOConnection::outp("(before) ADODB_COUNTRECS: {$ADODB_COUNTRECS} _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
 		/*$retRowsAff = sqlsrv_rows_affected($this->_queryID);//"If you need to determine the number of rows a query will return before retrieving the actual results, appending a SELECT COUNT ... query would let you get that information, and then a call to next_result would move you to the "real" results."
-		error_log("rowsaff: ".serialize($retRowsAff));
+		ADOConnection::outp("rowsaff: ".serialize($retRowsAff));
 		$this->_numOfRows = ($ADODB_COUNTRECS)? $retRowsAff:-1;*/
 		$this->_numOfRows = -1;//not supported
 		$fieldmeta = sqlsrv_field_metadata($this->_queryID);
 		$this->_numOfFields = ($fieldmeta)? count($fieldmeta):-1;
-		# KMN # if ($this->connection->debug) error_log("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
+		# KMN # if ($this->connection->debug) ADOConnection::outp("(after) _numOfRows: {$this->_numOfRows} _numOfFields: {$this->_numOfFields}");
 		/*
 		 * Copy the oracle method and cache the metadata at init time
 		 */
@@ -995,16 +995,16 @@
 	// speedup
 	function MoveNext()
 	{
-		//# KMN # if ($this->connection->debug) error_log("movenext()");
-		//# KMN # if ($this->connection->debug) error_log("eof (beginning): ".$this->EOF);
+		//# KMN # if ($this->connection->debug) ADOConnection::outp("movenext()");
+		//# KMN # if ($this->connection->debug) ADOConnection::outp("eof (beginning): ".$this->EOF);
 		if ($this->EOF) return false;
 
 		$this->_currentRow++;
-		// # KMN # if ($this->connection->debug) error_log("_currentRow: ".$this->_currentRow);
+		// # KMN # if ($this->connection->debug) ADOConnection::outp("_currentRow: ".$this->_currentRow);
 
 		if ($this->_fetch()) return true;
 		$this->EOF = true;
-		//# KMN # if ($this->connection->debug) error_log("eof (end): ".$this->EOF);
+		//# KMN # if ($this->connection->debug) ADOConnection::outp("eof (end): ".$this->EOF);
 
 		return false;
 	}
@@ -1014,13 +1014,13 @@
 	// also the date format has been changed from YYYY-mm-dd to dd MMM YYYY in 4.0.4. Idiot!
 	function _fetch($ignore_fields=false)
 	{
-		# KMN # if ($this->connection->debug) error_log("_fetch()");
+		# KMN # if ($this->connection->debug) ADOConnection::outp("_fetch()");
 		if ($this->fetchMode & ADODB_FETCH_ASSOC) {
 			if ($this->fetchMode & ADODB_FETCH_NUM) {
-				//# KMN # if ($this->connection->debug) error_log("fetch mode: both");
+				//# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: both");
 				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_BOTH);
 			} else {
-				//# KMN # if ($this->connection->debug) error_log("fetch mode: assoc");
+				//# KMN # if ($this->connection->debug) ADOConnection::outp("fetch mode: assoc");
 				$this->fields = @sqlsrv_fetch_array($this->_queryID,SQLSRV_FETCH_ASSOC);
 			}
 
@...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[9047] trunk/themes/default/toolbar.js

[<var...@us...>]

Revision: 9047
          http://sourceforge.net/p/phpwiki/code/9047
Author:   vargenau
Date:     2014-08-01 08:47:57 +0000 (Fri, 01 Aug 2014)
Log Message:
-----------
Close the window with Escape key

Modified Paths:
--------------
    trunk/themes/default/toolbar.js

Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2014-07-31 15:59:56 UTC (rev 9046)
+++ trunk/themes/default/toolbar.js	2014-08-01 08:47:57 UTC (rev 9047)
@@ -201,6 +201,12 @@
    var h = (screen.height-height)/2;
    var w = (screen.width-width)/2;
    replacewin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top='+h+',left='+w+',height='+height+',width='+width);
+   // Close the window with Escape key
+   replacewin.onkeydown = function(e){
+       if(e.keyCode === 27){
+           replacewin.window.close();
+       }
+   };
    replacewin.window.document.writeln(doctype);
    replacewin.window.document.writeln('<html>\n<head>\n<title>'+msg_repl_title+'</title>');
    replacewin.window.document.writeln(cssfile);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9046] trunk/themes/default/toolbar.js

[<var...@us...>]

Revision: 9046
          http://sourceforge.net/p/phpwiki/code/9046
Author:   vargenau
Date:     2014-07-31 15:59:56 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
No tabs

Modified Paths:
--------------
    trunk/themes/default/toolbar.js

Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2014-07-31 14:40:26 UTC (rev 9045)
+++ trunk/themes/default/toolbar.js	2014-07-31 15:59:56 UTC (rev 9046)
@@ -1,4 +1,4 @@
-// Toolbar JavaScript support functions. Taken from mediawiki 
+// Toolbar JavaScript support functions. Taken from mediawiki
 
 // Some "constants"
 var doctype = '<!DOCTYPE html>';
@@ -22,16 +22,14 @@
   //width=\"23\" height=\"22\"
   document.write(");\"><img src=\""+imageFile+"\" width=\"18\" height=\"18\" border=\"0\" alt=\""+speedTip+"\" title=\""+speedTip+"\">");
   document.write("</a>");
-  return;
 }
 function addTagButton(imageFile, speedTip, tagOpen, tagClose, sampleText) {
   addButton(imageFile, speedTip, "insertTags", [tagOpen, tagClose, sampleText]);
-  return;
 }
 
-// This function generates a popup list to select from. 
+// This function generates a popup list to select from.
 // In an external window so far, but we really want that as acdropdown pulldown, hence the name.
-//   plugins, pagenames, categories, templates. 
+//   plugins, pagenames, categories, templates.
 // Not with document.write because we cannot use self.opener then.
 //function addPulldown(imageFile, speedTip, pages) {
 //  addButton(imageFile, speedTip, "showPulldown", pages);
@@ -69,13 +67,12 @@
 function do_pulldown(text,fromid) {
     // do special actions dependent on fromid: tb-categories
     if (fromid == 'tb-categories') {
-	var txtarea = document.getElementById('edit-content');
-	text = unescapeSpecial(text);
-	txtarea.value += '\n'+text;
+        var txtarea = document.getElementById('edit-content');
+        text = unescapeSpecial(text);
+        txtarea.value += '\n'+text;
     } else {
-	insertTags(text, '', '\n');
+        insertTags(text, '', '\n');
     }
-    return;
 }
 function addInfobox(infoText) {
   // if no support for changing selection, add a small copy & paste field
@@ -85,8 +82,8 @@
   if(!document.selection && !is_nav) {
     infoText=escapeQuotesHTML(infoText);
     document.write("<form name='infoform' id='infoform'>"+
-		   "<input size=80 id='infobox' name='infobox' value=\""+
-		   infoText+"\" readonly=\"readonly\"></form>");
+           "<input size=80 id='infobox' name='infobox' value=\""+
+           infoText+"\" readonly=\"readonly\"></form>");
   }
 }
 function escapeQuotes(text) {
@@ -151,9 +148,9 @@
     var myText = (txtarea.value).substring(startPos, endPos);
     if(!myText) { myText=sampleText;}
     if(myText.charAt(myText.length - 1) == " "){ // exclude ending space char, if any
-      subst = tagOpen + myText.substring(0, (myText.length - 1)) + tagClose + " "; 
+      subst = tagOpen + myText.substring(0, (myText.length - 1)) + tagClose + " ";
     } else {
-      subst = tagOpen + myText + tagClose; 
+      subst = tagOpen + myText + tagClose;
     }
     txtarea.value = txtarea.value.substring(0, startPos) + subst + txtarea.value.substring(endPos, txtarea.value.length);
     txtarea.focus();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9045] trunk

[<var...@us...>]

Revision: 9045
          http://sourceforge.net/p/phpwiki/code/9045
Author:   vargenau
Date:     2014-07-31 14:40:26 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Remove unused template nochanges.tmpl

Modified Paths:
--------------
    trunk/lib/editpage.php
    trunk/themes/default/templates/categorypage.tmpl
    trunk/themes/wikilens/templates/categorypage.tmpl

Removed Paths:
-------------
    trunk/themes/default/templates/nochanges.tmpl

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2014-07-31 14:20:18 UTC (rev 9044)
+++ trunk/lib/editpage.php	2014-07-31 14:40:26 UTC (rev 9045)
@@ -118,7 +118,6 @@
         elseif ($this->editaction == 'keep_old') {
             // keep old page and do nothing
             $this->_redirectToBrowsePage();
-            //$r->redirect(WikiURL($r->getArg('save_and_redirect_to')));
             return true;
         } elseif ($this->editaction == 'overwrite') {
             // take the new content without diff
@@ -129,7 +128,6 @@
             $this->request->setArg('merge', 0);
             LoadFileOrDir($this->request);
             $this->_redirectToBrowsePage();
-            //$r->redirect(WikiURL($r->getArg('save_and_redirect_to')));
             return true;
         } elseif ($this->editaction == 'upload') {
             // run plugin UpLoad
@@ -280,28 +278,12 @@
             }
             // Save failed. No changes made.
             $this->_redirectToBrowsePage();
-            // user will probably not see the rest of this...
-            require_once 'lib/display.php';
-            // force browse of current version:
-            $request->setArg('action', false);
-            $request->setArg('version', false);
-            displayPage($request, 'nochanges');
             return true;
         }
 
         if (!$this->user->isAdmin() and $this->isSpam()) {
             $this->_isSpam = true;
             return false;
-            /*
-            // Save failed. No changes made.
-            $this->_redirectToBrowsePage();
-            // user will probably not see the rest of this...
-            require_once 'lib/display.php';
-            // force browse of current version:
-            $request->setArg('version', false);
-            displayPage($request, 'nochanges');
-            return true;
-            */
         }
 
         $page = &$this->page;
@@ -351,6 +333,7 @@
             // (below).
             $request->setArg('action', false);
             $this->_redirectToBrowsePage();
+            return true;
         }
 
         // Force browse of current page version.
@@ -733,7 +716,7 @@
         return $el;
     }
 
-    function _redirectToBrowsePage()
+    private function _redirectToBrowsePage()
     {
         $this->request->redirect(WikiURL($this->page, false, 'absolute_url'));
     }

Modified: trunk/themes/default/templates/categorypage.tmpl
===================================================================
--- trunk/themes/default/templates/categorypage.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
+++ trunk/themes/default/templates/categorypage.tmpl	2014-07-31 14:40:26 UTC (rev 9045)
@@ -31,11 +31,7 @@
 
   $initial_content = "\"This page is in the $bpage category.  You must leave in at least one reference to $bpage in order for this page to be in the $bpage category.  Otherwise, edit this text to describe your page.\"";
 	$adder = "";
-  
-  //if($SELF_ON_CREATE == true){
-  	//$adder = "save_and_redirect_to=\"" . $PAGENAME . "\"";
-  //}	
-  
+
   $this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">");
 ?>
 

Deleted: trunk/themes/default/templates/nochanges.tmpl
===================================================================
--- trunk/themes/default/templates/nochanges.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
+++ trunk/themes/default/templates/nochanges.tmpl	2014-07-31 14:40:26 UTC (rev 9045)
@@ -1,6 +0,0 @@
-<p><strong><?php echo _("Edit aborted.")?></strong>
-<?php echo _("You have not made any changes so no new version has been saved.")?></p>
-<?php if (!empty($LOCK_CHANGED_MSG)) { ?>
-  <p><?php echo $LOCK_CHANGED_MSG?></p>
-<?php } ?>
-<?php echo Template('browse') ?>

Modified: trunk/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/categorypage.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
+++ trunk/themes/wikilens/templates/categorypage.tmpl	2014-07-31 14:40:26 UTC (rev 9045)
@@ -12,21 +12,21 @@
 $this->_printPlugin("<" . "?plugin UserRatings nobuds=" . ($SHOWBUDS ? 0 : 1) . " category=\"" . $PAGENAME . "\" ?" . ">");
 ?>
 <br/>
-<?php 
+<?php
 if ($SHOWBUDS){
-	$btn = Button(array('exclude'  => "$EXCLUDE", 
+	$btn = Button(array('exclude'  => "$EXCLUDE",
 						'category' => "$PAGENAME",
                			'showbuds' => false),
-                       _("Hide Buddy Ratings in the $SINGULAR category"), 
-                 		$PAGENAME); 
+                       _("Hide Buddy Ratings in the $SINGULAR category"),
+                 		$PAGENAME);
 
 
 } else {
-$btn = Button(array('exclude'  => "$EXCLUDE", 
+$btn = Button(array('exclude'  => "$EXCLUDE",
 						'category' => "$PAGENAME",
                        'showbuds' => true),
-                       _("Show Buddy Ratings in the $SINGULAR category"), 
-                 		$PAGENAME); 
+                       _("Show Buddy Ratings in the $SINGULAR category"),
+                 		$PAGENAME);
 }
                  ?>
 <?php echo $btn ?>
@@ -56,11 +56,7 @@
 
   $initial_content = "\"This page is in the $bpage category.  You must leave in at least one reference to $bpage in order for this page to be in the $bpage category.  Otherwise, edit this text to describe your page.\"";
 	$adder = "";
-  
-  //if($SELF_ON_CREATE == true){
-  	//$adder = "save_and_redirect_to=\"" . $PAGENAME . "\"";
-  //}	
-  
+
   $this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">");
 ?>
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9044] trunk/themes

[<var...@us...>]

Revision: 9044
          http://sourceforge.net/p/phpwiki/code/9044
Author:   vargenau
Date:     2014-07-31 14:20:18 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Removing ";" to please Template.php

Modified Paths:
--------------
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/Crao/templates/editpage.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
@@ -33,7 +33,7 @@
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size")._(":"); ?>
+    <?php echo _("Size")._(":") ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -44,7 +44,7 @@
   </fieldset>
 <!-- FIXME: fix layout, move CSS to CSS -->
  <fieldset class="editarea">
-    <legend><?php echo _("Summary")._(":"); ?></legend><br />
+    <legend><?php echo _("Summary")._(":") ?></legend><br />
     <?php echo $SUMMARY_INPUT?>
   </fieldset>
 <?php if (ENABLE_CAPTCHA) { ?>

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/Portland/templates/editpage.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
@@ -29,7 +29,7 @@
 </table>
 <a id="editarea"><?php echo $EDIT_TEXTAREA?></a>
 <br />
-<?php echo _("Summary")._(":"); ?> <?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":") ?> <?php echo $SUMMARY_INPUT ?>
 <br />
 <?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
 <br />

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
@@ -33,14 +33,14 @@
 <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size")._(":"); ?>
+    <?php echo _("Size")._(":") ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <br /><small>
-<?php echo _("Summary")._(":"); ?><?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
 <br />
 <?php if (ENABLE_CAPTCHA) { ?>
   <?php echo $CAPTCHA_IMAGE ?><br/>

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/default/templates/editpage.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
@@ -33,7 +33,7 @@
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size")._(":"); ?>
+    <?php echo _("Size")._(":") ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -44,7 +44,7 @@
   <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <!-- FIXME: fix layout, move CSS to CSS -->
 <div class="toolbar" style="text-align: center;">
-  <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT ?>
+  <label for="edit-summary"><?php echo _("Summary")._(":") ?></label> <?php echo $SUMMARY_INPUT ?>
 </div>
 <?php if (ENABLE_CAPTCHA) { ?>
 <div class="toolbar" style="text-align: center;">

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2014-07-31 14:20:18 UTC (rev 9044)
@@ -65,14 +65,14 @@
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size")._(":"); ?>
+    <?php echo _("Size")._(":") ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
   <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <div style="text-align: center;">
-  <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
+  <label for="edit-summary"><?php echo _("Summary")._(":") ?></label> <?php echo $SUMMARY_INPUT?>
 </div>
 <table class="fullwidth">
 <tr class="middle">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9043] trunk/themes

[<var...@us...>]

Revision: 9043
          http://sourceforge.net/p/phpwiki/code/9043
Author:   vargenau
Date:     2014-07-31 11:14:40 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/themes/Crao/templates/wikiblog.tmpl
    trunk/themes/Portland/templates/viewsource.tmpl
    trunk/themes/Wordpress/templates/viewsource.tmpl
    trunk/themes/blog/templates/wikiblog.tmpl
    trunk/themes/default/templates/blogform.tmpl
    trunk/themes/default/templates/frameset.tmpl
    trunk/themes/default/templates/userprefs.tmpl
    trunk/themes/default/templates/viewsource.tmpl
    trunk/themes/default/templates/wikiblog.tmpl
    trunk/themes/fusionforge/templates/userprefs.tmpl
    trunk/themes/wikilens/templates/categorypage.tmpl

Modified: trunk/themes/Crao/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/Crao/templates/wikiblog.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/Crao/templates/wikiblog.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,13 +1,13 @@
 <?php
 $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
-
 $buttons = $modified = '';
 
 if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) {
     $buttons = HTML::small(array('class' => 'floatleft'),
                            Button('edit', false, $page));
-    if ($user->isAdmin())
-      $buttons->pushContent(Button('remove', false, $page));
+    if ($user->isAdmin()) {
+        $buttons->pushContent(Button('remove', false, $page));
+    }
 }
 
 // This is a hack, but since we only have a fake PageRevision,
@@ -19,8 +19,6 @@
 				$mtime, $rev->get('author')));
 }
 ?>
-
-<!-- FIXME: move table formatting to css -->
 <div title="<?php echo fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>"
      class="wikiblog wikitext">
   <div class="wikiblog-header">

Modified: trunk/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Portland/templates/viewsource.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/Portland/templates/viewsource.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,10 +1,12 @@
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
-  <?php echo _("This page has been locked and cannot be edited.")?></p>
+  <?php echo _("This page has been locked and cannot be edited.")?>
+  </p>
 <?php } ?>
 <?php if ($revision and !$revision->isCurrent()) { ?>
   <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('viewsource', _("View the current version."), $page)?></p>
+  <?php echo Button('viewsource', _("View the current version."), $page) ?>
+  </p>
 <?php } ?>
 <textarea class="wikiedit"
           name="content"

Modified: trunk/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/viewsource.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/Wordpress/templates/viewsource.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -4,11 +4,13 @@
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 if ($page->get('locked') && !$user->isAdmin()) { ?>
   <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
-  <?php echo _("This page has been locked and cannot be edited.")?></p>
+  <?php echo _("This page has been locked and cannot be edited.")?>
+  </p>
 <?php } ?>
-<?php if (! $revision->isCurrent()) { ?>
+<?php if ($revision and !$revision->isCurrent()) { ?>
   <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('viewsource', _("View the current version."), $page)?></p>
+  <?php echo Button('viewsource', _("View the current version."), $page) ?>
+  </p>
 <?php } ?>
 <textarea class="wikiedit"
           name="content"

Modified: trunk/themes/blog/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/blog/templates/wikiblog.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/blog/templates/wikiblog.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,6 +1,5 @@
 <?php
 $CDATE = $WikiTheme->formatDateTime($BLOG_CTIME);
-
 $buttons = $modified = '';
 
 if ($user->isAdmin() or $user->getId() == $BLOG_CREATOR) {

Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/blogform.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -9,7 +9,7 @@
                    maxlength="256" name="edit[summary]" value="" />
      <?php echo $EDIT_TOOLBAR ?>
      <a id="editarea"></a>
-     <textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px"
+     <textarea id="edit-content" class="edit-content" rows="8" style="width:540px"
                name="edit[content]"></textarea>
      <br />
      <input id="wikiblog-submit" type="submit" value="<?php echo _("Add Entry")?>"

Modified: trunk/themes/default/templates/frameset.tmpl
===================================================================
--- trunk/themes/default/templates/frameset.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/frameset.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,5 +1,7 @@
 <?php
-// This template is used for the FrameInclude plugin.
+/*
+ * This template is used for the FrameInclude plugin.
+ */
 
 $topurl = $request->getURLtoSelf(array('frame' => 'header'));
 $boturl = $request->getURLtoSelf(array('frame' => 'footer'));
@@ -12,9 +14,9 @@
 <?php echo Template('head') ?>
 
 <frameset rows="<?php echo $ROWS?>">
-  <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?>/>
+  <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> />
   <?php echo $CONTENT_FRAME ?>
-  <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?>/>
+  <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> />
   <noframes><?php echo Template('body') ?></noframes>
 </frameset>
 </html>

Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/userprefs.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -176,6 +176,7 @@
   <tr><td colspan="2">
     <?php echo _("Get an e-mail notification at changes of the following pages:")?>
   </td></tr>
+
   <tr>
     <?php if ($isForm) { ?>
       <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
@@ -288,11 +289,12 @@
 </table>
 
 <?php if ($isForm) { ?>
-  <hr />
-  <p><?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?>
+<hr />
+<p>
+  <?php echo Button("submit:", _("Update Preferences"), 'wikiadmin')?>
   <?php echo Button("submit:delete", _("Reset Preferences"), 'wikiadmin')?>
-  <?php echo Button("submit:cancel", _("Cancel"), 'button')?></p>
-
-<?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
+  <?php echo Button("submit:cancel", _("Cancel"), 'button')?>
+  <?php echo HiddenInputs($request->getArgs(), false, array('pref')) ?>
+</p>
 </form>
 <?php } ?>

Modified: trunk/themes/default/templates/viewsource.tmpl
===================================================================
--- trunk/themes/default/templates/viewsource.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/viewsource.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -5,7 +5,7 @@
 <?php } ?>
 <?php if ($revision and !$revision->isCurrent()) { ?>
   <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('edit', _("View the current version."), $page) ?>
+  <?php echo Button('viewsource', _("View the current version."), $page) ?>
   </p>
 <?php } ?>
 <br class="clear-floats" />

Modified: trunk/themes/default/templates/wikiblog.tmpl
===================================================================
--- trunk/themes/default/templates/wikiblog.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/default/templates/wikiblog.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -6,7 +6,7 @@
     $buttons = HTML::small(array('class' => 'floatleft'),
                            Button('edit', false, $page));
     if ($user->isAdmin()) {
-	$buttons->pushContent($SEP, Button('remove', false, $page));
+        $buttons->pushContent($SEP, Button('remove', false, $page));
     }
 }
 

Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -130,16 +130,16 @@
 <legend><strong><?php echo _("User preferences for this project")?></strong></legend>
 <table class="fullwidth">
 
-   <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
+  <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
 
-   <tr><td colspan="2">
+  <tr><td colspan="2">
     <?php echo _("Get an e-mail notification at changes of the following pages:")?>
-   </td></tr>
+  </td></tr>
 
-   <tr>
+  <tr>
     <?php if ($isForm) { ?>
       <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td>
-      <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
+    <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td>
     <?php } else { ?>
      <td colspan="2"><?php echo $pref->get('notifyPages')?></td>
     <?php } ?>
@@ -153,7 +153,9 @@
 
 <table class="fullwidth">
 
-  <tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
+  <tr>
+       <td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td>
+  </tr>
 
   <tr>
       <td>

Modified: trunk/themes/wikilens/templates/categorypage.tmpl
===================================================================
--- trunk/themes/wikilens/templates/categorypage.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
+++ trunk/themes/wikilens/templates/categorypage.tmpl	2014-07-31 11:14:40 UTC (rev 9043)
@@ -1,3 +1,6 @@
+<?php
+// This template is used for the CategoryPage plugin.
+?>
 <div class="categorypage categorypage-form">
 
 <p>This page represents the <?php echo $SINGULAR?> category.</p>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9042] trunk/themes/Portland/templates/editpage.tmpl

[<var...@us...>]

Revision: 9042
          http://sourceforge.net/p/phpwiki/code/9042
Author:   vargenau
Date:     2014-07-31 10:39:48 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Translate ":"

Modified Paths:
--------------
    trunk/themes/Portland/templates/editpage.tmpl

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2014-07-31 10:39:00 UTC (rev 9041)
+++ trunk/themes/Portland/templates/editpage.tmpl	2014-07-31 10:39:48 UTC (rev 9042)
@@ -4,10 +4,9 @@
  * This is needed, otherwise the redirect to the real browser
  * page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
  * a redirect from a page to itself.)
- *
- */ ?>
-
-<form method="post" name="editpage"
+ */
+?>
+<form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">
 <table class="toolbar fullwidth">
@@ -30,7 +29,7 @@
 </table>
 <a id="editarea"><?php echo $EDIT_TEXTAREA?></a>
 <br />
-<?php echo _("Summary")?>: <?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":"); ?> <?php echo $SUMMARY_INPUT ?>
 <br />
 <?php echo fmt("Author will be logged as %s.", HTML::em($user->getId())) ?>
 <br />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9041] trunk/themes/default/templates/editpage.tmpl

[<var...@us...>]

Revision: 9041
          http://sourceforge.net/p/phpwiki/code/9041
Author:   vargenau
Date:     2014-07-31 10:39:00 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/themes/default/templates/editpage.tmpl

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2014-07-31 10:34:35 UTC (rev 9040)
+++ trunk/themes/default/templates/editpage.tmpl	2014-07-31 10:39:00 UTC (rev 9041)
@@ -54,7 +54,7 @@
 <?php } ?>
 <table class="toolbar fullwidth">
 <tr class="middle">
-  <td> 
+  <td>
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
   </td>
   <td class="align-center">
@@ -62,8 +62,8 @@
     <?php echo $WYSIWYG_B?><?php echo $SEP?>
     <?php } ?>
     <?php echo $PREVIEW_B ?>
-    <?php if ($SAVE_B)  { ?>
-      <?php echo $SEP?><?php echo $SAVE_B ?>
+    <?php if ($SAVE_B) { ?>
+      <?php echo $SEP?> <?php echo $SAVE_B ?>
     <?php } ?>
     <?php echo $SEP?><?php echo $CHANGES_B ?>
   </td>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9040] trunk/themes

[<var...@us...>]

Revision: 9040
          http://sourceforge.net/p/phpwiki/code/9040
Author:   vargenau
Date:     2014-07-31 10:34:35 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Whitespace

Modified Paths:
--------------
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/Crao/templates/editpage.tmpl	2014-07-31 10:34:35 UTC (rev 9040)
@@ -17,12 +17,13 @@
         <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
 <?php /*
- * FIXME: Hack! 
+ * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.
  * This is needed, otherwise the redirect to the real browser
  * page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
  * a redirect from a page to itself.)
- */ ?>
+ */
+?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2014-07-31 10:34:35 UTC (rev 9040)
@@ -7,9 +7,8 @@
  * a redirect from a page to itself.)
  */
 ?>
-
 <div class="wikitext" id="editform">
-<form method="post" name="editpage" id="editpage"
+<form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">
   <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1">'; ?>

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/default/templates/editpage.tmpl	2014-07-31 10:34:35 UTC (rev 9040)
@@ -10,21 +10,20 @@
   <?php echo $PREVIEW_CONTENT ?>
   <hr class="printer" />
 <?php } ?>
-
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-
 <?php if (! $IS_CURRENT) { ?>
   <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
         <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
 <?php /*
- * FIXME: Hack! 
+ * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.
  * This is needed, otherwise the redirect to the real browser
  * page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
  * a redirect from a page to itself.)
- */ ?>
+ */
+?>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">
@@ -35,7 +34,7 @@
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
     <?php echo _("Size")._(":"); ?>
-    <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
+    <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
@@ -45,7 +44,7 @@
   <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <!-- FIXME: fix layout, move CSS to CSS -->
 <div class="toolbar" style="text-align: center;">
-  <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
+  <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT ?>
 </div>
 <?php if (ENABLE_CAPTCHA) { ?>
 <div class="toolbar" style="text-align: center;">
@@ -63,20 +62,20 @@
     <?php echo $WYSIWYG_B?><?php echo $SEP?>
     <?php } ?>
     <?php echo $PREVIEW_B ?>
-    <?php if ($SAVE_B)  { ?> 
+    <?php if ($SAVE_B)  { ?>
       <?php echo $SEP?><?php echo $SAVE_B ?>
     <?php } ?>
     <?php echo $SEP?><?php echo $CHANGES_B ?>
   </td>
-  <td>&nbsp; <?php echo $AUTHOR_MESSAGE?></td>
+  <td><?php echo $AUTHOR_MESSAGE?></td>
 </tr>
 <tr>
   <td>
-    <?php if ($user->isAdmin()) { ?> 
-    <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
-    <?php if (ENABLE_PAGE_PUBLIC) { ?>
-    &nbsp;&nbsp;<?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label>
-    <?php }} ?>
+    <?php if ($user->isAdmin()) { ?>
+      <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label>
+      <?php if (ENABLE_PAGE_PUBLIC) { ?>
+        <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label>
+      <?php }} ?>
   </td>
   <td colspan="2" class="align-right">
     <?php if (!$user->isAuthenticated()) { ?>
@@ -88,9 +87,7 @@
 <?php echo $HIDDEN_INPUTS?>
 </form>
 <div style="width:100%;text-align:center;"><?php /*plugin UpLoad autolink=0 mode=edit size=30 */?></div>
-
 <hr />
-
 <div class="wiki-edithelp">
 <!-- FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules -->
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2014-07-31 10:34:35 UTC (rev 9040)
@@ -4,10 +4,8 @@
   </p>
   <?php echo $PREVIEW_CONTENT ?>
 <?php } ?>
-
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
-
 <?php if (! $IS_CURRENT) { ?>
   <p class="warning_msg">
       <?php echo _("Warning: You are editing an old revision. Saving this page will overwrite the current version.")?>
@@ -106,9 +104,7 @@
 </table>
 <?php echo $HIDDEN_INPUTS?>
 </form>
-
 <hr />
-
 <div class="wiki-edithelp">
 <?php if (WIKI_NAME == "help") { ?>
 <?plugin IncludePage page="Help/TextFormattingRules" section="Synopsis" quiet=1?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9039] trunk/themes

[<var...@us...>]

Revision: 9039
          http://sourceforge.net/p/phpwiki/code/9039
Author:   vargenau
Date:     2014-07-31 10:25:18 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Translate ":"

Modified Paths:
--------------
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/Crao/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
@@ -32,7 +32,7 @@
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size").':'?>
+    <?php echo _("Size")._(":"); ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -43,7 +43,7 @@
   </fieldset>
 <!-- FIXME: fix layout, move CSS to CSS -->
  <fieldset class="editarea">
-    <legend><?php echo _("Summary").':'?></legend><br />
+    <legend><?php echo _("Summary")._(":"); ?></legend><br />
     <?php echo $SUMMARY_INPUT?>
   </fieldset>
 <?php if (ENABLE_CAPTCHA) { ?>

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
@@ -34,14 +34,14 @@
 <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size").':'?>
+    <?php echo _("Size")._(":"); ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <br /><small>
-<?php echo _("Summary")?>: <?php echo $SUMMARY_INPUT ?>
+<?php echo _("Summary")._(":"); ?><?php echo $SUMMARY_INPUT ?>
 <br />
 <?php if (ENABLE_CAPTCHA) { ?>
   <?php echo $CAPTCHA_IMAGE ?><br/>

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/default/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
@@ -34,7 +34,7 @@
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size").':'?>
+    <?php echo _("Size")._(":"); ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
@@ -45,7 +45,7 @@
   <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <!-- FIXME: fix layout, move CSS to CSS -->
 <div class="toolbar" style="text-align: center;">
-  <label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
+  <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
 </div>
 <?php if (ENABLE_CAPTCHA) { ?>
 <div class="toolbar" style="text-align: center;">

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2014-07-31 09:50:05 UTC (rev 9038)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2014-07-31 10:25:18 UTC (rev 9039)
@@ -67,14 +67,14 @@
   <table class="fullwidth">
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td class="align-right"><div id="editarea-size">
-    <?php echo _("Size").':'?>
+    <?php echo _("Size")._(":"); ?>
     <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
   <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <div style="text-align: center;">
-  <label for="edit-summary"><?php echo _("Summary").':'?></label> <?php echo $SUMMARY_INPUT?>
+  <label for="edit-summary"><?php echo _("Summary")._(":"); ?></label> <?php echo $SUMMARY_INPUT?>
 </div>
 <table class="fullwidth">
 <tr class="middle">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9038] trunk/themes/default/toolbar.js

[<var...@us...>]

Revision: 9038
          http://sourceforge.net/p/phpwiki/code/9038
Author:   vargenau
Date:     2014-07-31 09:50:05 +0000 (Thu, 31 Jul 2014)
Log Message:
-----------
Close the window with Escape key

Modified Paths:
--------------
    trunk/themes/default/toolbar.js

Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2014-07-31 09:18:36 UTC (rev 9037)
+++ trunk/themes/default/toolbar.js	2014-07-31 09:50:05 UTC (rev 9038)
@@ -44,6 +44,12 @@
   var h = (screen.height-height)/2;
   var w = (screen.width-width)/2;
   pullwin = window.open('','','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,top='+h+',left='+w+',height='+height+',width='+width);
+   // Close the window with Escape key
+   pullwin.onkeydown = function(e){
+       if(e.keyCode === 27){
+           pullwin.window.close();
+       }
+   };
   pullwin.window.document.writeln(doctype);
   pullwin.window.document.writeln('<html>\n<head>\n<title>'+escapeQuotes(title)+'</title>');
   pullwin.window.document.writeln(cssfile);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.