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

[phpwiki-checkins] SF.net SVN: phpwiki:[8714] trunk/locale/zh/LC_MESSAGES/phpwiki.php

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

Revision: 8714
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8714&view=rev
Author:   vargenau
Date:     2013-01-15 09:12:35 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Update zh translation

Modified Paths:
--------------
    trunk/locale/zh/LC_MESSAGES/phpwiki.php

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-01-14 19:12:26 UTC (rev 8713)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-01-15 09:12:35 UTC (rev 8714)
@@ -177,7 +177,7 @@
 $locale["Differences between %s and %s of %s."] = "在 %s 與 %s 間的差異 - %s.";
 $locale["Diffing pages"] = "比對頁面差異";
 $locale["Display a list of randomly chosen pages or redirects to a random page."] = "顯示隨機選出的頁面列表或重導向到隨機選取的頁面.";
-$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "在內容的分離框架中顯示 url. 只能放一個框架.";
+$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "在內容的分離框架中顯示 url. 只能放一個框架.";
 $locale["Display arbitrary SQL result tables."] = "顯示不受限制的 SQL 結果表格";
 $locale["Display general and user specific auth information."] = "顯示一般與使用者特定認證資訊.";
 $locale["Don't cache this 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:[8713] trunk

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

Revision: 8713
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8713&view=rev
Author:   vargenau
Date:     2013-01-14 19:12:26 +0000 (Mon, 14 Jan 2013)
Log Message:
-----------
seperate --> separate

Modified Paths:
--------------
    trunk/TODO
    trunk/admin/wiki2public.php
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/doc/README.phpwiki-auth
    trunk/lib/EditToolbar.php
    trunk/lib/InlineParser.php
    trunk/lib/PagePerm.php
    trunk/lib/WikiDB/backend/dbaBase.php
    trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
    trunk/lib/WikiDB/backend.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser.php
    trunk/lib/WikiUserNew.php
    trunk/lib/XmlRpcServer.php
    trunk/lib/pear/Cache/Container/trifile.php
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/upgrade.php
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/de/pgsrc/PhpWikiSystemverwalten
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    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/pgsrc/PhpWikiDebug
    trunk/pgsrc/ReleaseNotes
    trunk/schemas/mssql-initialize.sql
    trunk/schemas/mysql-initialize.sql
    trunk/schemas/sqlsrv-initialize.sql
    trunk/tests/makemakebuild.pl
    trunk/tests/unit/test.php
    trunk/themes/default/templates/editpage.tmpl

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/TODO	2013-01-14 19:12:26 UTC (rev 8713)
@@ -32,7 +32,7 @@
   <BackLink include_self=false />
 4  And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser.
 * Fix postgresql stored procedures.
-* Move serialized data from page_data / version_data to seperate SQL columns.
+* Move serialized data from page_data / version_data to separate SQL columns.
 * WikiDB hooks. (?)
 * Content expansion hooks in transformer. (SearchHighlight)
 * Convert RecentChanges to PageList as source for format options. 

Modified: trunk/admin/wiki2public.php
===================================================================
--- trunk/admin/wiki2public.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/admin/wiki2public.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -1,4 +1,4 @@
 <?php
-// cronjob script to copy pages marked as "public" to a seperate public wiki area.
+// cronjob script to copy pages marked as "public" to a separate public wiki area.
 // If ENABLE_PAGE_PUBLIC = true
 // can only run via localhost for security reasons

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/config/config-dist.ini	2013-01-14 19:12:26 UTC (rev 8713)
@@ -50,7 +50,7 @@
 ; Experimental!
 ;ENABLE_WYSIWYG = true
 
-; Which backend? Might need to be seperately installed. See lib/WysiwygEdit/
+; Which backend? Might need to be separately installed. See lib/WysiwygEdit/
 ; Recommended is only Wikiwyg.
 ;
 ;  Wikiwyg     http://openjsan.org/doc/i/in/ingy/Wikiwyg/
@@ -65,7 +65,7 @@
 ; Not recommended, but presented here to test several WYSIWYG backends.
 ;WYSIWYG_DEFAULT_PAGETYPE_HTML = false
 
-; Upload into seperate userdirs. If enabled (default since 1.3.13) the generated Upload: link 
+; Upload into separate userdirs. If enabled (default since 1.3.13) the generated Upload: link 
 ; will include the username plus "/". This will make all uploaded links longer, but we 
 ; avoid nameclashes and you see who uploaded what file.
 ;UPLOAD_USERDIR = false
@@ -176,7 +176,7 @@
 ;ENABLE_RECENTCHANGESBOX = true
 
 ; You can enable an admin checkbox to set a "public" page attribute, to 
-; be used by external tools to generate a seperate public wiki.
+; be used by external tools to generate a separate public wiki.
 ; Default: false
 ;ENABLE_PAGE_PUBLIC = true
 
@@ -524,7 +524,7 @@
 ; author is an author revision.
 ;
 ; The expiry parameters for each of those three classes of revisions
-; can be adjusted seperately. For each class there are five
+; can be adjusted separately. For each class there are five
 ; parameters (usually, only two or three of the five are actually
 ; set) which control how long those revisions are kept in the
 ; database.
@@ -606,7 +606,7 @@
 ; any/no password) using any userid which: 
 ;  1) is not the ADMIN_USER, and
 ;  2) is a valid WikiWord (matches $WikiNameRegexp.)
-; If true, users may be created by themselves. Otherwise we need seperate auth. 
+; If true, users may be created by themselves. Otherwise we need separate auth. 
 ; If such a user will create a so called HomePage with his userid, he will 
 ; be able to store his preferences and password there.
 ALLOW_BOGO_LOGIN = true

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/configurator.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -806,7 +806,7 @@
 author is and author revision.
 
 The expiry parameters for each of those three classes of revisions
-can be adjusted seperately. For each class there are five
+can be adjusted separately. For each class there are five
 parameters (usually, only two or three of the five are actually
 set) which control how long those revisions are kept in the
 database.
@@ -1420,7 +1420,7 @@
 
 $properties["Subpage Separator"] =
     new _define_optional('SUBPAGE_SEPARATOR', '"/"', "
-One character which seperates pages from subpages. Defaults to '/', but '.' or ':' were also used.",
+One character which separates pages from subpages. Defaults to '/', but '.' or ':' were also used.",
         "onchange=\"validate_ereg('Sorry, \'%s\' must be a single character. Currently only :, / or .', '^[/:.]$', 'SUBPAGE_SEPARATOR', this);\""
     );
 
@@ -1495,7 +1495,7 @@
 Part Six (optional):
 URL options -- you can probably skip this section.
 
-For a pretty wiki (no index.php in the url) set a seperate DATA_PATH.");
+For a pretty wiki (no index.php in the url) set a separate DATA_PATH.");
 
 $properties["Server Name"] =
     new _define_commented_optional('SERVER_NAME', $_SERVER['SERVER_NAME'], "
@@ -1546,7 +1546,7 @@
     new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', "
 VIRTUAL_PATH is the canonical URL path under which your your wiki
 appears. Normally this is the same as dirname(SCRIPT_NAME), however
-using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite),
+using e.g. separate starter scripts, apaches mod_actions (or mod_rewrite),
 you can make it something different.
 
 If you do this, you should set VIRTUAL_PATH here or in the starter scripts.

Modified: trunk/doc/README.phpwiki-auth
===================================================================
--- trunk/doc/README.phpwiki-auth	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/doc/README.phpwiki-auth	2013-01-14 19:12:26 UTC (rev 8713)
@@ -22,7 +22,7 @@
 was in index.php, but it was never enabled (which probably lead to some confusion).
 Since version 1.3.8 UserAuthentificationNew is enabled.
 
-We have to seperate various storage methods for UserPreferences
+We have to separate various storage methods for UserPreferences
 (cookie, PersonalPage and database), various retrieval methods for 
 username-password pairs (AuthMethods) and various AuthPolicies.
 
@@ -62,7 +62,7 @@
   2) is a valid WikiWord (matches $WikiNameRegexp.)
 
 If true, users may be created by themselves. Otherwise we need
-seperate ALLOW_USER_PASSWORDS auth. If such a user will create a so
+separate ALLOW_USER_PASSWORDS auth. If such a user will create a so
 called HomePage named after his WikiWord userid, he will be able to
 store his preferences and password there.
 If ALLOW_ANON_EDIT = true, one may still sign in to be able to store 
@@ -165,7 +165,7 @@
 
 ! $DBAuthParams~[~]
 
-Statements for seperate DB User Authentication.
+Statements for separate DB User Authentication.
 
 This array defines the database prepare statements to select and
 update the password and preferences.  This is typically used to

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/EditToolbar.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -264,7 +264,7 @@
         }
 
         //TODO: Delegate this to run-time with showing an hidden input at the right, and do
-        // a seperate moacdropdown and xmlrpc:titleSearch.
+        // a separate moacdropdown and xmlrpc:titleSearch.
 
         // Button to generate categories, display in extra window as popup and insert
         $sr_html = HTML($sr_html, $this->categoriesPulldown());

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/InlineParser.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -490,7 +490,7 @@
      * [File:my_image.gif|what a pic] shows an inlined image linked to the page "what a pic"
      *
      * Note that for simplicity we will accept embedded object tags (non-images)
-     * here also, and seperate them later in LinkImage()
+     * here also, and separate them later in LinkImage()
      */
     elseif (strstr($link, ':')
         and ($intermap = getInterwikiMap())

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/PagePerm.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -437,7 +437,7 @@
                 or $member->isMember($creator));
         }
         /* Or named groups or usernames.
-           Note: We don't seperate groups and users here.
+           Note: We don't separate groups and users here.
            Users overrides groups with the same name.
         */
         return $user->UserName() === $group or

Modified: trunk/lib/WikiDB/backend/dbaBase.php
===================================================================
--- trunk/lib/WikiDB/backend/dbaBase.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/WikiDB/backend/dbaBase.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -31,7 +31,7 @@
  *   - Yes - RecentChanges support. Lists of most recent edits (major, minor, either).
  *     't' + mtime => 'a|i' + version+':'+pagename ('a': major, 'i': minor)
  *     Cost: Currently we have to get_all_pages and sort it by mtime.
- *     With a seperate t table we have to update this table on every version change.
+ *     With a separate t table we have to update this table on every version change.
  *   - No - list of pagenames for get_all_pages (very cheap: iterate page table)
  *   - Maybe - mostpopular list? 'h' + pagename => hits
   *

Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -121,7 +121,7 @@
                 foreach ($attribs as $attribute => $value) {
                     if ($this->relation and !$this->relation->match($attribute)) continue;
                     // The logical operator and unit unification (not yet) is encoded into
-                    // a seperate search object.
+                    // a separate search object.
                     if (!$this->search->match($value)) continue;
                     $links[] = array('pagename' => $pagename,
                         'linkname' => $attribute,

Modified: trunk/lib/WikiDB/backend.php
===================================================================
--- trunk/lib/WikiDB/backend.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/WikiDB/backend.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -703,7 +703,7 @@
  * Iterator returned by backend methods which (possibly) return
  * multiple records.
  *
- * FIXME: This might be two seperate classes: page_iter and version_iter.
+ * FIXME: This might be two separate classes: page_iter and version_iter.
  * For the versions we have WikiDB_backend_dumb_AllRevisionsIter.
  */
 class WikiDB_backend_iterator

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/WikiPlugin.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -168,7 +168,7 @@
         $gt_p = "_\\( $opt_ws $qq_p $opt_ws \\)";
         $argspec_p = "($arg_p) $opt_ws ($op_p) $opt_ws (?: $qq_p|$q_p|$gt_p|($word_p))";
 
-        // handle plugin-list arguments seperately
+        // handle plugin-list arguments separately
         $plugin_p = '<!plugin-list\s+\w+.*?!>';
         while (preg_match("/^($arg_p) $opt_ws ($op_p) $opt_ws ($plugin_p) $opt_ws/x", $argstr, $m)) {
             @ list(, $arg, $op, $plugin_val) = $m;

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/WikiTheme.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -1234,8 +1234,8 @@
 
     /**
      * Add a random header element to head
-     * TODO: first css, then js. Maybe seperate it into addJSHeaders/addCSSHeaders
-     * or use an optional type argument, and seperate it within _MoreHeaders[]
+     * TODO: first css, then js. Maybe separate it into addJSHeaders/addCSSHeaders
+     * or use an optional type argument, and separate it within _MoreHeaders[]
      */
     //$GLOBALS['request']->_MoreHeaders = array();
     function addMoreHeaders($element)
@@ -1507,7 +1507,7 @@
     }
 
     // Immediate title search results via XMLHTML(HttpRequest)
-    // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js seperately.
+    // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js separately.
     // Google's or acdropdown is better.
     function initLiveSearch()
     {

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/WikiUser.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -220,7 +220,7 @@
     }
 
     function PrintLoginForm(&$request, $args, $fail_message = false,
-                            $seperate_page = true)
+                            $separate_page = true)
     {
         include_once 'lib/Template.php';
         // Call update_locale in case the system's default language is not 'en'.
@@ -236,7 +236,7 @@
         $login = new Template('login', $request,
             compact('pagename', 'userid', 'require_level',
                 'fail_message', 'pass_required'));
-        if ($seperate_page) {
+        if ($separate_page) {
             $request->discardOutput();
             $page = $request->getPage($pagename);
             $revision = $page->getCurrentRevision();

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/WikiUserNew.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -502,7 +502,7 @@
 
     //Fixme: for _HttpAuthPassUser
     function PrintLoginForm(&$request, $args, $fail_message = false,
-                            $seperate_page = false)
+                            $separate_page = false)
     {
         include_once 'lib/Template.php';
         // Call update_locale in case the system's default language is not 'en'.
@@ -521,8 +521,8 @@
             compact('pagename', 'userid', 'require_level',
                 'fail_message', 'pass_required', 'nocache'));
         // check if the html template was already processed
-        $seperate_page = $seperate_page ? true : !alreadyTemplateProcessed('html');
-        if ($seperate_page) {
+        $separate_page = $separate_page ? true : !alreadyTemplateProcessed('html');
+        if ($separate_page) {
             $page = $request->getPage($pagename);
             $revision = $page->getCurrentRevision();
             return GeneratePage($login, _("Sign In"), $revision);

Modified: trunk/lib/XmlRpcServer.php
===================================================================
--- trunk/lib/XmlRpcServer.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/XmlRpcServer.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -936,7 +936,7 @@
  * Construct the server instance, and set up the dispatch map,
  * which maps the XML-RPC methods on to the wiki functions.
  * Provide the "wiki." prefix to each function. Besides
- * the blog - pingback, ... - functions with a seperate namespace.
+ * the blog - pingback, ... - functions with a separate namespace.
  */
 class XmlRpcServer extends xmlrpc_server
 {

Modified: trunk/lib/pear/Cache/Container/trifile.php
===================================================================
--- trunk/lib/pear/Cache/Container/trifile.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/pear/Cache/Container/trifile.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -25,7 +25,7 @@
  * Tri-file cache.
  *
  * This cache container stores files with no special encoding to reduce overhead.
- * Expiration & user data are stored in seperate files, prefixed with a '.' and
+ * Expiration & user data are stored in separate files, prefixed with a '.' and
  * suffixed with '.exp' & '.dat' respectively.
  *
  * See http://atomized.org/PEAR/Cache_trifile.html for more information.
@@ -157,4 +157,4 @@
     }
 }
 
-?>
\ No newline at end of file
+?>

Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/plugin/FrameInclude.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -21,7 +21,7 @@
  */
 
 /**
- * FrameInclude:  Display a url or page in a seperate frame inside our body.
+ * FrameInclude:  Display a url or page in a separate frame inside our body.
  *
  * Usage:
  *  <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >>
@@ -55,7 +55,7 @@
 
     function getDescription()
     {
-        return _("Display a url in a seperate frame inside our body. Only one frame allowed.");
+        return _("Display a url in a separate frame inside our body. Only one frame allowed.");
     }
 
     function getDefaultArguments()

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/plugin/RecentChanges.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -355,7 +355,7 @@
         $lmt = abs($limit);
         /**
          * Depending how this text is split up it can be tricky or
-         * impossible to translate with good grammar. So the seperate
+         * impossible to translate with good grammar. So the separate
          * strings for 1 day and %s days are necessary in this case
          * for translating to multiple languages, due to differing
          * overlapping ideal word cutting points.

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -111,7 +111,7 @@
             'autocomplete_list' => 'array:semsearch_relations'
         ), $args['s']);
         $submit = Button('submit:semsearch[relations]', _("Search"), false,
-            array('title' => 'Move to help page. No seperate window'));
+            array('title' => 'Move to help page. No separate window'));
         $instructions = _("Search in all specified pages for the expression.");
         $form = HTML::form(array('action' => $action,
                 'method' => 'post',

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/plugin/SystemInfo.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -379,7 +379,7 @@
     // Size of databases/files/cvs are possible plus the known size of the app.
     // Cache this costly operation.
     // Even if the whole plugin call is stored internally, we cache this
-    // seperately with a seperate key.
+    // separately with a separate key.
     function discspace()
     {
         global $DBParams;

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/plugin/WikiAdminUtils.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -104,7 +104,7 @@
 
         $message = call_user_func(array(&$this, $method), $request, $args);
 
-        // display as seperate page or as alert?
+        // display as separate page or as alert?
         $alert = new Alert(fmt("WikiAdminUtils %s returned:", $args['action']),
             $message,
             array(_("Back") => $args['return_url']));
@@ -231,7 +231,7 @@
         return $dbh->_backend->rebuild($args);
     }
 
-    //TODO: We need a seperate plugin for this.
+    //TODO: We need a separate plugin for this.
     //      Too many options.
     function _do_access_restrictions(&$request, &$args)
     {

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/plugin/WikiBlog.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -39,7 +39,7 @@
  *
  * HINTS/COMMENTS:
  *
- * To have the blog show up on a seperate page:
+ * To have the blog show up on a separate page:
  * On TopPage, use
  *   <<WikiBlog mode=add>>
  * Create TopPage/Blog with this page as actionpage:

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/lib/upgrade.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -806,7 +806,7 @@
 
     /**
      * if page.cached_html does not exists:
-     *   put _cached_html from pagedata into a new seperate blob,
+     *   put _cached_html from pagedata into a new separate blob,
      *   not into the huge serialized string.
      *
      * It is only rarelely needed: for current page only, if-not-modified,
@@ -849,7 +849,7 @@
     }
 
     /**
-     * move _cached_html for all pages from pagedata into a new seperate blob.
+     * move _cached_html for all pages from pagedata into a new separate blob.
      * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also.
      */
     function _convert_cached_html()

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -339,7 +339,7 @@
 $locale["Discussion"] = "Diskussion";
 $locale["Display a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten.";
 $locale["Display a set of photos listed in a text file with optional descriptions."] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen.";
-$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt.";
+$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt.";
 $locale["Display arbitrary SQL result tables."] = "Zeige Tabelle von SQL Abfragen an.";
 $locale["Display differences between revisions."] = "Zeilenweiser Vergleich der Versionen.";
 $locale["Don't cache this page."] = "Cache diese Seite nicht.";

Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten
===================================================================
--- trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten	2013-01-14 19:12:26 UTC (rev 8713)
@@ -223,7 +223,7 @@
 === Convert cached_html to new SQL column
 
   This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the 
-  new page.cached_html field seperately, and now you want to move this data from 
+  new page.cached_html field separately, and now you want to move this data from 
   page.pagedata over to page.cached_html.
 
   <<WikiAdminUtils

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -344,7 +344,7 @@
 $locale["Discussion"] = "Discussion";
 $locale["Display a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki.";
 $locale["Display a set of photos listed in a text file with optional descriptions."] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives.";
-$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé.";
+$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé.";
 $locale["Display arbitrary SQL result tables."] = "Affiche le résultat de requêtes SQL simples.";
 $locale["Display as Pdf"] = "Afficher en PDF";
 $locale["Display differences between revisions."] = "Affiche les différences entre versions.";
@@ -411,7 +411,7 @@
 $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "La page d'accueil d'un utilisateur doit être un NomWiki valide. Les préférences ne peuvent pas être enregistrées.";
 $locale["Every"] = "Toutes";
 $locale["Expiry parameters"] = "Expiration des paramètres";
-$locale["Export to a seperate public area?"] = "Exporter dans une zone publique distincte ?";
+$locale["Export to a separate public area?"] = "Exporter dans une zone publique distincte ?";
 $locale["External"] = "Externe";
 $locale["External Links"] = "Liens externes";
 $locale["External link (remember http:// prefix)"] = "Lien externe (le préfixe http:// est obligatoire)";

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/de.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2546,7 +2546,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"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."
@@ -7806,7 +7806,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/es.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2514,7 +2514,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
@@ -7643,7 +7643,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/fr.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2519,7 +2519,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"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é."
 
@@ -7715,7 +7715,7 @@
 msgstr "Rendre la page non modifiable ?"
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr "Exporter dans une zone publique distincte ?"
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/it.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2494,7 +2494,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
@@ -7588,7 +7588,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/ja.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2520,7 +2520,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
@@ -7748,7 +7748,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/nl.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2486,7 +2486,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
@@ -7572,7 +7572,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/phpwiki.pot	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2479,7 +2479,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
@@ -7560,7 +7560,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/sv.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2480,7 +2480,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr ""
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
@@ -7563,7 +7563,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/locale/po/zh.po	2013-01-14 19:12:26 UTC (rev 8713)
@@ -2580,7 +2580,7 @@
 
 #: ../lib/plugin/FrameInclude.php:58
 msgid ""
-"Display a url in a seperate frame inside our body. Only one frame allowed."
+"Display a url in a separate frame inside our body. Only one frame allowed."
 msgstr "在內容的分離框架中顯示 url. 只能放一個框架."
 
 #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63
@@ -7909,7 +7909,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-msgid "Export to a seperate public area?"
+msgid "Export to a separate public area?"
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80

Modified: trunk/pgsrc/PhpWikiDebug
===================================================================
--- trunk/pgsrc/PhpWikiDebug	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/pgsrc/PhpWikiDebug	2013-01-14 19:12:26 UTC (rev 8713)
@@ -48,7 +48,7 @@
 == Convert cached_html to new SQL column ==
 
 This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the
-new page.cached_html field seperately, and now you want to move this data from
+new page.cached_html field separately, and now you want to move this data from
 page.pagedata over to page.cached_html.
 
 <<WikiAdminUtils action=convert-cached-html label="Convert cached_html" >>

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/pgsrc/ReleaseNotes	2013-01-14 19:12:26 UTC (rev 8713)
@@ -460,7 +460,7 @@
   Some external libraries are not (Pear_DB odbc, adodb oracle)
 * fixed sql statements for pagedata where it is not needed, fixing the
   typical ~PageList memory exhaustion on simple page lists.
-  cached_html is handled complete seperate now.
+  cached_html is handled complete separate now.
 * fixed and improved WikiDB pageid caching.
 * fixed some ~WikiGroup errors for WIKIPAGE and DB
 * fixed JS_SEARCHREPLACE

Modified: trunk/schemas/mssql-initialize.sql
===================================================================
--- trunk/schemas/mssql-initialize.sql	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/schemas/mssql-initialize.sql	2013-01-14 19:12:26 UTC (rev 8713)
@@ -67,7 +67,7 @@
 -- ALTER TABLE pref ADD passwd 	CHAR(48) BINARY DEFAULT '';
 -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users';
 
--- deprecated since 1.3.12. only useful for seperate databases.
+-- deprecated since 1.3.12. only useful for separate databases.
 -- better use the extra pref table where such users can be created easily 
 -- without password.
 -- CREATE TABLE user (

Modified: trunk/schemas/mysql-initialize.sql
===================================================================
--- trunk/schemas/mysql-initialize.sql	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/schemas/mysql-initialize.sql	2013-01-14 19:12:26 UTC (rev 8713)
@@ -82,7 +82,7 @@
 -- ALTER TABLE pref ADD passwd 	CHAR(48) BINARY DEFAULT '';
 -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users';
 
--- deprecated since 1.3.12. only useful for seperate databases.
+-- deprecated since 1.3.12. only useful for separate databases.
 -- better use the extra pref table where such users can be created easily 
 -- without password.
 

Modified: trunk/schemas/sqlsrv-initialize.sql
===================================================================
--- trunk/schemas/sqlsrv-initialize.sql	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/schemas/sqlsrv-initialize.sql	2013-01-14 19:12:26 UTC (rev 8713)
@@ -1,6 +1,6 @@
 -- UNTESTED!
 
--- the CREATE FUNCTION section must be run as a seperate query. cut/paste run before executing the remainder
+-- the CREATE FUNCTION section must be run as a separate query. cut/paste run before executing the remainder
 -- of the contents of this file
 CREATE FUNCTION hasContent
 	(@ContentField varchar(max))
@@ -13,7 +13,7 @@
 RETURN 0
 
 END
--- end seperate section
+-- end separate section
 
 
 CREATE TABLE page (
@@ -85,7 +85,7 @@
 -- ALTER TABLE pref ADD passwd 	CHAR(48) BINARY DEFAULT '';
 -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users';
 
--- deprecated since 1.3.12. only useful for seperate databases.
+-- deprecated since 1.3.12. only useful for separate databases.
 -- better use the extra pref table where such users can be created easily 
 -- without password.
 -- CREATE TABLE user (

Modified: trunk/tests/makemakebuild.pl
===================================================================
--- trunk/tests/makemakebuild.pl	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/tests/makemakebuild.pl	2013-01-14 19:12:26 UTC (rev 8713)
@@ -16,7 +16,7 @@
 #  fix the url below for your server
 #  run makemakebuild.pl, this creates Makefile (gnu make) and build.xml (ant)
 #  run make, this compiles the classes and runs ant. 
-#  if your classpath is wrong run ant seperately to test.
+#  if your classpath is wrong run ant separately to test.
 #  run ant for each test. both ant and make can run independently.
 
 #my $my_wikiurl = 'http://reini/phpwiki/';  # this will replace steve's url below if defined

Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/tests/unit/test.php	2013-01-14 19:12:26 UTC (rev 8713)
@@ -98,7 +98,7 @@
                                    //'PDO_oci', 'PDO_odbc'
 
 //TODO: convert cvs test
-// For "cvs" see the seperate tests/unit_test_backend_cvs.php (cvs is experimental)
+// For "cvs" see the separate tests/unit_test_backend_cvs.php (cvs is experimental)
 //TODO: read some database values from config.ini, just use the "test_" prefix
 // "flatfile" testing occurs in "tests/unit/.testbox/flatfile"
 // "dba" needs the DATABASE_DBA_HANDLER, also in the .textbox directory

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2013-01-11 10:27:11 UTC (rev 8712)
+++ trunk/themes/default/templates/editpage.tmpl	2013-01-14 19:12:26 UTC (rev 8713)
@@ -77,7 +77,7 @@
     <?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 seperate public area?")?>"><?php echo _("Public")?></label>
+    &nbsp;&nbsp;<?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" align="right">

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

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

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

Revision: 8712
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8712&view=rev
Author:   vargenau
Date:     2013-01-11 10:27:11 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
Make FormNavigate work for jQuery 1.5+

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

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2013-01-11 10:20:47 UTC (rev 8711)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2013-01-11 10:27:11 UTC (rev 8712)
@@ -26,11 +26,11 @@
     }
     $(document).ready(function() {
         $("#editpage").FormNavigate('<?php echo _('Warning: leaving the page will lose all your modifications!') ?>');
-        $(this+ ":submit").unbind('click');
-        $(this+ ":submit[name='edit[save]']").click(function(){
+        jQuery(this).find(":submit").unbind('click');
+        jQuery(this).on('click', "submit[name='edit[save]']", function () {
             global_formNavigate = true;
         });
-        $(this+ ":input[type='image'], :submit[name='edit[preview]'], :submit[name='edit[diff]']").click(function(){
+        jQuery(this).on('click', "input[type='image'], submit[name='edit[preview]'], submit[name='edit[diff]']", function () {
             if (supports_local_storage()) {
                 if (global_formNavigate == false) {
                     window.sessionStorage.setItem('wiki_modified', 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:[8711] trunk

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

Revision: 8711
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8711&view=rev
Author:   vargenau
Date:     2013-01-11 10:20:47 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
seperated --> separated

Modified Paths:
--------------
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/InlineParser.php
    trunk/lib/PageList.php
    trunk/lib/WikiDB.php
    trunk/lib/loadsave.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/de/pgsrc/ModerierteSeite
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    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/locale/zh/LC_MESSAGES/phpwiki.php
    trunk/pgsrc/Help%2FFileInfoPlugin
    trunk/pgsrc/Help%2FFullTextSearchPlugin
    trunk/pgsrc/Help%2FLdapSearchPlugin
    trunk/pgsrc/Help%2FPageList
    trunk/pgsrc/Help%2FWikiFormRichPlugin
    trunk/pgsrc/Help%2FWikiPlugin
    trunk/themes/default/moacdropdown/js/acdropdown.js
    trunk/themes/default/moacdropdown/xmlrpc.txt
    trunk/themes/default/templates/userprefs.tmpl
    trunk/themes/fusionforge/templates/userprefs.tmpl

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/config/config-dist.ini	2013-01-11 10:20:47 UTC (rev 8711)
@@ -961,7 +961,7 @@
 ; DEFAULT_WIKI_PGSRC defines where the English pages reside.
 ;DEFAULT_WIKI_PGSRC = pgsrc
 
-; These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
+; These are ':'-separated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
 ;DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ;=========================================================================

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/configurator.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1393,7 +1393,7 @@
 
 $properties["Generic Pages"] =
     new array_variable('DEFAULT_WIKI_PAGES', array('ReleaseNotes', 'TestPage'), "
-These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
+These are ':'-separated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
 ");
 
 ///////////////////

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/InlineParser.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -617,7 +617,7 @@
 
 class Markup_semanticlink extends SimpleMarkup
 {
-    // No units seperated by space allowed here
+    // No units separated by space allowed here
     // For :: (relations) only words, no comma,
     // but for := (attributes) comma and dots are allowed. Units with groupsep.
     // Ending dots or comma are not part of the link.

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/PageList.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -725,7 +725,7 @@
         return array( // Currently supported options:
             /* what columns, what pages */
             'info' => 'pagename',
-            'exclude' => '', // also wildcards, comma-seperated lists
+            'exclude' => '', // also wildcards, comma-separated lists
             // and <!plugin-list !> arrays
             /* select pages by meta-data: */
             'author' => false, // current user by []
@@ -751,7 +751,7 @@
             'cols' => 1, // side-by-side display of list (1-3)
             'azhead' => 0, // 1: group by initials
             // 2: provide shortcut links to initials also
-            'comma' => 0, // condensed comma-seperated list,
+            'comma' => 0, // condensed comma-separated list,
             // 1 if without links, 2 if with
             'commasep' => false, // Default: ', '
             'listtype' => '', // ul (default), ol, dl, comma

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/WikiDB.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -281,7 +281,7 @@
      *        If false the result is faster in natural order.
      * @param string or false $limit Optional. Encoded as "$offset,$count".
      *         $offset defaults to 0.
-     * @param string $exclude: Optional comma-seperated list of pagenames.
+     * @param string $exclude: Optional comma-separated list of pagenames.
      *
      * @return WikiDB_PageIterator A WikiDB_PageIterator which contains all pages
      *     in the WikiDB which have non-default contents.
@@ -301,7 +301,7 @@
      * @access public
      *
      * @param boolean $include_empty If true include also empty pages
-     * @param string  $exclude:      comma-seperated list of pagenames.
+     * @param string  $exclude:      comma-separated list of pagenames.
      *             TBD: array of pagenames
      * @return integer
      *
@@ -336,7 +336,7 @@
      *        If false the result is faster in natural order.
      * @param string or false $limit Optional. Encoded as "$offset,$count".
      *         $offset defaults to 0.
-     * @param  string              $exclude: Optional comma-seperated list of pagenames.
+     * @param  string              $exclude: Optional comma-separated list of pagenames.
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
      * @see TextSearchQuery
      */
@@ -367,7 +367,7 @@
      *        If false the result is faster in natural order.
      * @param string or false $limit Optional. Encoded as "$offset,$count".
      *         $offset defaults to 0.
-     * @param  string              $exclude: Optional comma-seperated list of pagenames.
+     * @param  string              $exclude: Optional comma-separated list of pagenames.
      * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages.
      * @see TextSearchQuery
      */

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/loadsave.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -443,9 +443,9 @@
  * should be enough.
  *
  * @param string directory (optional) path to dump to. Default: HTML_DUMP_DIR
- * @param string pages     (optional) Comma-seperated of glob-style pagenames to dump.
+ * @param string pages     (optional) Comma-separated of glob-style pagenames to dump.
  *                                    Also array of pagenames allowed.
- * @param string exclude   (optional) Comma-seperated of glob-style pagenames to exclude
+ * @param string exclude   (optional) Comma-separated of glob-style pagenames to exclude
  */
 function DumpHtmlToDir(&$request)
 {

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/plugin/FullTextSearch.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -63,7 +63,7 @@
                 'regex' => 'auto',
                 'sortby' => '-hi_content',
                 'noheader' => false,
-                'exclude' => false, // comma-seperated list of glob
+                'exclude' => false, // comma-separated list of glob
                 'quiet' => true)); // be less verbose
     }
 

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/plugin/PhotoAlbum.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -49,7 +49,7 @@
  *     photo-02.jpg
  *     christmas.gif; Merry Christmas!
  *
- *     Inside textfile, filenames and optional descriptions are seperated by
+ *     Inside textfile, filenames and optional descriptions are separated by
  *     semi-colon on each line. Listed files must be in same directory as textfile
  *     itself, so don't use relative paths inside textfile.
  *

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/plugin/WikiAdminSelect.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -80,7 +80,7 @@
 
     /**
      * Preselect a list of pagenames by the supporting the following args:
-     * 's': comma-seperated list of pagename wildcards
+     * 's': comma-separated list of pagename wildcards
      * 'author', 'owner', 'creator': from WikiDB_Page
      * 'only: forgot what the difference to 's' was.
      * Sets $this->_list, which is picked up by collectPages() and is a default for p[]

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/lib/plugin/WikiFormRich.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -39,7 +39,7 @@
  * If no method is given, value will be used to fill in the valid values.
  * method="xmlrpc:server:name" or "url:http://server/wiki/method" or "array:jsvariable"
  * or "plugin:pluginname"
- * args are optional arguments, space seperated, for the method.
+ * args are optional arguments, space separated, for the method.
  * A combobox is a pulldown with autocomplete=1.
  *
  * @Author: Reini Urban

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -381,7 +381,7 @@
 $locale["Empty link to: %s"] = "Leerer Link zu: %s";
 $locale["Empty pagename!"] = "Leerer Seitenname!";
 $locale["Enable configurable polls."] = "Erlaubt konfigurierbare Umfragen.";
-$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt.";
+$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt.";
 $locale["Enter your UserId to sign in"] = "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein";
 $locale["Entry on %s by %s."] = "Kommentar zu %s von %s.";
 $locale["Enumeration"] = "Num. Liste";

Modified: trunk/locale/de/pgsrc/ModerierteSeite
===================================================================
--- trunk/locale/de/pgsrc/ModerierteSeite	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/de/pgsrc/ModerierteSeite	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:48:42 +0000
+Date: Fri, 11 Jan 2013 11:17:06 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=ModerierteSeite;
@@ -41,7 +41,7 @@
 
 == Plugin Arguments
 
-* moderators: comma seperated list of registered usernames or groups.
+* moderators: comma separated list of registered usernames or groups.
   Each user should have his email defined in his prefs. Default: "Administrators" or 
   <<SystemInfo ADMIN_USER >>
 * requirelevel: one of 0, 1, 2 or 10 on which moderation is used. Default: false (use requireaccess instead)

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/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -400,7 +400,7 @@
 $locale["Empty pagename!"] = "Nom de page vide !";
 $locale["Enable DoubleClick Edit"] = "Autoriser la modification par double clic";
 $locale["Enable configurable polls."] = "Permettre de faire des sondages configurables.";
-$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont autorisées.";
+$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont autorisées.";
 $locale["Enter your UserId to sign in"] = "Entrez votre identifiant utilisateur pour vous connecter";
 $locale["Entry on %s by %s."] = "Commentaire le %s par %s.";
 $locale["Enumeration"] = "Énumération";
@@ -1122,7 +1122,7 @@
 $locale["Unable to open directory “%s” for reading"] = "Impossible d'ouvrir le répertoire « %s » en lecture";
 $locale["Unable to read src=“%s”"] = "Impossible de lire src=%s";
 $locale["Undefined method %s for special group %s"] = "Méthode non définie %s pour le groupe %s";
-$locale["Undo"] = "Annuler l'action";
+$locale["Undo"] = "Annuler";
 $locale["Undo Search & Replace"] = "Annuler « Rechercher & Remplacer »";
 $locale["Undo disabled"] = "Annuler dernière action désactivé.";
 $locale["Unexpected EOF in zip file"] = "Fin de fichier (EOF) inattendue dans le fichier Zip";

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	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/de.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\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."
@@ -8258,7 +8258,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke "
 "(fileglobbing) erlaubt."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/es.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -8076,7 +8076,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:188

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/fr.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\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."
@@ -8161,7 +8161,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont "
 "autorisées."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/it.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\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"
@@ -8021,7 +8021,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:188

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/ja.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -8192,7 +8192,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:188

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/nl.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -8005,7 +8005,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:188

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/phpwiki.pot	2013-01-11 10:20:47 UTC (rev 8711)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -7993,7 +7993,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:188

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/sv.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -7996,7 +7996,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr ""
 
 #: ../themes/default/templates/userprefs.tmpl:188

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/po/zh.po	2013-01-11 10:20:47 UTC (rev 8711)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-08 15:25+0100\n"
+"POT-Creation-Date: 2013-01-11 11:18+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -8360,7 +8360,7 @@
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200
 msgid ""
-"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."
+"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."
 msgstr "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing)."
 
 #: ../themes/default/templates/userprefs.tmpl:188

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

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

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2013-01-11 10:20:47 UTC (rev 8711)
@@ -209,7 +209,7 @@
 $locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "空的偏好設定或 UserPreferences cookie 格式無法辨認.";
 $locale["Empty link to: %s"] = "沒有連結到: %s";
 $locale["Empty pagename!"] = "空白的頁面名稱!";
-$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing).";
+$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing).";
 $locale["Enter your UserId to sign in"] = "輸入你的帳號進行簽入";
 $locale["Error: Empty search string."] = "錯誤: 空白的搜尋字串.";
 $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "錯誤: 使用者的首頁必須是一個合法的 WikiWord. 抱歉, UserPreferences 無法儲存.";

Modified: trunk/pgsrc/Help%2FFileInfoPlugin
===================================================================
--- trunk/pgsrc/Help%2FFileInfoPlugin	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/pgsrc/Help%2FFileInfoPlugin	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1,4 +1,4 @@
-Date: Fri, 16 Dec 2011 12:51:22 +0000
+Date: Fri, 11 Jan 2013 11:16:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFileInfoPlugin;
@@ -34,7 +34,7 @@
 | //None// (required argument)
 |-
 | **display**
-| Comma-seperated string of version, size, phonysize, date, mtime, owner, name, path, dirname, link, mime-typ, magic.
+| Comma-separated string of version, size, phonysize, date, mtime, owner, name, path, dirname, link, mime-typ, magic.
 | //None// (required argument)
 |-
 | **format**

Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 14:58:45 +0000
+Date: Fri, 11 Jan 2013 11:16:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFullTextSearchPlugin;
@@ -49,7 +49,7 @@
 | false
 |-
 | **exclude**
-| Comma-seperated list of glob to exclude
+| Comma-separated list of glob to exclude
 | false
 |-
 | **quiet**

Modified: trunk/pgsrc/Help%2FLdapSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FLdapSearchPlugin	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/pgsrc/Help%2FLdapSearchPlugin	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 18:31:23 +0000
+Date: Fri, 11 Jan 2013 11:16:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLdapSearchPlugin;
@@ -53,11 +53,11 @@
 | "(cn=*)"
 |-
 | **attributes**
-| space seperated fields to return as table columns: "cn sn"
+| space separated fields to return as table columns: "cn sn"
 | empty
 |-
 | **options**
-| ldap_set_option(). Column seperated name=value pairs. Esp. needed for Windows Active directory: "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0"
+| ldap_set_option(). Column separated name=value pairs. Esp. needed for Windows Active directory: "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0"
 | LDAP_SET_OPTION if host == LDAP_AUTH_HOST
 |-
 | **user**

Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/pgsrc/Help%2FPageList	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:51:45 +0000
+Date: Fri, 11 Jan 2013 11:16:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPageList;
@@ -32,7 +32,7 @@
 | pagename
 |-
 | **exclude**
-| which pages to exclude. Wildcards, comma-seperated lists and <!plugin-list !> arrays allowed.
+| which pages to exclude. Wildcards, comma-separated lists and <!plugin-list !> arrays allowed.
 | //none//
 |-
 | **author**
@@ -68,7 +68,7 @@
 | 0
 |-
 | **comma**
-| condensed comma-seperated list, 1 if without links, 2 if with
+| condensed comma-separated list, 1 if without links, 2 if with
 | 0
 |-
 | **commasep**

Modified: trunk/pgsrc/Help%2FWikiFormRichPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiFormRichPlugin	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/pgsrc/Help%2FWikiFormRichPlugin	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 14:58:45 +0000
+Date: Fri, 11 Jan 2013 11:16:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiFormRichPlugin;
@@ -35,7 +35,7 @@
 }}}
 
 * The plugin must return a pagelist.
-* args are optional arguments, space seperated, for the method.
+* args are optional arguments, space separated, for the method.
 * A combobox is a pulldown with autocomplete=1.
 * Values which are constants are evaluated.
 * The cancel button must be supported by the action (just some wikiadmin actions so far)

Modified: trunk/pgsrc/Help%2FWikiPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiPlugin	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/pgsrc/Help%2FWikiPlugin	2013-01-11 10:20:47 UTC (rev 8711)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 18:54:26 +0000
+Date: Fri, 11 Jan 2013 11:16:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiPlugin;
@@ -90,7 +90,7 @@
 
   For details see the [[Help:PageList|PageList]] library documentation.
 
-*exclude* and *pages* accept a list of pages. Either as comma-seperated list,
+*exclude* and *pages* accept a list of pages. Either as comma-separated list,
 supporting glob-style wildcards, or via the ##<!plugin-list pluginname ~[args~] !>##
 invocation syntax, where pluginname might be any plugin returning a [[Help:PageList|PageList]].
 See PhpWiki:PluginList.

Modified: trunk/themes/default/moacdropdown/js/acdropdown.js
===================================================================
--- trunk/themes/default/moacdropdown/js/acdropdown.js	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/themes/default/moacdropdown/js/acdropdown.js	2013-01-11 10:20:47 UTC (rev 8711)
@@ -664,7 +664,7 @@
 {
 	// encoding: "xmlrpc:wiki.titleSearch [S] 4"
 	// or "xmlrpc:http://localhost/wiki/?wiki.titleSearch [S] 4"
-	//    encode the methodname as optional query_arg and the args space seperated
+	//    encode the methodname as optional query_arg and the args space separated
 	var sURL = this.sListURL
         var xmlrpc_url = data_path + '/RPC2.php'
 	var aMethodArgs = sURL.split( ' ' )

Modified: trunk/themes/default/moacdropdown/xmlrpc.txt
===================================================================
--- trunk/themes/default/moacdropdown/xmlrpc.txt	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/themes/default/moacdropdown/xmlrpc.txt	2013-01-11 10:20:47 UTC (rev 8711)
@@ -6,7 +6,7 @@
 long form (remote server):
   "xmlrpc:http://localhost/wiki/?wiki.titleSearch [S] 4"
 
-encode the methodname as optional query_arg and the args space seperated
+encode the methodname as optional query_arg and the args space separated
 args can only be strings
 
 

Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/themes/default/templates/userprefs.tmpl	2013-01-11 10:20:47 UTC (rev 8711)
@@ -175,7 +175,7 @@
   <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 seperated 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><?php echo $pref->get('notifyPages')?></td>
     <?php } ?>

Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl	2013-01-10 10:32:24 UTC (rev 8710)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl	2013-01-11 10:20:47 UTC (rev 8711)
@@ -197,7 +197,7 @@
    <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 seperated 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 } ?>

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

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

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

Revision: 8710
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8710&view=rev
Author:   vargenau
Date:     2013-01-10 10:32:24 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Undo: Annuler

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2013-01-08 14:27:18 UTC (rev 8709)
+++ trunk/locale/po/fr.po	2013-01-10 10:32:24 UTC (rev 8710)
@@ -477,7 +477,7 @@
 
 #: ../lib/EditToolbar.php:50
 msgid "Undo"
-msgstr "Annuler l'action"
+msgstr "Annuler"
 
 #: ../lib/EditToolbar.php:52
 msgid "Undo disabled"

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

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

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

Revision: 8709
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8709&view=rev
Author:   vargenau
Date:     2013-01-08 14:27:18 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Wiki page --> wiki page

Modified Paths:
--------------
    trunk/lib/plugin/CreatePage.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    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/locale/zh/LC_MESSAGES/phpwiki.php

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2012-12-29 20:51:48 UTC (rev 8708)
+++ trunk/lib/plugin/CreatePage.php	2013-01-08 14:27:18 UTC (rev 8709)
@@ -45,7 +45,7 @@
 
     function getDescription()
     {
-        return _("Create a Wiki page by the provided name.");
+        return _("Create a wiki page by the provided name.");
     }
 
     function getDefaultArguments()

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-12-29 20:51:48 UTC (rev 8708)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2013-01-08 14:27:18 UTC (rev 8709)
@@ -293,8 +293,8 @@
 $locale["Count"] = "Anzahl";
 $locale["Create Page"] = "Neue Seite";
 $locale["Create a Wiki Category Page."] = "Erzeuge eine neue Wiki-Seite.";
-$locale["Create a Wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen.";
 $locale["Create a new (sub)page"] = "Erzeuge eine neue (Unter)Seite";
+$locale["Create a wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen.";
 $locale["Create: %s"] = "Erzeugen: %s";
 $locale["CreatePage"] = "NeueSeite";
 $locale["CreateToc"] = "InhaltsVerzeichnis";

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/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-12-29 20:51:48 UTC (rev 8708)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2013-01-08 14:27:18 UTC (rev 8709)
@@ -299,8 +299,8 @@
 $locale["Count"] = "Nombre";
 $locale["Create Page"] = "Créer la page";
 $locale["Create a Wiki Category Page."] = "Créer une page wiki de catégorie.";
-$locale["Create a Wiki page by the provided name."] = "Créer une page wiki avec le nom demandé.";
 $locale["Create a new (sub)page"] = "Créer une nouvelle (sous-)page";
+$locale["Create a wiki page by the provided name."] = "Créer une page wiki avec le nom demandé.";
 $locale["Create redirect from old to new name?"] = "Créer une redirection de l'ancien nom vers le nouveau ?";
 $locale["Create: %s"] = "Créer : %s";
 $locale["CreatePage"] = "CréerUnePage";

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	2012-12-29 20:51:48 UTC (rev 8708)
+++ trunk/locale/po/de.po	2013-01-08 14:27:18 UTC (rev 8709)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 11:03+0100\n"
+"POT-Creation-Date: 2013-01-08 15:25+0100\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."
@@ -187,10 +187,10 @@
 # (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").
-#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1572
+#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1573
 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229
 #: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439
-#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278
+#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1277
 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
@@ -369,7 +369,7 @@
 "moderators at the definition in %s"
 msgstr ""
 
-#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:162
+#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:163
 #: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129
 #: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77
@@ -685,7 +685,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1154
+#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1155
 #, php-format
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
@@ -765,8 +765,8 @@
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
-#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1244
+#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1038
+#: ../lib/loadsave.php:1044 ../lib/loadsave.php:1052 ../lib/main.php:1244
 #: ../lib/main.php:1257 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191
 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
@@ -778,7 +778,7 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 #: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
-#: ../themes/Sidebar/templates/navbar.tmpl:68
+#: ../themes/Sidebar/templates/navbar.tmpl:63
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/head.tmpl:68
 #: ../themes/wikilens/templates/head.tmpl:69
@@ -898,7 +898,7 @@
 msgid "Empty pagename!"
 msgstr "Leerer Seitenname!"
 
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:699
 #, php-format
 msgid "“%s”: Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
@@ -938,17 +938,17 @@
 msgid "- saved to database as version %d"
 msgstr "- in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1296
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1297
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME-Datei %s"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1308
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialisierte Datei %s"
 
-#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1328
+#: ../lib/loadsave.php:1030 ../lib/loadsave.php:1329
 #, php-format
 msgid "plain file %s"
 msgstr "Nur-Text-Datei %s"
@@ -956,40 +956,40 @@
 # This translation gives the general idea of the action to be performed, 
 # but the text must be brief enough to fit inside a button:
 # "widersprechende Änderungen Zusammenfügen und die ergebende Seite Bearbeiten"
-#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:276
+#: ../lib/loadsave.php:1037 ../lib/plugin/SyncWiki.php:276
 msgid "Merge Edit"
 msgstr "Zusammenfügen Bearbeiten"
 
-#: ../lib/loadsave.php:1042
+#: ../lib/loadsave.php:1043
 msgid "Restore Anyway"
 msgstr "Ungeprüft überschreiben"
 
-#: ../lib/loadsave.php:1050
+#: ../lib/loadsave.php:1051
 msgid "Overwrite All"
 msgstr ""
 
-#: ../lib/loadsave.php:1057
+#: ../lib/loadsave.php:1058
 msgid " Sorry, cannot merge."
 msgstr " Konnte leider nicht automatisch einpflegen."
 
-#: ../lib/loadsave.php:1080
+#: ../lib/loadsave.php:1081
 msgid "Revert: missing required version argument"
 msgstr "Zurückspeichern: Parameter version muß angegeben werden"
 
-#: ../lib/loadsave.php:1087
+#: ../lib/loadsave.php:1088
 msgid "No revert: no page content"
 msgstr "Kein Zurückspeichern: leerer Seiteninalt"
 
-#: ../lib/loadsave.php:1092
+#: ../lib/loadsave.php:1093
 msgid "No revert: same version page"
 msgstr "Kein Zurückspeichern: selbe Version der Seite"
 
-#: ../lib/loadsave.php:1097
+#: ../lib/loadsave.php:1098
 msgid "Revert cancelled"
 msgstr "Zurückspeichern abgebrochen"
 
-#: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:109
-#: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/UserPreferences.php:120
+#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:108
+#: ../lib/plugin/PasswordReset.php:154 ../lib/plugin/UserPreferences.php:120
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:148
 #: ../lib/plugin/WikiAdminChown.php:177 ../lib/plugin/WikiAdminMarkup.php:168
 #: ../lib/plugin/WikiAdminPurge.php:151 ../lib/plugin/WikiAdminRemove.php:204
@@ -1000,8 +1000,8 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:112
-#: ../lib/plugin/PasswordReset.php:156 ../lib/plugin/TranslateText.php:117
+#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:111
+#: ../lib/plugin/PasswordReset.php:157 ../lib/plugin/TranslateText.php:117
 #: ../lib/plugin/UserPreferences.php:122 ../lib/plugin/WatchPage.php:92
 #: ../lib/plugin/WatchPage.php:97 ../lib/plugin/WikiAdminChmod.php:160
 #: ../lib/plugin/WikiAdminChown.php:190 ../lib/plugin/WikiAdminMarkup.php:181
@@ -1018,63 +1018,63 @@
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/loadsave.php:1122
+#: ../lib/loadsave.php:1123
 #, php-format
 msgid "revert to version %d"
 msgstr "Speichere Version %d zurück."
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1130
 #, php-format
 msgid "Revert: %s"
 msgstr "Zurückspeichern: %s"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1131
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1149 ../lib/WikiGroup.php:882
+#: ../lib/loadsave.php:1150 ../lib/WikiGroup.php:882
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: nicht definiert"
 
-#: ../lib/loadsave.php:1159
+#: ../lib/loadsave.php:1160
 msgid "Default InterWiki map file not loaded."
 msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1166 ../lib/PageType.php:329
+#: ../lib/loadsave.php:1167 ../lib/PageType.php:329
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
-#: ../lib/loadsave.php:1345 ../lib/loadsave.php:1359
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1360
 msgid "Skipping"
 msgstr "Übersprungen"
 
-#: ../lib/loadsave.php:1460
+#: ../lib/loadsave.php:1461
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1464
+#: ../lib/loadsave.php:1465
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Ungültiger Dateityp: %s"
 
-#: ../lib/loadsave.php:1478
+#: ../lib/loadsave.php:1479
 #, php-format
 msgid "Loading “%s”"
 msgstr "»%s« wird geladen"
 
-#: ../lib/loadsave.php:1510
+#: ../lib/loadsave.php:1511
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
-#: ../lib/loadsave.php:1565
+#: ../lib/loadsave.php:1566
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/loadsave.php:1568
+#: ../lib/loadsave.php:1569
 #, php-format
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
@@ -1129,7 +1129,7 @@
 msgstr "Seite gelöscht %s von Benutzer %s"
 
 #: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1801
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
@@ -1148,7 +1148,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:111 ../lib/WikiDB.php:1065
+#: ../lib/main.php:111 ../lib/WikiDB.php:1067
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
@@ -1417,8 +1417,8 @@
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
-#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
+#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:897
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1520
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
 #: ../themes/Crao/templates/navbar.tmpl:49
@@ -1788,8 +1788,8 @@
 msgid "Comments"
 msgstr "Kommentare"
 
-#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:75
-#: ../themes/Sidebar/templates/navbar.tmpl:66
+#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:70
+#: ../themes/Sidebar/templates/navbar.tmpl:61
 msgid "AllPages"
 msgstr "AlleSeiten"
 
@@ -2234,7 +2234,7 @@
 msgstr "Bearbeite %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1557 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2296,7 +2296,7 @@
 msgstr "NeueSeite"
 
 #: ../lib/plugin/CreatePage.php:48
-msgid "Create a Wiki page by the provided name."
+msgid "Create a wiki page by the provided name."
 msgstr "Erzeuge neue Wiki-Seite mit dem angegebenem Namen."
 
 #: ../lib/plugin/CreatePage.php:70
@@ -2382,7 +2382,7 @@
 msgid "DeadEndPages"
 msgstr "VerwaisteSeiten"
 
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1054
 #: ../themes/blog/themeinfo.php:71
 msgid "Diff"
 msgstr "Diff"
@@ -2428,7 +2428,7 @@
 #: ../lib/plugin/DynamicIncludePage.php:81
 #: ../lib/plugin/DynamicIncludePage.php:82
 #: ../lib/plugin/NewPagesPerUser.php:119 ../lib/plugin/NewPagesPerUser.php:120
-#: ../lib/plugin/RecentChanges.php:1487 ../lib/plugin/RecentChanges.php:1488
+#: ../lib/plugin/RecentChanges.php:1486 ../lib/plugin/RecentChanges.php:1487
 #: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60
 msgid "Click to hide/show"
 msgstr "Hier klicken um zu verstecken"
@@ -2836,7 +2836,7 @@
 msgid "Wiki Name"
 msgstr "Name des Wikis"
 
-#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:895
+#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:894
 #: ../lib/plugin/SemanticSearchAdvanced.php:113
 #: ../themes/Crao/templates/navbar.tmpl:40
 #: ../themes/Crao/templates/navbar.tmpl:42
@@ -2932,7 +2932,7 @@
 msgid "Links"
 msgstr "Links"
 
-#: ../lib/plugin/LinkDatabase.php:180
+#: ../lib/plugin/LinkDatabase.php:184
 #, php-format
 msgid "Unsupported format argument %s"
 msgstr "Nicht unterstützter format Parameter %s"
@@ -3257,7 +3257,7 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:138
+#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:137
 #: ../lib/plugin/SemanticSearchAdvanced.php:149
 #: ../lib/plugin/SemanticSearch.php:292
 msgid "Warning:"
@@ -3410,7 +3410,7 @@
 msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:67 ../lib/plugin/PasswordReset.php:90
-#: ../lib/plugin/PasswordReset.php:170
+#: ../lib/plugin/PasswordReset.php:171
 msgid "Error"
 msgstr ""
 
@@ -3430,41 +3430,41 @@
 msgstr ""
 "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s."
 
-#: ../lib/plugin/PasswordReset.php:99
+#: ../lib/plugin/PasswordReset.php:98
 msgid "Reset password of user: "
 msgstr "Setze Passwort für Benutzer zurück: "
 
-#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
+#: ../lib/plugin/PasswordReset.php:108 ../lib/plugin/PasswordReset.php:154
 msgid "Send e-mail"
 msgstr "Versende E-Mail"
 
-#: ../lib/plugin/PasswordReset.php:139
+#: ../lib/plugin/PasswordReset.php:138
 msgid "You need to specify the userid!"
 msgstr "Sie müssen den Benutzernamen angeben!"
 
-#: ../lib/plugin/PasswordReset.php:161
+#: ../lib/plugin/PasswordReset.php:162
 msgid "Already logged in"
 msgstr "Bereits eingeloggt"
 
-#: ../lib/plugin/PasswordReset.php:162
+#: ../lib/plugin/PasswordReset.php:163
 msgid "Changing passwords is done at "
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:171
+#: ../lib/plugin/PasswordReset.php:172
 #, php-format
 msgid "No e-mail stored for user %s."
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:173
+#: ../lib/plugin/PasswordReset.php:174
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:185
+#: ../lib/plugin/PasswordReset.php:186
 #, php-format
 msgid "Do you really want to reset the password of user %s?"
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:186
+#: ../lib/plugin/PasswordReset.php:187
 msgid "An e-mail will be sent."
 msgstr ""
 
@@ -3953,72 +3953,72 @@
 msgid "Click to add this feed to your sidebar"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:896
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Title Search"
 msgstr "TitelSuche"
 
-#: ../lib/plugin/RecentChanges.php:1283
+#: ../lib/plugin/RecentChanges.php:1282
 msgid "List all recent changes in this wiki."
 msgstr "Alle Änderungen in diesem Wiki auflisten."
 
-#: ../lib/plugin/RecentChanges.php:1495
+#: ../lib/plugin/RecentChanges.php:1494
 msgid "Show changes for:"
 msgstr "Zeige Änderungen innerhalb von:"
 
-#: ../lib/plugin/RecentChanges.php:1542
+#: ../lib/plugin/RecentChanges.php:1541
 msgid "1 day"
 msgstr "1 Tag"
 
-#: ../lib/plugin/RecentChanges.php:1544
+#: ../lib/plugin/RecentChanges.php:1543
 msgid "All time"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1546
+#: ../lib/plugin/RecentChanges.php:1545
 #, php-format
 msgid "%s days"
 msgstr "%s Tagen"
 
-#: ../lib/plugin/RecentChanges.php:1559
+#: ../lib/plugin/RecentChanges.php:1558
 msgid "All users"
 msgstr "Alle Benutzer"
 
-#: ../lib/plugin/RecentChanges.php:1562
+#: ../lib/plugin/RecentChanges.php:1561
 msgid "My modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1580
-#: ../themes/MonoBook/templates/navbar.tmpl:75
+#: ../lib/plugin/RecentChanges.php:1579
+#: ../themes/MonoBook/templates/navbar.tmpl:70
 msgid "All pages"
 msgstr "Alle Seiten"
 
-#: ../lib/plugin/RecentChanges.php:1583
+#: ../lib/plugin/RecentChanges.php:1582
 msgid "My pages only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1601
+#: ../lib/plugin/RecentChanges.php:1600
 msgid "Major modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1601
+#: ../lib/plugin/RecentChanges.php:1600
 msgid "All modifications"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1613
+#: ../lib/plugin/RecentChanges.php:1612
 msgid "Page once only"
 msgstr ""
 
 # (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").
-#: ../lib/plugin/RecentChanges.php:1613
+#: ../lib/plugin/RecentChanges.php:1612
 msgid "Full changes"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1625
+#: ../lib/plugin/RecentChanges.php:1624
 msgid "Old and new pages"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1625
+#: ../lib/plugin/RecentChanges.php:1624
 msgid "New pages only"
 msgstr "Nur neue Seiten"
 
@@ -5123,7 +5123,7 @@
 msgid "The page %s is already watched!"
 msgstr "Diese Seite %s is schon beobachtet"
 
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1052
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
@@ -5587,7 +5587,7 @@
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
 
 #: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1064
+#: ../lib/WikiTheme.php:1060
 msgid "Rename Page"
 msgstr "Seite Umbenennen"
 
@@ -6286,7 +6286,7 @@
 msgid "Sorry, this page does not exist."
 msgstr "Leider, diese Seite ist nicht in der Datenbank."
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1068
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
@@ -6314,7 +6314,7 @@
 msgid "Remove cancelled"
 msgstr "Löschen abgebrochen"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1066
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
@@ -6766,18 +6766,18 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() für dieses Backend noch nicht implementiert"
 
-#: ../lib/WikiDB.php:987
+#: ../lib/WikiDB.php:989
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
 
-#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
+#: ../lib/WikiDB.php:1757 ../lib/WikiDB.php:1761
 #: ../themes/default/templates/homepage.tmpl:6
 #, php-format
 msgid "Describe %s here."
 msgstr "Beschreiben Sie %s hier."
 
-#: ../lib/WikiDB.php:1794
+#: ../lib/WikiDB.php:1796
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Hoppla! Es scheint, die Version %s von %s wurde gelöscht!"
@@ -6966,22 +6966,22 @@
 msgid "Owner: %s"
 msgstr "Besitzer: %s"
 
-#: ../lib/WikiTheme.php:644
+#: ../lib/WikiTheme.php:640
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Leerer Link zu: %s"
 
-#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:655 ../themes/MacOSX/themeinfo.php:80
 #, php-format
 msgid "Create: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/WikiTheme.php:679
+#: ../lib/WikiTheme.php:675
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73
+#: ../lib/WikiTheme.php:1056 ../themes/blog/themeinfo.php:73
 #: ../themes/Crao/templates/signin.tmpl:12
 #: ../themes/Crao/templates/signin.tmpl:28
 #: ../themes/default/templates/signin.tmpl:14
@@ -6995,7 +6995,7 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:528
+#: ../lib/WikiTheme.php:1058 ../lib/WikiUserNew.php:528
 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
 #: ../themes/Crao/templates/signin.tmpl:51
 #: ../themes/default/templates/login.tmpl:68
@@ -7006,20 +7006,20 @@
 msgid "Sign In"
 msgstr "Anmelden"
 
-#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1062 ../themes/MacOSX/themeinfo.php:138
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:139
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/WikiTheme.php:1249
+#: ../lib/WikiTheme.php:1245
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1346 ../themes/Hawaiian/themeinfo.php:35
 #: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:111
 #: ../themes/Portland/themeinfo.php:65 ../themes/shamino_com/themeinfo.php:60
 #: ../themes/Sidebar/themeinfo.php:126 ../themes/SpaceWiki/themeinfo.php:48
@@ -7027,13 +7027,13 @@
 msgid "Printer"
 msgstr "Drucker"
 
-#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108
+#: ../lib/WikiTheme.php:1347 ../themes/MacOSX/themeinfo.php:108
 #: ../themes/MonoBook/themeinfo.php:112 ../themes/shamino_com/themeinfo.php:61
 #: ../themes/wikilens/themeinfo.php:33
 msgid "Top & bottom toolbars"
 msgstr "Obere u. untere Werkzeugleisten"
 
-#: ../lib/WikiTheme.php:1352 ../themes/Hawaiian/themeinfo.php:36
+#: ../lib/WikiTheme.php:1348 ../themes/Hawaiian/themeinfo.php:36
 #: ../themes/MonoBook/themeinfo.php:113 ../themes/Portland/themeinfo.php:66
 #: ../themes/shamino_com/themeinfo.php:62 ../themes/Sidebar/themeinfo.php:127
 #: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:34
@@ -7041,50 +7041,50 @@
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1851
+#: ../lib/WikiTheme.php:1847
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1878
+#: ../lib/WikiTheme.php:1874
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1897
 msgid "External Links"
 msgstr "Externe Links"
 
-#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
+#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:208
 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
 #: ../lib/WikiUserNew.php:646 ../lib/WikiUser/PdoDb.php:47
-#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
-#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
+#: ../lib/WikiUser/PdoDb.php:123 ../lib/WikiUser/PearDb.php:45
+#: ../lib/WikiUser/PearDb.php:137 ../lib/WikiUser.php:209
 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
 msgid "Invalid username."
 msgstr "Ungültiger Benutzername."
 
-#: ../lib/WikiUser/AdoDb.php:168 ../lib/WikiUser/PdoDb.php:153
-#: ../lib/WikiUser/PearDb.php:158
+#: ../lib/WikiUser/AdoDb.php:166 ../lib/WikiUser/PdoDb.php:151
+#: ../lib/WikiUser/PearDb.php:156
 #, php-format
 msgid "%s is missing"
 msgstr "%s Argument fehlt"
 
-#: ../lib/WikiUser/AdoDb.php:225 ../lib/WikiUser/AdoDb.php:283
-#: ../lib/WikiUser/PdoDb.php:208 ../lib/WikiUser/PdoDb.php:272
-#: ../lib/WikiUser/PearDb.php:202 ../lib/WikiUser/PearDb.php:248
+#: ../lib/WikiUser/AdoDb.php:223 ../lib/WikiUser/AdoDb.php:281
+#: ../lib/WikiUser/PdoDb.php:206 ../lib/WikiUser/PdoDb.php:269
+#: ../lib/WikiUser/PearDb.php:200 ../lib/WikiUser/PearDb.php:246
 #, php-format
 msgid "Either %s is missing or DATABASE_TYPE != “%s”"
 msgstr ""
 
 #: ../lib/WikiUser/Facebook.php:41 ../lib/WikiUser/Facebook.php:83
-#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240
+#: ../lib/WikiUser/OpenID.php:213 ../lib/WikiUser/OpenID.php:239
 #, php-format
 msgid "The PECL %s extension cannot be loaded."
 msgstr ""
 
 #: ../lib/WikiUser/Facebook.php:42 ../lib/WikiUser/Facebook.php:84
-#: ../lib/WikiUser/OpenID.php:215 ../lib/WikiUser/OpenID.php:241
+#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240
 #, php-format
 msgid " %s AUTH ignored."
 msgstr "%s AUTH ignoriert."
@@ -7161,11 +7161,11 @@
 msgid "Default preferences will be used."
 msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
 
-#: ../lib/WikiUserNew.php:1280
+#: ../lib/WikiUserNew.php:1277
 msgid "The length of the password is shorter than the system policy allows."
 msgstr "Die Länge des Passwortes ist kürzer als vom System gefordert."
 
-#: ../lib/WikiUserNew.php:1307
+#: ../lib/WikiUserNew.php:1304
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7175,11 +7175,11 @@
 "Sie können sich leider nicht anmelden.\n"
 " Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
 
-#: ../lib/WikiUserNew.php:1321
+#: ../lib/WikiUserNew.php:1318
 msgid "The crypt function is not available in this version of PHP."
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1322
+#: ../lib/WikiUserNew.php:1319
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7187,12 +7187,12 @@
 "Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
 "Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1334
+#: ../lib/WikiUserNew.php:1331
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr ""
 "Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
 
-#: ../lib/WikiUserNew.php:1805
+#: ../lib/WikiUserNew.php:1802
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7206,12 +7206,12 @@
 "versenden.\n"
 "Siehe %s"
 
-#: ../lib/WikiUserNew.php:1867
+#: ../lib/WikiUserNew.php:1864
 #, php-format
 msgid "E-mail address “%s” is not properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871
+#: ../lib/WikiUserNew.php:1868
 #, php-format
 msgid "E-mail address “%s” is properly formatted"
 msgstr ""
@@ -8706,7 +8706,7 @@
 msgstr "Verlinkte Änderungen"
 
 #: ../themes/MonoBook/templates/navbar.tmpl:55
-#: ../themes/Sidebar/templates/navbar.tmpl:68
+#: ../themes/Sidebar/templates/navbar.tmpl:63
 msgid "Administration"
 msgstr ""
 
@@ -8715,15 +8715,13 @@
 msgid "Upload images or media files"
 msgstr ""
 
-#: ../themes/MonoBook/templates/navbar.tmpl:61
-#: ../themes/MonoBook/templates/navbar.tmpl:66
-#: ../themes/Sidebar/templates/navbar.tmpl:52
-#: ../themes/Sidebar/templates/navbar.tmpl:57
+#: ../themes/MonoBook/templates/navbar.tmpl:60
+#: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "Printable version"
 msgstr ""
 
-#: ../themes/MonoBook/templates/navbar.tmpl:71
-#: ../themes/Sidebar/templates/navbar.tmpl:62
+#: ../themes/MonoBook/templates/navbar.tmpl:66
+#: ../themes/Sidebar/templates/navbar.tmpl:57
 msgid "Display as Pdf"
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-12-29 20:51:48 UTC (rev 8708)
+++ trunk/locale/po/es.po	2013-01-08 14:27:18 UTC (rev 8709)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 11:03+0100\n"
+"POT-Creation-Date: 2013-01-08 15:25+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -188,10 +188,10 @@
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1572
+#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1573
 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229
 #: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439
-#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278
+#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1277
 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
@@ -367,7 +367,7 @@
 "moderators at the definition in %s"
 msgstr ""
 
-#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:162
+#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:163
 #: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129
 #: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77
@@ -679,7 +679,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s: error mientras que maneja error:"
 
-#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1154
+#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1155
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
@@ -756,8 +756,8 @@
 msgid "Dump Pages as XHTML"
 msgstr ""
 
-#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1244
+#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1038
+#: ../lib/loadsave.php:1044 ../lib/loadsave.php:1052 ../lib/main.php:1244
 #: ../lib/main.php:1257 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191
 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
@@ -769,7 +769,7 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 #: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
-#: ../themes/Sidebar/templates/navbar.tmpl:68
+#: ../themes/Sidebar/templates/navbar.tmpl:63
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/head.tmpl:68
 #: ../themes/wikilens/templates/head.tmpl:69
@@ -884,7 +884,7 @@
 msgid "Empty pagename!"
 msgstr "¡Escriba un nombre de página!"
 
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:699
 #, php-format
 msgid "“%s”: Bad page name"
 msgstr "“%s”: Mal nombre de la página"
@@ -923,58 +923,58 @@
 msgid "- saved to database as version %d"
 msgstr "- ahorrado a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1296
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1297
 #, php-format
 msgid "MIME file %s"
 msgstr "Archivo %s del MIME"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1308
 #, php-format
 msgid "Serialized file %s"
 msgstr "Archivo serializado %s"
 
-#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1328
+#: ../lib/loadsave.php:1030 ../lib/loadsave.php:1329
 #, php-format
 msgid "plain file %s"
 msgstr "archivo llano %s"
 
-#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:276
+#: ../lib/loadsave.php:1037 ../lib/plugin/SyncWiki.php:276
 msgid "Merge Edit"
 msgstr "Fusión Editar"
 
-#: ../lib/loadsave.php:1042
+#: ../lib/loadsave.php:1043
 msgid "Restore Anyway"
 msgstr "Restore de todos modos"
 
-#: ../lib/loadsave.php:1050
+#: ../lib/loadsave.php:1051
 msgid "Overwrite All"
 msgstr "Sobreescriba Todos"
 
-#: ../lib/loadsave.php:1057
+#: ../lib/loadsave.php:1058
 msgid " Sorry, cannot merge."
 msgstr " Apesadumbrado, no puede combinarse."
 
-#: ../lib/loadsave.php:1080
+#: ../lib/loadsave.php:1081
 #, fuzzy
 msgid "Revert: missing required version argument"
 msgstr "parámetro requerido de la versión que falta"
 
-#: ../lib/loadsave.php:1087
+#: ../lib/loadsave.php:1088
 #, fuzzy
 msgid "No revert: no page content"
 msgstr "ningún contenido de la página"
 
-#: ../lib/loadsave.php:1092
+#: ../lib/loadsave.php:1093
 #, fuzzy
 msgid "No revert: same version page"
 msgstr "la misma página de la versión"
 
-#: ../lib/loadsave.php:1097
+#: ../lib/loadsave.php:1098
 msgid "Revert cancelled"
 msgstr ""
 
-#: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:109
-#: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/UserPreferences.php:120
+#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:108
+#: ../lib/plugin/PasswordReset.php:154 ../lib/plugin/UserPreferences.php:120
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:148
 #: ../lib/plugin/WikiAdminChown.php:177 ../lib/plugin/WikiAdminMarkup.php:168
 #: ../lib/plugin/WikiAdminPurge.php:151 ../lib/plugin/WikiAdminRemove.php:204
@@ -985,8 +985,8 @@
 msgid "Yes"
 msgstr "Si"
 
-#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:112
-#: ../lib/plugin/PasswordReset.php:156 ../lib/plugin/TranslateText.php:117
+#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:111
+#: ../lib/plugin/PasswordReset.php:157 ../lib/plugin/TranslateText.php:117
 #: ../lib/plugin/UserPreferences.php:122 ../lib/plugin/WatchPage.php:92
 #: ../lib/plugin/WatchPage.php:97 ../lib/plugin/WikiAdminChmod.php:160
 #: ../lib/plugin/WikiAdminChown.php:190 ../lib/plugin/WikiAdminMarkup.php:181
@@ -1003,63 +1003,63 @@
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/loadsave.php:1122
+#: ../lib/loadsave.php:1123
 #, php-format
 msgid "revert to version %d"
 msgstr "invierta a la versión %d"
 
-#: ../lib/loadsave.php:1129
+#: ../lib/loadsave.php:1130
 #, php-format
 msgid "Revert: %s"
 msgstr "Invierta: %s"
 
-#: ../lib/loadsave.php:1130
+#: ../lib/loadsave.php:1131
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- versión %d ahorrada a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1149 ../lib/WikiGroup.php:882
+#: ../lib/loadsave.php:1150 ../lib/WikiGroup.php:882
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: no definido"
 
-#: ../lib/loadsave.php:1159
+#: ../lib/loadsave.php:1160
 msgid "Default InterWiki map file not loaded."
 msgstr "Archivo del InterMapa de Wiki del defecto no cargado."
 
-#: ../lib/loadsave.php:1166 ../lib/PageType.php:329
+#: ../lib/loadsave.php:1167 ../lib/PageType.php:329
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Cargamento InterMapaDeWiki del archivo externo %s."
 
-#: ../lib/loadsave.php:1345 ../lib/loadsave.php:1359
+#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1360
 msgid "Skipping"
 msgstr "El saltar"
 
-#: ../lib/loadsave.php:1460
+#: ../lib/loadsave.php:1461
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1464
+#: ../lib/loadsave.php:1465
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Mal tipo del archivo:  %s"
 
-#: ../lib/loadsave.php:1478
+#: ../lib/loadsave.php:1479
 #, php-format
 msgid "Loading “%s”"
 msgstr "“%s” que carga"
 
-#: ../lib/loadsave.php:1510
+#: ../lib/loadsave.php:1511
 msgid "Loading up virgin wiki"
 msgstr "El cargar encima de wiki virginal"
 
-#: ../lib/loadsave.php:1565
+#: ../lib/loadsave.php:1566
 msgid "No uploaded file to upload?"
 msgstr "¿Ningún archivo uploaded a upload?"
 
-#: ../lib/loadsave.php:1568
+#: ../lib/loadsave.php:1569
 #, php-format
 msgid "Uploading %s"
 msgstr "%s uploading"
@@ -1114,7 +1114,7 @@
 msgstr "El usuarios %s eliminado página %s"
 
 #: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1801
 msgid "E-mail address confirmation"
 msgstr "Verificación Del Email"
 
@@ -1133,7 +1133,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:111 ../lib/WikiDB.php:1065
+#: ../lib/main.php:111 ../lib/WikiDB.php:1067
 msgid "Optimizing database"
 msgstr "Base de datos óptima"
 
@@ -1399,8 +1399,8 @@
 msgid "FullTextSearch"
 msgstr "BúsquedaDelTexto"
 
-#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
+#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:897
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1520
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
 #: ../themes/Crao/templates/navbar.tmpl:49
@@ -1771,8 +1771,8 @@
 msgid "Comments"
 msgstr ""
 
-#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:75
-#: ../themes/Sidebar/templates/navbar.tmpl:66
+#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:70
+#: ../themes/Sidebar/templates/navbar.tmpl:61
 msgid "AllPages"
 msgstr "TodasLasPáginas"
 
@@ -2206,7 +2206,7 @@
 msgstr "Editar %s"
 
 #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1557 ../lib/WikiUser.php:501
 #: ../themes/blog/templates/sidebar.tmpl:15
 #: ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:26
@@ -2268,7 +2268,7 @@
 msgstr "CreeLaPágina"
 
 #: ../lib/plugin/CreatePage.php:48
-msgid "Create a Wiki page by the provided name."
+msgid "Create a wiki page by the provided name."
 msgstr ""
 
 #: ../lib/plugin/CreatePage.php:70
@@ -2354,7 +2354,7 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1054
 #: ../themes/blog/themeinfo.php:71
 msgid "Diff"
 msgstr "Diferencia"
@@ -2400,7 +2400,7 @@
 #: ../lib/plugin/DynamicIncludePage.php:81
 #: ../lib/plugin/DynamicIncludePage.php:82
 #: ../lib/plugin/NewPagesPerUser.php:119 ../lib/plugin/NewPagesPerUser.php:120
-#: ../lib/plugin/RecentChanges.php:1487 ../lib/plugin/RecentChanges.php:1488
+#: ../lib/plugin/RecentChanges.php:1486 ../lib/plugin/RecentChanges.php:1487
 #: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60
 msgid "Click to hide/show"
 msgstr ""
@@ -2801,7 +2801,7 @@
 msgid "Wiki Name"
 msgstr "Nombre de la Wiki"
 
-#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:895
+#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:894
 #: ../lib/plugin/SemanticSearchAdvanced.php:113
 #: ../themes/Crao/templates/navbar.tmpl:40
 #: ../themes/Crao/templates/navbar.tmpl:42
@@ -2891,7 +2891,7 @@
 msgid "Links"
 msgstr ""
 
-#: ../lib/plugin/LinkDatabase.php:180
+#: ../lib/plugin/LinkDatabase.php:184
 #, php-format
 msgid "Unsupported format argument %s"
 msgstr ""
@@ -3188,7 +3188,7 @@
 "markup before rewrapping with emacs and checking into Subversion."
 msgstr ""
 
-#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:138
+#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:137
 #: ../lib/plugin/SemanticSearchAdvanced.php:149
 #: ../lib/plugin/SemanticSearch.php:292
 msgid "Warning:"
@@ -3340,7 +3340,7 @@
 msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:67 ../lib/plugin/PasswordReset.php:90
-#: ../lib/plugin/PasswordReset.php:170
+#: ../lib/plugin/PasswordReset.php:171
 msgid "Error"
 msgstr ""
 
@@ -3359,41 +3359,41 @@
 msgid "Error sending e-mail with password for user %s."
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:99
+#: ../lib/plugin/PasswordReset.php:98
 msgid "Reset password of user: "
 msgstr "Restablecimiento de la contraseña de usuario: "
 
-#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
+#: ../lib/plugin/PasswordReset.php:108 ../lib/plugin/PasswordReset.php:154
 msgid "Send e-mail"
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:139
+#: ../lib/plugin/PasswordReset.php:138
 msgid "You need to specify the userid!"
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:161
+#: ../lib/plugin/PasswordReset.php:162
 msgid "Already logged in"
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:162
+#: ../lib/plugin/PasswordReset.php:163
 msgid "Changing passwords is done at "
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:171
+#: ../lib/plugin/PasswordReset.php:172
 #, php-format
 msgid "No e-mail stored for user %s."
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:173
+#: ../lib/plugin/PasswordReset.php:174
 msgid "You need to ask an Administrator to reset this password. See below: "
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:185
+#: ../lib/plugin/PasswordReset.php:186
 #, php-format
 msgid "Do you really want to reset the password of user %s?"
 msgstr ""
 
-#: ../lib/plugin/PasswordReset.php:186
+#: ../lib/plugin/PasswordReset.php:187
 msgid "An e-mail will be sent."
 msgstr ""
 
@@ -3873,69 +3873,69 @@
 msgid "Click to add this feed to your sidebar"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:896
+#: ../lib/plugin/RecentChanges.php:895
 msgid "Title Search"
 msgstr "Una búsqueda de títulos"
 
-#: ../lib/plugin/RecentChanges.php:1283
+#: ../lib/plugin/RecentChanges.php:1282
 msgid "List all recent changes in this wiki."
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1495
+#: ../lib/plugin/RecentChanges.php:1494
 msgid "Show changes for:"
 msgstr "Demuestre los cambios para:"
 
-#: ../lib/plugin/RecentChanges.php:1542
+#: ../lib/plugin/RecentChanges.php:1541
 msgid "1 day"
 msgstr "1 día"
 
-#: ../lib/plugin/RecentChanges.php:1544
+#: ../lib/plugin/RecentChanges.php:1543
 msgid "All time"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1546
+#: ../lib/plugin/RecentChanges.php:1545
 #, php-format
 msgid "%s days"
 msgstr "%s dias"
 
-#: ../lib/plugin/RecentChanges.php:1559
+#: ../lib/plugin/RecentChanges.php:1558
 msgid "All users"
 msgstr "TodasLasUsuarios"
 
-#: ../lib/plugin/RecentChanges.php:1562
+#: ../lib/plugin/RecentChanges.php:1561
 msgid "My modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1580
-#: ../themes/MonoBook/templates/navbar.tmpl:75
+#: ../lib/plugin/RecentChanges.php:1579
+#: ../themes/MonoBook/templates/navbar.tmpl:70
 msgid "All pages"
 msgstr "Todas las Páginas"
 
-#: ../lib/plugin/RecentChanges.php:1583
+#: ../lib/plugin/RecentChanges.php:1582
 msgid "My pages only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1601
+#: ../lib/plugin/RecentChanges.php:1600
 msgid "Major modifications only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1601
+#: ../lib/plugin/RecentChanges.php:1600
 msgid "All modifications"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1613
+#: ../lib/plugin/RecentChanges.php:1612
 msgid "Page once only"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1613
+#: ../lib/plugin/RecentChanges.php:1612
 msgid "Full changes"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1625
+#: ../lib/plugin/RecentChanges.php:1624
 msgid "Old and new pages"
 msgstr ""
 
-#: ../lib/plugin/RecentChanges.php:1625
+#: ../lib/plugin/RecentChanges.php:1624
 msgid "New pages only"
 msgstr "Página nueva sólo"
 
@@ -5011,7 +5011,7 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1052
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
@@ -5462,7 +5462,7 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1064
+#: ../lib/WikiTheme.php:1060
 msgid "Rename Page"
 msgstr ""
 
@@ -6135,7 +6135,7 @@
 msgid "Sorry, this page does not exist."
 msgstr "Apesadumbrada, esta página no está en la base de datos."
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1068
 msgid "Purge Page"
 msgstr ""
 
@@ -6161,7 +6161,7 @@
 msgid "Remove cancelled"
 msgstr "Borrar Página"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1066
 msgid "Remove Page"
 msgstr "Borrar Página"
 
@@ -6609,18 +6609,18 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() no todavía puesto en ejecucio'n para este backend"
 
-#: ../lib/WikiDB.php:987
+#: ../lib/WikiDB.php:989
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: La fecha de la nueva revisión es %s"
 
-#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
+#: ../lib/WikiDB.php:1757 ../lib/WikiDB.php:1761
 #: ../themes/default/templates/homepage.tmpl:6
 #, php-format
 msgid "Describe %s here."
 msgstr "Describe %s aquí."
 
-#: ../lib/WikiDB.php:1794
+#: ../lib/WikiDB.php:1796
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "¡Oops! ¡La revisión %s de %s se parece haber sido suprimida!"
@@ -6812,22 +6812,22 @@
 msgid "Owner: %s"
 msgstr "Dueño: %s"
 
-#: ../lib/WikiTheme.php:644
+#: ../lib/WikiTheme.php:640
 #, php-format
 msgid "Empty link to: %s"
 msgstr "Acoplamiento vacío a: %s"
 
-#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:655 ../themes/MacOSX/themeinfo.php:80
 #, php-format
 msgid "Create: %s"
 msgstr "Cree: %s"
 
-#: ../lib/WikiTheme.php:679
+#: ../lib/WikiTheme.php:675
 #, php-format
 msgid "Google:%s"
 msgstr ""
 
-#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73
+#: ../lib/WikiTheme.php:1056 ../themes/blog/themeinfo.php:73
 #: ../themes/Crao/templates/signin.tmpl:12
 #: ../themes/Crao/templates/signin.tmpl:28
 #: ../themes/default/templates/signin.tmpl:14
@@ -6841,7 +6841,7 @@
 msgid "Sign Out"
 msgstr "Registro Hacia fuera"
 
-#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:528
+#: ../lib/WikiTheme.php:1058 ../lib/WikiUserNew.php:528
 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
 #: ../themes/Crao/templates/signin.tmpl:51
 #: ../themes/default/templates/login.tmpl:68
@@ -6852,20 +6852,20 @@
 msgid "Sign In"
 msgstr "Muestra Adentro"
 
-#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1062 ../themes/MacOSX/themeinfo.php:138
 msgid "Lock Page"
 msgstr "Bloquear Página"
 
-#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:139
 msgid "Unlock Page"
 msgstr "Desbloquear Página"
 
-#: ../lib/WikiTheme.php:1249
+#: ../lib/WikiTheme.php:1245
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1346 ../themes/Hawaiian/themeinfo.php:35
 #: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:111
 #: ../themes/Portland/themeinfo.php:65 ../themes/shamino_com/themeinfo.php:60
 #: ../themes/Sidebar/themeinfo.php:126 ../themes/SpaceWiki/themeinfo.php:48
@@ -6873,13 +6873,13 @@
 msgid "Printer"
 msgstr "Impresora"
 
-#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108
+#: ../lib/WikiTheme.php:1347 ../themes/MacOSX/themeinfo.php:108
 #: ../themes/MonoBook/themeinfo.php:112 ../themes/shamino_com/themeinfo.php:61
 #: ../themes/wikilens/themeinfo.php:33
 msgid "Top & bottom toolbars"
 msgstr "Toolbars superiores y inferiores"
 
-#: ../lib/WikiTheme.php:1352 ../themes/Hawaiian/themeinfo.php:36
+#: ../lib/WikiTheme.php:1348 ../themes/Hawaiian/themeinfo.php:36
 #: ../themes/MonoBook/themeinfo.php:113 ../themes/Portland/themeinfo.php:66
 #: ../themes/shamino_com/themeinfo.php:62 ../themes/Sidebar/themeinfo.php:127
 #: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:34
@@ -6887,50 +6887,50 @@
 msgid "Modern"
 msgstr "Moderno"
 
-#: ../lib/WikiTheme.php:1851
+#: ../lib/WikiTheme.php:1847
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: indefinido"
 
-#: ../lib/WikiTheme.php:1878
+#: ../lib/WikiTheme.php:1874
 msgid "Related Links"
 msgstr "Acoplamientos Relacionados"
 
-#: ../lib/WikiTheme.php:1901
+#: ../lib/WikiTheme.php:1897
 msgid "External Links"
 msgstr "Acoplamientos Externos"
 
-#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
+#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:208
 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
 #: ../lib/WikiUserNew.php:646 ../lib/WikiUser/PdoDb.php:47
-#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
-#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
+#: ../lib/WikiUser/PdoDb.php:123 ../lib/WikiUser/PearDb.php:45
+#: ../lib/WikiUser/PearDb.php:137 ../lib/WikiUser.php:209
 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
 msgid "Invalid username."
 msgstr "Username inválido."
 
-#: ../lib/WikiUser/AdoDb.php:168 ../lib/WikiUser/PdoDb.php:153
-#: ../lib/WikiUser/PearDb.php:158
+#: ../lib/WikiUser/AdoDb.php:166 ../lib/WikiUser/PdoDb.php:151
+#: ../lib/WikiUser/PearDb.php:156
 #, php-format
 msgid "%s is missing"
 msgstr "%s falta"
 
-#: ../lib/WikiUser/AdoDb.php:225 ../lib/WikiUser/AdoDb.php:283
-#: ../lib/WikiUser/PdoDb.php:208 ../lib/WikiUser/PdoDb.php:272
-#: ../lib/WikiUser/PearDb.php:202 ../lib/WikiUser/PearDb.php:248
+#: ../lib/WikiUser/AdoDb.php:223 ../lib/WikiUser/AdoDb.php:281
+#: ../lib/WikiUser/PdoDb.php:206 ../lib/WikiUser/PdoDb.php:269
+#: ../lib/WikiUser/PearDb.php:200 ../lib/WikiUser/PearDb.php:246
 #, fuzzy, php-format
 msgid "Either %s is missing or DATABASE_TYPE != “%s”"
 msgstr "Cualquier %s es que falta o DATABASE_TYPE != “%s”"
 
 #: ../lib/WikiUser/Facebook.php:41 ../lib/WikiUser/Facebook.php:83
-#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240
+#: ../lib/WikiUser/OpenID.php:213 ../lib/WikiUser/OpenID.php:239
 #, php-format
 msgid "The PECL %s extension cannot be loaded."
 msgstr ""
 
 #: ../lib/WikiUser/Facebook.php:42 ../lib/WikiUser/Facebook.php:84
-#: ../lib/WikiUser/OpenID.php:215 ../lib/WikiUser/OpenID.php:241
+#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240
 #, php-format
 msgid " %s AUTH ignored."
 msgstr ""
@@ -7007,13 +7007,13 @@
 msgid "Default preferences will be used."
 msgstr "Las preferencias del defecto serán utilizadas."
 
-#: ../lib/WikiUserNew.php:1280
+#: ../lib/WikiUserNew.php:1277
 msgid "The length of the password is shorter than the system policy allows."
 msgstr ""
 "La longitud de la contraseña es más corta que la política del sistema "
 "permite."
 
-#: ../lib/WikiUserNew.php:1307
+#: ../lib/WikiUserNew.php:1304
 msgid ""
 "The length of the stored password is shorter than the system policy allows. "
 "Sorry, you cannot login.\n"
@@ -7024,11 +7024,11 @@
 " Usted tiene que pedir que el administrador de sistema reajuste su "
 "contraseña."
 
-#: ../lib/WikiUserNew.php:1321
+#: ../lib/WikiUserNew.php:1318
 msgid "The crypt function is not available in this version of PHP."
 msgstr "La función de la cripta no está disponible en esta versión de PHP."
 
-#: ../lib/WikiUserNew.php:1322
+#: ../lib/WikiUserNew.php:1319
 msgid ""
 "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
 "change ADMIN_PASSWD."
@@ -7036,11 +7036,11 @@
 "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y "
 "probablemente cambio ADMIN_PASSWD."
 
-#: ../lib/WikiUserNew.php:1334
+#: ../lib/WikiUserNew.php:1331
 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
 msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini."
 
-#: ../lib/WikiUserNew.php:1805
+#: ../lib/WikiUserNew.php:1802
 #, php-format
 msgid ""
 "Welcome to %s!\n"
@@ -7053,12 +7053,12 @@
 "para enviar notificaciones del cambio de la página.\n"
 "Vea %s"
 
-#: ../lib/WikiUserNew.php:1867
+#: ../lib/WikiUserNew.php:1864
 #, php-format
 msgid "E-mail address “%s” is not properly formatted"
 msgstr "La dirección “%s” del email no se ajusta a formato correctamente"
 
-#: ../lib/WikiUserNew.php:1871
+#: ../lib/WikiUserNew.php:1868
 #, php-format
 msgid "E-mail address “%s” is properly formatted"
 msgstr "La dirección “%s” del email se ajusta a formato correctamente"
@@ -8499,7 +8499,7 @@
 msgstr "Cambios Relacionados"
 
 #: ../themes/MonoBook/templates/navbar.tmpl:55
-#: ../themes/Sidebar/templates/navbar.tmpl:68
+#: ../themes/Sidebar/templates/navbar.tmpl:63
 msgid "Administration"
 msgstr "Administración"
 
@@ -8508,15 +8508,13 @@
 msgid "Upload images or media files"
 msgstr ""
 
-#: ../themes/MonoBook/templates/navbar.tmpl:61
-#: ../themes/MonoBook/templates/navbar.tmpl:66
-#: ../themes/Sidebar/templates/navbar.tmpl:52
-#: ../themes/Sidebar/templates/navbar.tmpl:57
+#: ../themes/MonoBook/templates/navbar.tmpl:60
+#: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "Printable version"
 msgstr ""
 
-#: ../themes/MonoBook/templates/navbar.tmpl:71
-#: ../themes/Sidebar/templates/navbar.tmpl:62
+#: ../themes/MonoBook/templates/navbar.tmpl:66
+#: ../themes/Sidebar/templates/navbar.tmpl:57
 msgid "Display as Pdf"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-12-29 20:51:48 UTC (rev 8708)
+++ trunk/locale/po/fr.po	2013-01-08 14:27:18 UTC (rev 8709)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 11:03+0100\n"
+"POT-Creation-Date: 2013-01-08 15:25+0100\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."
@@ -184,10 +184,10 @@
 msgid "LinkDatabase"
 msgstr "LiensDatabase"
 
-#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1572
+#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1573
 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229
 #: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439
-#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278
+#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1277
 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
@@ -365,7 +365,7 @@
 "moderators at the definition in %s"
 msgstr ""
 
-#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:162
+#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:163
 #: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129
 #: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77
@@ -678,7 +678,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s : erreur pendant la gestion de l'erreur :"
 
-#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1154
+#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1155
 #, php-format
 msgid "%s: file not found"
 msgstr "%s : fichier non trouvé"
@@ -755,8 +755,8 @@
 msgid "Dump Pages as XHTML"
 msgstr "Exporter les pages en XHTML"
 
-#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1244
+#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1038
+#: ../lib/loadsave.php:1044 ../lib/loadsave.php:1052 ../lib/main.php:1244
 #: ../lib/main.php:1257 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191
 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
@@ -768,7 +768,7 @@
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 #: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
-#: ../themes/Sidebar/templates/navbar.tmpl:68
+#: ../themes/Sidebar/templates/navbar.tmpl:63
 #: ../themes/smaller/templates/navbar.tmpl:17
 #: ../themes/wikilens/templates/head.tmpl:68
 #: ../themes/wikilens/templates/head.tmpl:69
@@ -884,7 +884,7 @@
 msgid "Empty pagename!"
 msgstr "Nom de page vide !"
 
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:699
 #, php-format
 msgid "“%s”: Bad page name"
 msgstr "« %s » : nom de page non valide"
@@ -922,55 +922,55 @@
 msgid "- saved to database as version %d"
 msgstr "- enregistrée dans la base de données sous la version %d"
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1296
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1297
 #, php-format
 msgid "MIME file %s"
 msgstr "fichier MIME %s"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1307
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1308
 #, php-format
 msgid "Serialized file %s"
 msgstr "Fichier sérialisé %s"
 
-#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1328
+#: ../lib/loadsave.php:1030 ../lib/loadsave.php:1329
 #, php-format
 msgid "plain file %s"
 msgstr "fichier brut %s"
 
-#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:276
+#: ../lib/loadsave.php:1037 ../lib/plugin/SyncWiki.php:276
 msgid "Merge Edit"
 msgstr "Fusionner les modifications"
 
-#: ../lib/loadsave.php:1042
+#: ../lib/loadsave.php:1043
 msgid "Restore Anyway"
 msgstr "Restaurer quand même"
 
-#: ../lib/loadsave.php:1050
+#: ../lib/loadsave.php:1051
 msgid "Overwrite All"
 msgstr "Tout écraser"
 
-#: ../lib/loadsave.php:1057
+#: ../lib/loadsave.php:1058
 msgid " Sorry, cannot merge."
 msgstr " Désolé, impossible de fusionner."
 
-#: ../lib/loadsave.php:1080
+#: ../lib/loadsave.php:1081
 msgid "Revert: missing required version argument"
 msgstr "Révocation : argument de version obligatoire manquant"
 
-#: ../lib/loadsave.php:1087
+#: ../lib/loadsave.php:1088
 msgid "No revert: no page content"
 msgstr "Pas de révocation : pas de contenu dans la p...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8708] trunk/lib/plugin/RecentChanges.php

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

Revision: 8708
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8708&view=rev
Author:   vargenau
Date:     2012-12-29 20:51:48 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Use HTML list

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

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2012-12-29 20:26:09 UTC (rev 8707)
+++ trunk/lib/plugin/RecentChanges.php	2012-12-29 20:51:48 UTC (rev 8708)
@@ -803,15 +803,14 @@
         include_once 'lib/InlineParser.php';
         $last_date = '';
         $first = true;
-        $html = HTML();
+        $html = HTML::ul();
         $counter = 1;
-        $sp = HTML::Raw("\n · ");
         while ($rev = $changes->next()) {
             // enforce view permission
             if (mayAccessPage('view', $rev->_pagename)) {
                 if ($link = $this->pageLink($rev)) // some entries may be empty
                     // (/Blog/.. interim pages)
-                    $html->pushContent($sp, $link, HTML::br());
+                    $html->pushContent(HTML::li($link));
                 if ($first)
                     $this->setValidators($rev);
                 $first = false;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8707] trunk/themes/Sidebar/sidebar.css

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

Revision: 8707
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8707&view=rev
Author:   vargenau
Date:     2012-12-29 20:26:09 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Fix color

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-12-29 20:13:29 UTC (rev 8706)
+++ trunk/themes/Sidebar/sidebar.css	2012-12-29 20:26:09 UTC (rev 8707)
@@ -1213,7 +1213,6 @@
     z-index: 4;
     border: none;
     overflow: visible;
-    color: black;
     line-height: 1.2em;
 }
 
@@ -1235,7 +1234,6 @@
 #p-personal ul {
     border: none;
     line-height: 1.5em;
-    color: #2f6fab;
     padding: 0 1.5em 0 2em;
     margin: 0;
     text-align: right;
@@ -1250,7 +1248,7 @@
     border: none;
     padding: 0;
     display: inline;
-    color: #2f6fab;
+    color: white;
     margin-left: 0.8em;
     line-height: 1.2em;
     background-image: none;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8706] trunk/pgsrc/Help%2FGoodStyle

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

Revision: 8706
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8706&view=rev
Author:   vargenau
Date:     2012-12-29 20:13:29 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/pgsrc/Help%2FGoodStyle

Modified: trunk/pgsrc/Help%2FGoodStyle
===================================================================
--- trunk/pgsrc/Help%2FGoodStyle	2012-12-29 19:58:05 UTC (rev 8705)
+++ trunk/pgsrc/Help%2FGoodStyle	2012-12-29 20:13:29 UTC (rev 8706)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 29 Dec 2012 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FGoodStyle;
@@ -7,16 +7,16 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-"Young writers often suppose that style is a garnish for the meat of
+“Young writers often suppose that style is a garnish for the meat of
 prose, a sauce by which a dull dish is made palatable. Style has no
 such separate entity; it is nondetachable, unfilterable. The beginner
 should approach style warily, realizing that it is himself he is
 approaching, no other; and he should begin by turning resolutely away
 from all devices that are popularly believed to indicate style--all
 mannerisms, tricks, adornments. The approach to style is by way of
-plainness, simplicity, orderliness, sincerity."
+plainness, simplicity, orderliness, sincerity.”
 
---Strunk and White, "The Elements of Style"
+--Strunk and White, “The Elements of Style”
 
 //And thus an American textbook, typical required reading for
 10th-grade English students, unknowingly extols some virtues of

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

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

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

Revision: 8705
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8705&view=rev
Author:   vargenau
Date:     2012-12-29 19:58:05 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
format=printable does not exist

Modified Paths:
--------------
    trunk/TODO
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2012-12-29 19:43:02 UTC (rev 8704)
+++ trunk/TODO	2012-12-29 19:58:05 UTC (rev 8705)
@@ -68,7 +68,6 @@
 * SQL textsearch with multiple words: AND 
   (the two new failing unit tests)
 * fix textsearch optimize with "word -word -word"
-* format=printable (?) for non js/dom
 
 OLDER TODO's:
 Maybe (probably defer):

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2012-12-29 19:43:02 UTC (rev 8704)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2012-12-29 19:58:05 UTC (rev 8705)
@@ -57,15 +57,10 @@
     <?php if ($user->isSignedIn()) { ?>
       <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
     <?php } ?>
-    <li>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
-document.write('<?php echo $PrintableLink ?>'); // -->
+document.write('<li><?php echo $PrintableLink ?></li>'); // -->
 </script>
-<noscript>
-  <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
-</noscript>
-</li>
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { 
       // Do not display the pdf icon
       $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');
@@ -77,4 +72,3 @@
   </div>
 </div>
 <!-- end of the left (by default at least) column -->
-

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2012-12-29 19:43:02 UTC (rev 8704)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2012-12-29 19:58:05 UTC (rev 8705)
@@ -48,15 +48,10 @@
       <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
       <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
     <?php } ?>
-    <li>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
-document.write('<?php echo $PrintableLink ?>'); // -->
+document.write('<li><?php echo $PrintableLink ?></li>'); // -->
 </script>
-<noscript>
-  <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
-</noscript>
-</li>
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { 
       // Do not display the pdf icon
       $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8704] trunk/themes/Sidebar/sidebar.css

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

Revision: 8704
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8704&view=rev
Author:   vargenau
Date:     2012-12-29 19:43:02 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Fix link colors

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-12-29 11:01:56 UTC (rev 8703)
+++ trunk/themes/Sidebar/sidebar.css	2012-12-29 19:43:02 UTC (rev 8704)
@@ -71,8 +71,6 @@
 
 a {
     text-decoration: none;
-    color: #004ba6;
-    background-image: none;
 }
 
 a:visited {
@@ -91,14 +89,6 @@
     color: #772233;
 }
 
-a.new, #p-personal a.new {
-    color: #ba0000;
-}
-
-a.new:visited, #p-personal a.new:visited {
-    color: #a55858;
-}
-
 img {
     border: 0;
 }
@@ -1294,10 +1284,6 @@
     text-transform: none;
 }
 
-#p-personal a.new {
-    color: #ba0000;
-}
-
 /*
 ** the page-related actions- page/talk, edit etc
 */
@@ -1357,10 +1343,6 @@
     padding: 0 1em .2em;
 }
 
-#p-cactions .new a {
-    color: #ba0000;
-}
-
 #p-cactions li a:hover {
     z-index: 3;
     text-decoration: none;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8703] trunk/pgsrc/Help%2FWikiWikiWeb

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

Revision: 8703
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8703&view=rev
Author:   vargenau
Date:     2012-12-29 11:01:56 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
There is now a theme for discussion

Modified Paths:
--------------
    trunk/pgsrc/Help%2FWikiWikiWeb

Modified: trunk/pgsrc/Help%2FWikiWikiWeb
===================================================================
--- trunk/pgsrc/Help%2FWikiWikiWeb	2012-12-29 10:56:02 UTC (rev 8702)
+++ trunk/pgsrc/Help%2FWikiWikiWeb	2012-12-29 11:01:56 UTC (rev 8703)
@@ -1,4 +1,4 @@
-Date: Tue, 25 Jan 2011 17:23:56 +0000
+Date: Tue, 27 Dec 2012 17:23:56 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiWikiWeb;
@@ -23,8 +23,7 @@
 //The Universe tends toward chaos. The Universe tends toward Wiki.//
 
 You can say hello on [[RecentVisitors]], or read about [[Help:HowToUseWiki|HowToUseWiki]] and
-[[Help:AddingPages|AddingPages]]. Currently this Wiki has no theme for discussion, so go
-ahead and play with it and have fun!!
+[[Help:AddingPages|AddingPages]]. So go ahead and play with it and have fun!!
 
 -- [[Help:Steve Wainstead|Steve Wainstead]].
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8702] trunk/pgsrc/Help%2FInterWikiSearchPlugin

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

Revision: 8702
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8702&view=rev
Author:   vargenau
Date:     2012-12-29 10:56:02 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
InterWikiSearch

Modified Paths:
--------------
    trunk/pgsrc/Help%2FInterWikiSearchPlugin

Modified: trunk/pgsrc/Help%2FInterWikiSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FInterWikiSearchPlugin	2012-12-29 10:52:46 UTC (rev 8701)
+++ trunk/pgsrc/Help%2FInterWikiSearchPlugin	2012-12-29 10:56:02 UTC (rev 8702)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 14:58:45 +0000
+Date: Fri, 27 Dec 2012 14:58:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FInterWikiSearchPlugin;
@@ -7,7 +7,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~FullTextSearch** [[Help:WikiPlugin|plugin]] performs searches on ~InterWiki sites listed in InterWikiMap.
+The **~InterWikiSearch** [[Help:WikiPlugin|plugin]] performs searches on ~InterWiki sites listed in [[InterWikiMap]].
 
 == Usage ==
 {{{

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8701] trunk/pgsrc/Help%2FFacebookLikePlugin

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

Revision: 8701
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8701&view=rev
Author:   vargenau
Date:     2012-12-29 10:52:46 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/pgsrc/Help%2FFacebookLikePlugin

Modified: trunk/pgsrc/Help%2FFacebookLikePlugin
===================================================================
--- trunk/pgsrc/Help%2FFacebookLikePlugin	2012-12-29 10:34:26 UTC (rev 8700)
+++ trunk/pgsrc/Help%2FFacebookLikePlugin	2012-12-29 10:52:46 UTC (rev 8701)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 14:58:45 +0000
+Date: Fri, 27 Dec 2012 14:58:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFacebookLikePlugin;
@@ -7,7 +7,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~FacebookLike** [[Help:WikiPlugin|plugin]] will include a Facebook "Like" button in your wiki page.
+The **~FacebookLike** [[Help:WikiPlugin|plugin]] will include a Facebook “Like” button in your wiki page.
 
 == Usage ==
 
@@ -44,7 +44,7 @@
 | standard
 |-
 | **action**
-| 'like' 'recommend'
+| 'like' or 'recommend'
 | like
 |}
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8700] trunk/themes/MonoBook/commonPrint.css

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

Revision: 8700
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8700&view=rev
Author:   vargenau
Date:     2012-12-29 10:34:26 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Optimize border

Modified Paths:
--------------
    trunk/themes/MonoBook/commonPrint.css

Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css	2012-12-29 10:16:49 UTC (rev 8699)
+++ trunk/themes/MonoBook/commonPrint.css	2012-12-29 10:34:26 UTC (rev 8700)
@@ -96,7 +96,7 @@
     float: right;
     margin: 0;
     position: relative;
-    border: 0.5em solid White;
+    border: solid white;
     border-width: 0.5em 0 0.8em 1.4em;
 }
 
@@ -108,7 +108,7 @@
     float: left;
     margin: 0.3em 0.5em 0.5em 0;
     position: relative;
-    border: 0.5em solid White;
+    border: solid white;
     border-width: 0.5em 1.4em 0.8em 0;
 }
 
@@ -119,8 +119,7 @@
 /* thumbnails */
 div.thumb {
     margin-bottom: 0.5em;
-    border-style: solid;
-    border-color: White;
+    border: solid white;
     width: auto;
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8699] trunk/themes/blog/Kubrick.css

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

Revision: 8699
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8699&view=rev
Author:   vargenau
Date:     2012-12-29 10:16:49 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Optimize padding

Modified Paths:
--------------
    trunk/themes/blog/Kubrick.css

Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2012-12-29 10:11:38 UTC (rev 8698)
+++ trunk/themes/blog/Kubrick.css	2012-12-29 10:16:49 UTC (rev 8699)
@@ -433,7 +433,7 @@
 /* local links (override above) */
 /*
 a.namedurl[href*="the.taoofmac.com"] {
-  padding-right: 0px;
+  padding-right: 0;
   background: none;
 }
 */
@@ -481,7 +481,6 @@
 #editpage, #edit-content, .wiki-edithelp {
     /* top, right, bottom, left */
     padding: 0 0 20px 0;
-    /*margin: 0px 0 0;*/
     width: 710px;
     overflow: visible;
 }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8698] trunk/themes/default/phpwiki-topbottombars.css

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

Revision: 8698
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8698&view=rev
Author:   vargenau
Date:     2012-12-29 10:11:38 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Optimize padding

Modified Paths:
--------------
    trunk/themes/default/phpwiki-topbottombars.css

Modified: trunk/themes/default/phpwiki-topbottombars.css
===================================================================
--- trunk/themes/default/phpwiki-topbottombars.css	2012-12-27 19:31:09 UTC (rev 8697)
+++ trunk/themes/default/phpwiki-topbottombars.css	2012-12-29 10:11:38 UTC (rev 8698)
@@ -16,14 +16,10 @@
 div#header, div#footer {
     background: #FFFFF0; /* ivory */
     margin: 0;
-    padding: 0;
     position: fixed;
     left: 0;
     right: 0;
-    padding-top: 1ex;
-    padding-bottom: 1ex;
-    padding-left: 1em;
-    padding-right: 1em;
+    padding: 1ex 1em;
 }
 
 hr.toolbar {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8697] trunk/lib/plugin/PasswordReset.php

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

Revision: 8697
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8697&view=rev
Author:   vargenau
Date:     2012-12-27 19:31:09 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove unused

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

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2012-12-27 19:27:07 UTC (rev 8696)
+++ trunk/lib/plugin/PasswordReset.php	2012-12-27 19:31:09 UTC (rev 8697)
@@ -94,7 +94,6 @@
 
     function doForm(&$request, $userid = '', $header = '', $footer = '')
     {
-        $post_args = $request->getArg('admin_reset');
         if (!$header) {
             $header = HTML::p(_("Reset password of user: "),
                 HTML::Raw(' '),

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8696] trunk/lib/WikiDB/adodb/readme.htm

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

Revision: 8696
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8696&view=rev
Author:   vargenau
Date:     2012-12-27 19:27:07 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove unused class

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/readme.htm

Modified: trunk/lib/WikiDB/adodb/readme.htm
===================================================================
--- trunk/lib/WikiDB/adodb/readme.htm	2012-12-27 19:20:56 UTC (rev 8695)
+++ trunk/lib/WikiDB/adodb/readme.htm	2012-12-27 19:27:07 UTC (rev 8696)
@@ -7,7 +7,6 @@
     <!--
     body,td {font-family:Arial,Helvetica,sans-serif;font-size:11pt}
     pre {font-size:9pt}
-    .toplink {font-size:8pt}
     -->
   </style>
 </head>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8695] trunk/lib/plugin/PasswordReset.php

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

Revision: 8695
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8695&view=rev
Author:   vargenau
Date:     2012-12-27 19:20:56 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Fix return

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

Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php	2012-12-27 18:07:00 UTC (rev 8694)
+++ trunk/lib/plugin/PasswordReset.php	2012-12-27 19:20:56 UTC (rev 8695)
@@ -142,9 +142,11 @@
             }
             if ($userid and !empty($post_args['verify'])) {
                 if ($user->isAdmin()) {
-                    return $this->doReset($userid);
+                    $this->doReset($userid);
+                    return '';
                 } else {
-                    return $this->doEmail($request, $userid);
+                    $this->doEmail($request, $userid);
+                    return '';
                 }
             } elseif (empty($post_args['verify'])) {
                 //TODO: verify should check if the user exists, his prefs can be read/safed
@@ -161,7 +163,7 @@
                         $alert = new Alert(_("Already logged in"),
                             HTML(fmt("Changing passwords is done at "), WikiLink(_("UserPreferences"))));
                         $alert->show();
-                        return;
+                        return '';
                     }
                     $thisuser = WikiUser($userid);
                     $prefs = $thisuser->getPreferences();
@@ -173,7 +175,7 @@
                                 fmt("You need to ask an Administrator to reset this password. See below: "),
                                 HTML::br(), WikiLink(ADMIN_USER)));
                         $alert->show();
-                        return;
+                        return '';
                     }
                     $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified');
                     if (!$verified)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8694] trunk/lib/plugin/FileInfo.php

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

Revision: 8694
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8694&view=rev
Author:   vargenau
Date:     2012-12-27 18:07:00 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove unreachable statement

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

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2012-12-27 18:04:37 UTC (rev 8693)
+++ trunk/lib/plugin/FileInfo.php	2012-12-27 18:07:00 UTC (rev 8694)
@@ -231,7 +231,6 @@
         if (function_exists('res_list_type') or loadPhpExtension('win32std'))
             return $this->exeversion_resopen($file);
         return exeversion_showver($file);
-        return '';
     }
 
     // http://www.codeproject.com/dll/showver.asp

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8693] trunk/lib/plugin/LinkDatabase.php

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

Revision: 8693
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8693&view=rev
Author:   vargenau
Date:     2012-12-27 18:04:37 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Indent code

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

Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php	2012-12-27 17:56:07 UTC (rev 8692)
+++ trunk/lib/plugin/LinkDatabase.php	2012-12-27 18:04:37 UTC (rev 8693)
@@ -155,7 +155,11 @@
             echo "<!DOCTYPE GraphXML SYSTEM \"$dtd\">\n";
             echo "<GraphXML xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n";
             echo "<graph id=\"", MangleXmlIdentifier(WIKI_NAME), "\">\n";
-            echo '<style><line tag="node" class="main" colour="#ffffff"/><line tag="node" class="child" colour="blue"/><line tag="node" class="relation" colour="green"/></style>', "\n\n";
+            echo '<style>';
+            echo '<line tag="node" class="main" colour="#ffffff"/>';
+            echo '<line tag="node" class="child" colour="blue"/>';
+            echo '<line tag="node" class="relation" colour="green"/>';
+            echo "</style>\n\n";
             while ($page = $pages->next()) {
                 $pageid = MangleXmlIdentifier($page->getName());
                 $pagename = $page->getName();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8692] trunk/lib/wikilens/RatingsDb.php

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

Revision: 8692
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8692&view=rev
Author:   vargenau
Date:     2012-12-27 17:56:07 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove commented code

Modified Paths:
--------------
    trunk/lib/wikilens/RatingsDb.php

Modified: trunk/lib/wikilens/RatingsDb.php
===================================================================
--- trunk/lib/wikilens/RatingsDb.php	2012-12-27 11:05:49 UTC (rev 8691)
+++ trunk/lib/wikilens/RatingsDb.php	2012-12-27 17:56:07 UTC (rev 8692)
@@ -641,130 +641,6 @@
 
 }
 
-/*
-class RatingsDB_backend_PearDB
-extends WikiDB_backend_PearDB {
-    function get_rating($dimension=null, $rater=null, $ratee=null,
-                        $orderby=null, $pageinfo = "ratee") {
-        $result = $this->_get_rating_result(
-                         $dimension, $rater, $ratee, $orderby, $pageinfo);
-        return new WikiDB_backend_PearDB_generic_iter($this, $result);
-    }
-
-    function get_users_rated($dimension=null, $orderby=null) {
-        $result = $this->_get_users_rated_result(
-                         $dimension, $orderby);
-        return new WikiDB_backend_PearDB_generic_iter($this, $result);
-    }
-
-    function get_rating_page($dimension=null, $rater=null, $ratee=null,
-                             $orderby=null, $pageinfo = "ratee") {
-        $result = $this->_get_rating_result(
-                         $dimension, $rater, $ratee, $orderby, $pageinfo);
-        return new WikiDB_backend_PearDB_iter($this, $result);
-    }
-
-    function _get_rating_result($dimension=null, $rater=null, $ratee=null,
-                                $orderby=null, $pageinfo = "ratee") {
-        // pageinfo must be 'rater' or 'ratee'
-        if (($pageinfo != "ratee") && ($pageinfo != "rater"))
-            return;
-
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-
-        $where = "WHERE r." . $pageinfo . "page = p.id";
-        if (isset($dimension)) {
-            $where .= " AND dimension=$dimension";
-        }
-        if (isset($rater)) {
-            $raterid = $this->_get_pageid($rater, true);
-            $where .= " AND raterpage=$raterid";
-        }
-        if (isset($ratee)) {
-            if(is_array($ratee)){
-                $where .= " AND (";
-                for($i = 0; $i < count($ratee); $i++){
-                    $rateeid = $this->_get_pageid($ratee[$i], true);
-                    $where .= "rateepage=$rateeid";
-                    if($i != (count($ratee) - 1)){
-                        $where .= " OR ";
-                    }
-                }
-                $where .= ")";
-            } else {
-                $rateeid = $this->_get_pageid($ratee, true);
-                $where .= " AND rateepage=$rateeid";
-            }
-        }
-
-        $orderbyStr = "";
-        if (isset($orderby)) {
-            $orderbyStr = " ORDER BY " . $orderby;
-        }
-
-        $query = "SELECT *"
-            . " FROM $rating_tbl r, $page_tbl p "
-            . $where
-            . $orderbyStr;
-
-        $result = $dbh->query($query);
-
-        return $result;
-    }
-
-    function _get_users_rated_result($dimension=null, $orderby=null) {
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-
-        $where = "WHERE p.id=r.raterpage";
-        if (isset($dimension)) {
-            $where .= " AND dimension=$dimension";
-        }
-        $orderbyStr = "";
-        if (isset($orderby)) {
-            $orderbyStr = " ORDER BY " . $orderby;
-        }
-
-        $query = "SELECT DISTINCT p.pagename"
-            . " FROM $rating_tbl r, $page_tbl p "
-            . $where
-            . $orderbyStr;
-
-        $result = $dbh->query($query);
-
-        return $result;
-    }
-    function delete_rating($rater, $ratee, $dimension) {
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-
-        $this->lock();
-        $raterid = $this->_get_pageid($rater, true);
-        $rateeid = $this->_get_pageid($ratee, true);
-
-        $dbh->query("DELETE FROM $rating_tbl WHERE raterpage=$raterid and rateepage=$rateeid and dimension=$dimension");
-        $this->unlock();
-        return true;
-    }
-
-    function rate($rater, $ratee, $rateeversion, $dimension, $rating, $isPrivate = 'no') {
-        $dbh = &$this->_dbh;
-        extract($this->_table_names);
-
-        $this->lock();
-        $raterid = $this->_get_pageid($rater, true);
-        $rateeid = $this->_get_pageid($ratee, true);
-
-        $dbh->query("DELETE FROM $rating_tbl WHERE raterpage=$raterid and rateepage=$rateeid and dimension=$dimension and isPrivate='$isPrivate'");
-        // NOTE: Leave tstamp off the insert, and MySQL automatically updates it
-        $dbh->query("INSERT INTO $rating_tbl (dimension, raterpage, rateepage, ratingvalue, rateeversion, isPrivate) VALUES ($dimension, $raterid, $rateeid, $rating, $rateeversion, '$isPrivate')");
-        $this->unlock();
-        return true;
-    }
-}
-*/
-
 // Local Variables:
 // mode: php
 // tab-width: 8

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8691] trunk/lib/WikiUserNew.php

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

Revision: 8691
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8691&view=rev
Author:   vargenau
Date:     2012-12-27 11:05:49 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove commented code

Modified Paths:
--------------
    trunk/lib/WikiUserNew.php

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-12-27 11:04:56 UTC (rev 8690)
+++ trunk/lib/WikiUserNew.php	2012-12-27 11:05:49 UTC (rev 8691)
@@ -750,8 +750,7 @@
              * function too!).
              */
             if (!$UserName || $UserName == @$unboxedcookie['userid']) {
-                $updated = $this->_prefs->updatePrefs($unboxedcookie);
-                //$this->_prefs = new UserPreferences($unboxedcookie);
+                $this->_prefs->updatePrefs($unboxedcookie);
                 $UserName = @$unboxedcookie['userid'];
                 if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
                     $this->_userid = $UserName;
@@ -766,8 +765,7 @@
         if (!$UserName and ($cookie = $request->cookies->get_old("WIKI_PREF2"))) {
             if (!$unboxedcookie = $this->_prefs->retrieve($cookie)) {
                 if (!$UserName || $UserName == $unboxedcookie['userid']) {
-                    $updated = $this->_prefs->updatePrefs($unboxedcookie);
-                    //$this->_prefs = new UserPreferences($unboxedcookie);
+                    $this->_prefs->updatePrefs($unboxedcookie);
                     $UserName = $unboxedcookie['userid'];
                     if (is_string($UserName) and (substr($UserName, 0, 2) != 's:'))
                         $this->_userid = $UserName;
@@ -816,7 +814,7 @@
                 $updated = $this->_prefs->updatePrefs($prefs);
                 $prefs =& $this->_prefs;
             } else {
-                // update the prefs values from scratch. This could leed to unnecessary
+                // update the prefs values from scratch. This could lead to unnecessary
                 // side-effects: duplicate emailVerified, ...
                 $this->_prefs = new UserPreferences($prefs);
                 $updated = true;
@@ -1183,8 +1181,7 @@
             if ($restored_from_page = $this->_prefs->retrieve
             ($this->_HomePagehandle->get('pref'))
             ) {
-                $updated = $this->_prefs->updatePrefs($restored_from_page, 'init');
-                //$this->_prefs = new UserPreferences($restored_from_page);
+                $this->_prefs->updatePrefs($restored_from_page, 'init');
                 return $this->_prefs;
             }
         }
@@ -2285,74 +2282,6 @@
     }
 }
 
-/** TODO: new pref storage classes
- *  These are currently user specific and should be rewritten to be pref specific.
- *  i.e. $this == $user->_prefs
- */
-/*
-class CookieUserPreferences
-extends UserPreferences
-{
-    function CookieUserPreferences ($saved_prefs = false) {
-        //_AnonUser::_AnonUser('',$saved_prefs);
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-}
-
-class PageUserPreferences
-extends UserPreferences
-{
-    function PageUserPreferences ($saved_prefs = false) {
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-}
-
-class PearDbUserPreferences
-extends UserPreferences
-{
-    function PearDbUserPreferences ($saved_prefs = false) {
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-}
-
-class AdoDbUserPreferences
-extends UserPreferences
-{
-    function AdoDbUserPreferences ($saved_prefs = false) {
-        UserPreferences::UserPreferences($saved_prefs);
-    }
-    function getPreferences() {
-        // override the generic slow method here for efficiency
-        _AnonUser::getPreferences();
-        $this->getAuthDbh();
-        if (isset($this->_select)) {
-            $dbh = & $this->_auth_dbi;
-            $rs = $dbh->Execute(sprintf($this->_select,$dbh->qstr($this->_userid)));
-            if ($rs->EOF) {
-                $rs->Close();
-            } else {
-                $prefs_blob = $rs->fields['pref_blob'];
-                $rs->Close();
-                if ($restored_from_db = $this->_prefs->retrieve($prefs_blob)) {
-                    $updated = $this->_prefs->updatePrefs($restored_from_db);
-                    //$this->_prefs = new UserPreferences($restored_from_db);
-                    return $this->_prefs;
-                }
-            }
-        }
-        if (empty($this->_prefs->_prefs) and $this->_HomePagehandle) {
-            if ($restored_from_page = $this->_prefs->retrieve
-                ($this->_HomePagehandle->get('pref'))) {
-                $updated = $this->_prefs->updatePrefs($restored_from_page);
-                //$this->_prefs = new UserPreferences($restored_from_page);
-                return $this->_prefs;
-            }
-        }
-        return $this->_prefs;
-    }
-}
-*/
-
 // Local Variables:
 // mode: php
 // tab-width: 8

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8690] trunk/lib/WikiTheme.php

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

Revision: 8690
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8690&view=rev
Author:   vargenau
Date:     2012-12-27 11:04:56 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
Remove PHP4 comment

Modified Paths:
--------------
    trunk/lib/WikiTheme.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-12-27 11:04:00 UTC (rev 8689)
+++ trunk/lib/WikiTheme.php	2012-12-27 11:04:56 UTC (rev 8690)
@@ -552,10 +552,6 @@
     //
     ////////////////////////////////////////////////////////////////
 
-    //FIXME: PHP 4.1 Warnings
-    //lib/WikiTheme.php:84: Notice[8]: The call_user_method() function is deprecated,
-    //use the call_user_func variety with the array(&$obj, "method") syntax instead
-
     function getFormatter($type, $format)
     {
         $method = strtolower("get${type}Formatter");

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