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

[phpwiki-checkins] SF.net SVN: phpwiki:[8040] trunk/lib/plugin/WikiAdminRename.php

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

Revision: 8040
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8040&view=rev
Author:   vargenau
Date:     2011-04-13 11:26:19 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
Avoid warnings

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

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2011-04-13 09:58:48 UTC (rev 8039)
+++ trunk/lib/plugin/WikiAdminRename.php	2011-04-13 11:26:19 UTC (rev 8040)
@@ -53,12 +53,13 @@
     }
 
     function renameHelper($name, $from, $to, $options = false) {
-            if ($options['regex'])
-                return preg_replace('/'.$from.'/'.($options['icase']?'i':''), $to, $name);
-            elseif ($options['icase'])
-                return str_ireplace($from, $to, $name);
-            else
+        if (isset($options['regex'])) {
+            return preg_replace('/'.$from.'/'.(isset($options['icase'])?'i':''), $to, $name);
+        } elseif (isset($options['icase'])) {
+            return str_ireplace($from, $to, $name);
+        } else {
             return str_replace($from, $to, $name);
+        }
     }
 
     function renamePages(&$dbi, &$request, $pages, $from, $to, $updatelinks=false,
@@ -299,9 +300,9 @@
     function _getValue ($page_handle, &$revision_handle) {
         global $request;
         $post_args = $request->getArg('admin_rename');
-        $options = array('regex' => @$post_args['regex'],
-                         'icase' => @$post_args['icase']);
-
+        $options =
+          array('regex' => isset($post_args['regex']) ? $post_args['regex'] : null,
+                'icase' => isset($post_args['icase']) ? $post_args['icase'] : null);
         $value = $post_args
             ? WikiPlugin_WikiAdminRename::renameHelper
                 ($page_handle->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:[8039] trunk/lib/plugin

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

Revision: 8039
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8039&view=rev
Author:   vargenau
Date:     2011-04-13 09:58:48 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
Use braces

Modified Paths:
--------------
    trunk/lib/plugin/FrameInclude.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/WikiAdminChmod.php
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/lib/plugin/WikiAdminSetExternal.php
    trunk/lib/plugin/WikiAdminUtils.php

Modified: trunk/lib/plugin/FrameInclude.php
===================================================================
--- trunk/lib/plugin/FrameInclude.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/FrameInclude.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -73,15 +73,16 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        global $WikiTheme;
 
         $args = ($this->getArgs($argstr, $request));
         extract($args);
 
-        if ($request->getArg('action') != 'browse')
+        if ($request->getArg('action') != 'browse') {
             return $this->disabled("(action != 'browse')");
-        if (! $request->isGetOrHead())
+        }
+        if (! $request->isGetOrHead()) {
             return $this->disabled("(method != 'GET')");
+        }
 
         if (!$src and $page) {
             if ($page == $request->get('pagename')) {

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/RedirectTo.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -85,8 +85,9 @@
             return $this->error(fmt("Recursive redirect to self: '%s'", $url));
         }
 
-        if ($request->getArg('action') != 'browse')
+        if ($request->getArg('action') != 'browse') {
             return $this->disabled("(action != 'browse')");
+        }
 
         $redirectfrom = $request->getArg('redirectfrom');
         if ($redirectfrom !== false) {

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/SyncWiki.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -66,10 +66,12 @@
         $args = $this->getArgs($argstr, $request);
         $args['action'] = 'syncwiki';
         extract($args);
-        if (empty($args['url']))
+        if (empty($args['url'])) {
             return $this->error(fmt("A required argument '%s' is missing.", "url"));
-        if ($request->getArg('action') != 'browse')
+        }
+        if ($request->getArg('action') != 'browse') {
             return $this->disabled("(action != 'browse')");
+        }
         $posted = $request->getArg('wikiadminutils');
         if ($request->isPost()
             and $posted['action'] == $action

Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminChmod.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -89,8 +89,9 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if (!DEBUG)
+        if (!DEBUG) {
             return $this->disabled("WikiAdminChmod not yet enabled. Set DEBUG to try it.");
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminChown.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -102,9 +102,11 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if (!$request->getArg('action') == _("PhpWikiAdministration/Chown"))
+        if ($request->getArg('action') != 'browse') {
+            if (!$request->getArg('action') == _("PhpWikiAdministration/Chown")) {
                 return $this->disabled("(action != 'browse')");
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminMarkup.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -105,9 +105,11 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if (!$request->getArg('action') == _("PhpWikiAdministration/Markup"))
+        if ($request->getArg('action') != 'browse') {
+            if (!$request->getArg('action') == _("PhpWikiAdministration/Markup")) {
                 return $this->disabled("(action != 'browse')");
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminPurge.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -88,9 +88,11 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/Purge"))
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/Purge")) {
                 return $this->disabled("(action != 'browse')");
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args =& $args;

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminRemove.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -132,9 +132,11 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/Remove"))
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/Remove")) {
                 return $this->disabled("(action != 'browse')");
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         if (!is_numeric($args['min_age']))

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminRename.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -136,10 +136,11 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-            $action = $request->getArg('action');
+        $action = $request->getArg('action');
         if ($action != 'browse' and $action != 'rename'
-                                and $action != _("PhpWikiAdministration")."/"._("Rename"))
+                                and $action != _("PhpWikiAdministration")."/"._("Rename")) {
             return $this->disabled("(action != 'browse')");
+        }
 
         if ($action == 'rename') {
             // We rename a single page.

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -116,9 +116,10 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-            // no action=replace support yet
-        if ($request->getArg('action') != 'browse')
+        // no action=replace support yet
+        if ($request->getArg('action') != 'browse') {
             return $this->disabled("(action != 'browse')");
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -136,11 +136,14 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl"))
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/SetAcl")) {
                 return $this->disabled("(action != 'browse')");
-        if (!ENABLE_PAGEPERM)
+            }
+        }
+        if (!ENABLE_PAGEPERM) {
             return $this->disabled("ENABLE_PAGEPERM = false");
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -43,11 +43,14 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple"))
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple")) {
                 return $this->disabled("(action != 'browse')");
-        if (!ENABLE_PAGEPERM)
+            }
+        }
+        if (!ENABLE_PAGEPERM) {
             return $this->disabled("ENABLE_PAGEPERM = false");
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminSetExternal.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -91,9 +91,11 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-        if ($request->getArg('action') != 'browse')
-            if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal"))
+        if ($request->getArg('action') != 'browse') {
+            if (!$request->getArg('action') == _("PhpWikiAdministration/SetExternal")) {
                 return $this->disabled("(action != 'browse')");
+            }
+        }
 
         $args = $this->getArgs($argstr, $request);
         $this->_args = $args;

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2011-04-13 09:44:34 UTC (rev 8038)
+++ trunk/lib/plugin/WikiAdminUtils.php	2011-04-13 09:58:48 UTC (rev 8039)
@@ -54,13 +54,15 @@
         $args['action'] = strtolower($args['action']);
         extract($args);
 
-        if (!$action)
+        if (!$action) {
             $this->error("No action specified");
+        }
         if (!($default_label = $this->_getLabel($action))) {
             return HTML::div(array('class' => "error"), fmt("Bad action requested: %s", $action));
         }
-        if ($request->getArg('action') != 'browse')
+        if ($request->getArg('action') != 'browse') {
             return $this->disabled("(action != 'browse')");
+        }
 
         $posted = $request->getArg('wikiadminutils');
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8038] trunk/lib/plugin/RandomPage.php

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

Revision: 8038
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8038&view=rev
Author:   vargenau
Date:     2011-04-13 09:44:34 +0000 (Wed, 13 Apr 2011)

Log Message:
-----------
Better way to check we are in dump mode

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

Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php	2011-04-11 15:39:53 UTC (rev 8037)
+++ trunk/lib/plugin/RandomPage.php	2011-04-13 09:44:34 UTC (rev 8038)
@@ -51,14 +51,12 @@
 
     function run($dbi, $argstr, &$request, $basepage) {
 
-        global $WikiTheme;
-
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
         // Redirect would break HTML dump
-        if (!empty($WikiTheme->DUMP_MODE)) {
-            $redirect = false;
+        if ($request->getArg('action') != 'browse') {
+            return $this->disabled("(action != 'browse')");
         }
 
         // fix deprecated arg


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8037] trunk/lib/plugin/IncludePages.php

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

Revision: 8037
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8037&view=rev
Author:   vargenau
Date:     2011-04-11 15:39:53 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
IncludePage plugin has no "pages" argument. Remove it to avoid warning.

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

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2011-04-11 13:44:13 UTC (rev 8036)
+++ trunk/lib/plugin/IncludePages.php	2011-04-11 15:39:53 UTC (rev 8037)
@@ -67,6 +67,11 @@
             $argstr = preg_replace("/pages=<\?plugin-list.*?\>/", "", $argstr);
         }
 
+        // IncludePage plugin has no "pages" argument.
+        // Remove it to avoid warning.
+        $argstr = preg_replace('/pages=".*?"/', "", $argstr);
+        $argstr = preg_replace('/pages=\S*\s/', "", $argstr);
+
         foreach ($args['pages'] as $page) {
             if (empty($args['exclude']) or !in_array($page, $args['exclude'])) {
                 $html = HTML($html, $include->run($dbi, "page='$page' ".$argstr, $request, $basepage));


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

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

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

Revision: 8036
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8036&view=rev
Author:   vargenau
Date:     2011-04-11 13:44:13 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
Do not trigger error, it happens e.g. for "<<CreateToc pagename=AnotherPage>>"

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2011-04-11 12:51:58 UTC (rev 8035)
+++ trunk/lib/plugin/CreateToc.php	2011-04-11 13:44:13 UTC (rev 8036)
@@ -209,7 +209,9 @@
                 }
             }
         }
-        trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
+        // Do not trigger error, it happens e.g. for "<<CreateToc pagename=AnotherPage>>"
+        // trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
+
         return 0;
     }
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8035] trunk/lib/plugin/IncludePages.php

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

Revision: 8035
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8035&view=rev
Author:   vargenau
Date:     2011-04-11 12:51:58 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
Whitespace only

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

Modified: trunk/lib/plugin/IncludePages.php
===================================================================
--- trunk/lib/plugin/IncludePages.php	2011-04-11 09:22:33 UTC (rev 8034)
+++ trunk/lib/plugin/IncludePages.php	2011-04-11 12:51:58 UTC (rev 8035)
@@ -40,18 +40,18 @@
     }
 
     function getDefaultArguments() {
-            return array_merge(
-                           array( 'pages'   => false,  // the pages to include
+        return array_merge(array( 'pages'   => false,  // the pages to include
                                   'exclude' => false), // the pages to exclude
                            WikiPlugin_IncludePage::getDefaultArguments()
-                           );
+                          );
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
-            $html = HTML();
-        if (empty($args['pages']))
+        $html = HTML();
+        if (empty($args['pages'])) {
             return $html;
+        }
         $include = new WikiPlugin_IncludePage();
 
         if (is_string($args['exclude']) and !empty($args['exclude'])) {
@@ -67,11 +67,11 @@
             $argstr = preg_replace("/pages=<\?plugin-list.*?\>/", "", $argstr);
         }
 
-            foreach ($args['pages'] as $page) {
+        foreach ($args['pages'] as $page) {
             if (empty($args['exclude']) or !in_array($page, $args['exclude'])) {
                 $html = HTML($html, $include->run($dbi, "page='$page' ".$argstr, $request, $basepage));
             }
-            }
+        }
         return $html;
     }
 };


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

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

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

Revision: 8034
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8034&view=rev
Author:   vargenau
Date:     2011-04-11 09:22:33 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
We assume PHP >= 4.3.9, so dba_handlers exists

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/DbaDatabase.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2011-04-11 08:56:56 UTC (rev 8033)
+++ trunk/configurator.php	2011-04-11 09:22:33 UTC (rev 8034)
@@ -723,7 +723,7 @@
                     'db3'  => "DB3 - BerkeleyDB (Sleepycat) DB3. Default on Windows but not on every Linux",
                     'db4'  => "DB4 - BerkeleyDB (Sleepycat) DB4."), "
 Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br />  "
-                      . (function_exists("dba_handlers") ? join(", ",dba_handlers()) : "")
+                      . join(", ",dba_handlers())
                       . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
 
 $properties["dba timeout"] =

Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php	2011-04-11 08:56:56 UTC (rev 8033)
+++ trunk/lib/DbaDatabase.php	2011-04-11 09:22:33 UTC (rev 8034)
@@ -14,14 +14,12 @@
         $this->_handler = $handler;
         $this->_timeout = DBA_DATABASE_DEFAULT_TIMEOUT;
         $this->_dbh = false;
-        if (function_exists("dba_handlers")) { // since php-4.3.0
-            if (!in_array($handler, dba_handlers()))
-                $this->_error(
-                    sprintf(
-                        _("The DBA handler %s is unsupported!")."\n".
-                            _("Supported handlers are: %s"),
-                            $handler, join(",",dba_handlers())));
-        }
+        if (!in_array($handler, dba_handlers()))
+            $this->_error(
+                sprintf(
+                    _("The DBA handler %s is unsupported!")."\n".
+                        _("Supported handlers are: %s"),
+                         $handler, join(",",dba_handlers())));
         $this->readonly = false;
         if ($mode)
             $this->open($mode);


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8033] trunk/INSTALL

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

Revision: 8033
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8033&view=rev
Author:   vargenau
Date:     2011-04-11 08:56:56 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
PHP 5.3.6

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2011-04-11 08:46:26 UTC (rev 8032)
+++ trunk/INSTALL	2011-04-11 08:56:56 UTC (rev 8033)
@@ -6,7 +6,7 @@
 5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3.
 
 All users of PHP are strongly encouraged to upgrade to PHP 5.2.17
-or PHP 5.3.5 that are the supported versions.
+or PHP 5.3.6 that are the supported versions.
 Visit <http://www.php.net> for downloads and information.
 
 You need the Perl regular expressions package compiled in; this is the


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

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

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

Revision: 8032
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8032&view=rev
Author:   vargenau
Date:     2011-04-11 08:46:26 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
Fix syntax error

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2011-04-11 08:36:32 UTC (rev 8031)
+++ trunk/lib/WikiTheme.php	2011-04-11 08:46:26 UTC (rev 8032)
@@ -272,7 +272,7 @@
         }
         else if (!$missing_okay) {
             trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
-            if ((DEBUG & _DEBUG_TRACE) {
+            if (DEBUG & _DEBUG_TRACE) {
                 echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
             }
         }


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

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

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

Revision: 8031
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8031&view=rev
Author:   vargenau
Date:     2011-04-11 08:36:32 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
We assume PHP >= 4.3.9, so debug_backtrace exists

Modified Paths:
--------------
    trunk/lib/ErrorManager.php
    trunk/lib/WikiDB/backend/PearDB.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiTheme.php
    trunk/tests/unit/test.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/ErrorManager.php	2011-04-11 08:36:32 UTC (rev 8031)
@@ -274,8 +274,7 @@
 
             if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
                 echo "error_reporting=",error_reporting(),"\n<br />";
-                if (function_exists("debug_backtrace")) // >= 4.3.0
-                    $error->printSimpleTrace(debug_backtrace());
+                $error->printSimpleTrace(debug_backtrace());
             }
         $this->_die($error);
         }
@@ -299,8 +298,7 @@
                 $this->_noCacheHeaders();
                 if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
                     echo "error_reporting=",error_reporting(),"\n";
-                    if (function_exists("debug_backtrace")) // >= 4.3.0
-                        $error->printSimpleTrace(debug_backtrace());
+                    $error->printSimpleTrace(debug_backtrace());
                 }
                 $error->printXML();
             }

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/WikiDB/backend/PearDB.php	2011-04-11 08:36:32 UTC (rev 8031)
@@ -40,7 +40,7 @@
             $ErrorManager->pushErrorHandler(new WikiMethodCb($this, '_pear_notice_filter'));
             $this->_pearerrhandler = true;
         }
-      
+
         // Open connection to database
         $this->_dsn = $dbparams['dsn'];
 	$this->_dbparams = $dbparams;
@@ -59,7 +59,7 @@
                           isset($dbparams['_tryroot_from_upgrade']) // hack!
                             ? E_USER_WARNING : E_USER_ERROR);
             if (isset($dbparams['_tryroot_from_upgrade']))
-                return;              
+                return;
         }
         $dbh->setErrorHandling(PEAR_ERROR_CALLBACK,
                                array($this, '_pear_error_callback'));
@@ -84,9 +84,9 @@
                     'maxversion'   => "MAX(version)",
                     'notempty'     => "<>''",
                     'iscontent'    => "content<>''");
-      
+
     }
-  
+
     /**
      * Close database connection.
      */
@@ -120,7 +120,7 @@
                                     . "   AND pagename='%s'",
                                     $dbh->escapeSimple($pagename)));
     }
-      
+
     function get_all_pagenames() {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
@@ -136,7 +136,7 @@
                             . " FROM $nonempty_tbl, $page_tbl"
                             . " WHERE $nonempty_tbl.id=$page_tbl.id");
     }
-  
+
     function increaseHitCount($pagename) {
         $dbh = &$this->_dbh;
         // Hits is the only thing we can update in a fast manner.
@@ -192,7 +192,7 @@
             $data = array();
             $this->_get_pageid($pagename, true); // Creates page record
         }
-      
+
         $hits = !empty($data['hits']) ? (int)$data['hits'] : 0;
         unset($data['hits']);
 
@@ -239,7 +239,7 @@
     }
 
     function _get_pageid($pagename, $create_if_missing = false) {
-      
+
         // check id_cache
         global $request;
         $cache =& $request->_dbi->_cache->_id_cache;
@@ -254,7 +254,7 @@
 
         $dbh = &$this->_dbh;
         $page_tbl = $this->_table_names['page_tbl'];
-      
+
         $query = sprintf("SELECT id FROM $page_tbl WHERE pagename='%s'",
                          $dbh->escapeSimple($pagename));
 
@@ -291,7 +291,7 @@
     function get_previous_version($pagename, $version) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
-      
+
         return
             (int)$dbh->getOne(sprintf("SELECT version"
                                       . " FROM $version_tbl, $page_tbl"
@@ -305,7 +305,7 @@
                                       $dbh->escapeSimple($pagename),
                                       $version));
     }
-  
+
     /**
      * Get version data.
      *
@@ -321,7 +321,7 @@
 
         assert(is_string($pagename) and $pagename != "");
         assert($version > 0);
-      
+
         //trigger_error("GET_REVISION $pagename $version $want_content", E_USER_NOTICE);
         // FIXME: optimization: sometimes don't get page data?
         if ($want_content) {
@@ -358,10 +358,10 @@
                 base64_decode($query_result['versiondata']);
         }
         $data = $this->_unserialize($query_result['versiondata']);
-      
+
         $data['mtime'] = $query_result['mtime'];
         $data['is_minor_edit'] = !empty($query_result['minor_edit']);
-      
+
         if (isset($query_result['content']))
             $data['%content'] = $query_result['content'];
         elseif ($query_result['have_content'])
@@ -387,10 +387,10 @@
     function set_versiondata($pagename, $version, $data) {
         $dbh = &$this->_dbh;
         $version_tbl = $this->_table_names['version_tbl'];
-      
+
         $minor_edit = (int) !empty($data['is_minor_edit']);
         unset($data['is_minor_edit']);
-      
+
         $mtime = (int)$data['mtime'];
         unset($data['mtime']);
         assert(!empty($mtime));
@@ -399,7 +399,7 @@
         unset($data['%content']);
 
         unset($data['%pagedata']);
-      
+
         $this->lock();
         $id = $this->_get_pageid($pagename, true);
 
@@ -415,10 +415,10 @@
 
         $this->_update_recent_table($id);
         $this->_update_nonempty_table($id);
-      
+
         $this->unlock();
     }
-  
+
     /**
      * Delete an old revision of a page.
      */
@@ -469,7 +469,7 @@
     function purge_page($pagename) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
-      
+
         $this->lock();
         if ( ($id = $this->_get_pageid($pagename, false)) ) {
             $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id");
@@ -532,7 +532,6 @@
                 $linkid = $this->_get_pageid($linkto, true);
               	if (!$linkid) {
                	    echo("No link for $linkto on page $pagename");
-               	    //printSimpleTrace(debug_backtrace());
                	    trigger_error("No link for $linkto on page $pagename");
                 }
                 assert($linkid);
@@ -543,7 +542,7 @@
 	}
         $this->unlock();
     }
-  
+
     /**
      * Find pages which link to or are linked from a page.
      *
@@ -589,7 +588,7 @@
         } else {
             $result = $dbh->query($sql);
         }
-      
+
         return new WikiDB_backend_PearDB_iter($this, $result);
     }
 
@@ -672,7 +671,7 @@
         }
         return new WikiDB_backend_PearDB_iter($this, $result, $options);
     }
-      
+
     /**
      * Title search.
      * Todo: exclude
@@ -691,7 +690,7 @@
         if (!class_exists($searchclass))
             $searchclass = "WikiDB_backend_PearDB_search";
         $searchobj = new $searchclass($search, $dbh);
-      
+
         $table = "$nonempty_tbl, $page_tbl";
         $join_clause = "$nonempty_tbl.id=$page_tbl.id";
         $fields = $this->page_tbl_fields;
@@ -709,7 +708,7 @@
             $callback = new WikiMethodCb($searchobj, "_pagename_match_clause");
         }
         $search_clause = $search->makeSqlClauseObj($callback);
-      
+
         $sql = "SELECT $fields FROM $table"
             . " WHERE $join_clause"
             . "  AND ($search_clause)"
@@ -720,7 +719,7 @@
          } else {
              $result = $dbh->query($sql);
          }
-      
+
         $iter = new WikiDB_backend_PearDB_iter($this, $result);
         $iter->stoplisted = @$searchobj->stoplisted;
         return $iter;
@@ -811,7 +810,6 @@
         if ($since)
             $pick[] = "mtime >= $since";
 	
-      
         if ($include_all_revisions) {
             // Include all revisions of each page.
             $table = "$page_tbl, $version_tbl";
@@ -831,7 +829,7 @@
             $join_clause = "$page_tbl.id=$recent_tbl.id";
             $table .= ", $version_tbl";
             $join_clause .= " AND $version_tbl.id=$page_tbl.id";
-          
+
             if ($exclude_major_revisions) {
                 // Include only most recent minor revision
                 $pick[] = 'version=latestminor';
@@ -916,7 +914,7 @@
     function rename_page ($pagename, $to) {
         $dbh = &$this->_dbh;
         extract($this->_table_names);
-      
+
         $this->lock();
         if (($id = $this->_get_pageid($pagename, false)) ) {
             if ($new = $this->_get_pageid($to, false)) {
@@ -976,7 +974,7 @@
                     //. "  AND content<>''"
                     . "  AND content $notempty"
                     . ( $pageid ? " AND $recent_tbl.id=$pageid" : ""));
-      
+
         $this->unlock();
     }
 
@@ -1000,7 +998,7 @@
     function _lock_tables($write_lock) {
         trigger_error("virtual", E_USER_ERROR);
     }
-  
+
     /**
      * Release a write lock on the tables in the SQL database.
      *
@@ -1044,7 +1042,7 @@
     function _unserialize($data) {
         return empty($data) ? array() : unserialize($data);
     }
-  
+
     /**
      * Callback for PEAR (DB) errors.
      *
@@ -1055,7 +1053,7 @@
     function _pear_error_callback($error) {
         if ($this->_is_false_error($error))
             return;
-      
+
         $this->_dbh->setErrorHandling(PEAR_ERROR_PRINT);	// prevent recursive loops.
         $this->close();
         trigger_error($this->_pear_error_message($error), E_USER_ERROR);
@@ -1084,13 +1082,13 @@
             //" <--kludge for brain-dead syntax coloring
             return false;
         }
-      
+
         if (! in_array('ismanip', get_class_methods('DB'))) {
             // Pear shipped with PHP 4.0.4pl1 (and before, presumably)
             // does not have the DB::isManip method.
             return true;
         }
-      
+
         if (DB::isManip($query)) {
             // If Pear thinks it's an isManip then it wouldn't have thrown
             // the error we're testing for....
@@ -1187,7 +1185,7 @@
             // This shouldn't happen, I thought.
             $backend->_pear_error_callback($query_result);
         }
-      
+
         $this->_backend = &$backend;
         $this->_result = $query_result;
         $this->_options = $field_list;
@@ -1198,7 +1196,7 @@
             return false;
         return $this->_result->numRows();
     }
-  
+
     function next() {
         if (!$this->_result)
             return false;
@@ -1208,7 +1206,7 @@
             $this->free();
             return false;
         }
-      
+
         return $record;
     }
 
@@ -1247,7 +1245,7 @@
             $this->free();
             return false;
         }
-      
+
         $pagedata = $backend->_extract_page_data($record);
         $rec = array('pagename' => $record['pagename'],
                      'pagedata' => $pagedata);
@@ -1256,7 +1254,7 @@
             $rec['versiondata'] = $backend->_extract_version_data($record);
             $rec['version'] = $record['version'];
         }
-      
+
         return $rec;
     }
 }
@@ -1273,5 +1271,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/WikiDB.php	2011-04-11 08:36:32 UTC (rev 8031)
@@ -675,9 +675,7 @@
     // SQL result: for simple select or create/update queries
     // returns the database specific resource type
     function genericSqlQuery($sql, $args=false) {
-        if (function_exists('debug_backtrace')) { // >= 4.3.0
-            echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
-        }
+        echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
         trigger_error("no SQL database", E_USER_ERROR);
         return false;
     }
@@ -685,9 +683,7 @@
     // SQL iter: for simple select or create/update queries
     // returns the generic iterator object (count,next)
     function genericSqlIter($sql, $field_list = NULL) {
-        if (function_exists('debug_backtrace')) { // >= 4.3.0
-            echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
-        }
+        echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
         trigger_error("no SQL database", E_USER_ERROR);
         return false;
     }
@@ -738,7 +734,7 @@
             if (!(is_string($pagename) and $pagename != '')) {
                 if (function_exists("xdebug_get_function_stack")) {
                     echo "xdebug_get_function_stack(): "; var_dump(xdebug_get_function_stack());
-                } elseif (function_exists("debug_backtrace")) { // >= 4.3.0
+                } else {
                     printSimpleTrace(debug_backtrace());
                 }
                 trigger_error("empty pagename", E_USER_WARNING);

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/lib/WikiTheme.php	2011-04-11 08:36:32 UTC (rev 8031)
@@ -272,7 +272,7 @@
         }
         else if (!$missing_okay) {
             trigger_error("$this->_theme/$file: not found", E_USER_NOTICE);
-            if ((DEBUG & _DEBUG_TRACE) && function_exists('debug_backtrace')) { // >= 4.3.0
+            if ((DEBUG & _DEBUG_TRACE) {
                 echo "<pre>", printSimpleTrace(debug_backtrace()), "</pre>\n";
             }
         }

Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php	2011-04-11 08:07:04 UTC (rev 8030)
+++ trunk/tests/unit/test.php	2011-04-11 08:36:32 UTC (rev 8031)
@@ -98,7 +98,7 @@
     array_push($database_backends, 'PDO_pqsql', 'PDO_sqlite', 'PDO_mysql');
                                    //'PDO_oci', 'PDO_odbc'
 
-//TODO: convert cvs test                         
+//TODO: convert cvs test
 // For "cvs" see the seperate 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"
@@ -146,10 +146,8 @@
 function assert_callback( $script, $line, $message ) {
    echo "assert failed: script ", $script," line ", $line," :";
    echo "$message";
-   if (function_exists('debug_backtrace')) { // >= 4.3.0
-       echo "Traceback:\n";
-       printSimpleTrace(debug_backtrace());
-   }
+   echo "Traceback:\n";
+   printSimpleTrace(debug_backtrace());
    exit;
 }
 $foo = assert_options( ASSERT_CALLBACK, 'assert_callback');
@@ -386,7 +384,7 @@
 elseif (!ini_get("register_argc_argv"))
     echo "Could not read cmd args (register_argc_argv=Off?)\n";
 // purge the testbox
-  
+
 $debug_level = 1; //was 9, _DEBUG_VERBOSE | _DEBUG_TRACE
 //if (defined('E_STRICT')) $debug_level = 5; // add PARSER flag on php5
 $user_level  = 1; // BOGO (conflicts with RateIt)
@@ -417,7 +415,7 @@
     }
 } elseif (!empty($argv) and preg_match("/test\.php$/", $argv[0])) {
     array_shift($argv);
-}  
+}
 if (!empty($argv)) {
     $runtests = array();
     $define = array();
@@ -635,7 +633,7 @@
         $suite  = new PHPUnit_TestSuite("phpwiki");
         if (file_exists(dirname(__FILE__).'/lib/'.$test.'.php'))
             require_once dirname(__FILE__).'/lib/'.$test.'.php';
-        else  
+        else
             require_once dirname(__FILE__).'/lib/plugin/'.$test.'.php';
         $suite->addTest( new PHPUnit_TestSuite($test) );
 
@@ -667,5 +665,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8030] trunk/lib/WikiDB.php

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

Revision: 8030
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8030&view=rev
Author:   vargenau
Date:     2011-04-11 08:07:04 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
Avoid warning

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2011-04-08 15:01:21 UTC (rev 8029)
+++ trunk/lib/WikiDB.php	2011-04-11 08:07:04 UTC (rev 8030)
@@ -1328,7 +1328,10 @@
                 return;         // values identical, skip update.
         }
 
-        if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
+        if (isset($this->_wikidb->readonly) and ($this->_wikidb->readonly)) {
+            trigger_error("readonly database", E_USER_WARNING);
+            return;
+        }
         $cache->update_pagedata($pagename, array($key => $newval));
     }
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8029] trunk/themes/fusionforge/themeinfo.php

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

Revision: 8029
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8029&view=rev
Author:   vargenau
Date:     2011-04-08 15:01:21 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Add CSS files for wiki dump

Modified Paths:
--------------
    trunk/themes/fusionforge/themeinfo.php

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011-04-08 13:57:12 UTC (rev 8028)
+++ trunk/themes/fusionforge/themeinfo.php	2011-04-08 15:01:21 UTC (rev 8029)
@@ -13,6 +13,16 @@
 
 class WikiTheme_fusionforge extends WikiTheme_Wikilens {
 
+    function getCSS () {
+        $css = array();
+        $css[] = $this->_CSSlink("", "fusionforge.css", "");
+        $css[] = $this->_CSSlink("", "fusionforge-print.css", "print");
+        $css[] = $this->_CSSlink("Fullscreen", "fusionforge-fullscreen.css", "screen", true);
+        $css[] = $this->_CSSlink("Autonumbering", "fusionforge-autonumbering.css", "", true);
+        $css[] = $this->_CSSlink("Rereading Mode", "fusionforge-rereading.css", "", true);
+        return HTML($css);
+    }
+
     function header() {
         global $HTML, $group_id, $group_public_name, $request, $project;
 


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

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

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

Revision: 8028
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8028&view=rev
Author:   vargenau
Date:     2011-04-08 13:57:12 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Add <body> and </body> when in dump mode

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

Modified: trunk/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/body.tmpl	2011-04-08 13:03:38 UTC (rev 8027)
+++ trunk/themes/fusionforge/templates/body.tmpl	2011-04-08 13:57:12 UTC (rev 8028)
@@ -1,6 +1,9 @@
 <?php // -*-php-*-
 // $Id$
 ?>
+<?php if ($WikiTheme->DUMP_MODE) { ?>
+<body>
+<?php } ?>
 <table width="100%" cellpadding="0" cellspacing="0">
 <tr>
 <td valign="top">
@@ -44,3 +47,6 @@
 </tr>
 </table>
 <?php echo Template('bottom') ?>
+<?php if ($WikiTheme->DUMP_MODE) { ?>
+</body>
+<?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:[8027] trunk/locale

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

Revision: 8027
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8027&view=rev
Author:   vargenau
Date:     2011-04-08 13:03:38 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Update locale

Modified Paths:
--------------
    trunk/locale/Makefile
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/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

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/Makefile	2011-04-08 13:03:38 UTC (rev 8027)
@@ -431,7 +431,6 @@
 ${POT_FILE}: ../themes/fusionforge/templates/html.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/login.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/navbar.tmpl
-${POT_FILE}: ../themes/fusionforge/templates/pagelink.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/ratings.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/savepage.tmpl
 ${POT_FILE}: ../themes/fusionforge/templates/userprefs.tmpl

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

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

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-04-08 13:03:38 UTC (rev 8027)
@@ -227,7 +227,6 @@
 $locale["Cancel"] = "Annuler";
 $locale["Cancel your rating"] = "Annuler la notation";
 $locale["Cancelled"] = "Annulé";
-$locale["Cannot connect e-mail server."] = "Impossible de se connecter au serveur de courriel";
 $locale["Cannot create directory '%s'"] = "Impossible de créer le répertoire : « %s »";
 $locale["Cannot open AUTH_GROUP_FILE %s"] = "Impossible d'ouvrir AUTH_GROUP_FILE %s";
 $locale["Case exact?"] = "respect de la casse";
@@ -383,7 +382,6 @@
 $locale["E-Mail address confirmation"] = "Vérification de l'adresse électronique";
 $locale["E-mail"] = "Adresse électronique";
 $locale["E-mail Notification"] = "Courriel de notification";
-$locale["E-mail address '%s' appears to be valid."] = "L'adresse électronique '%s' semble être valide.";
 $locale["E-mail address '%s' is not properly formatted"] = "L'adresse électronique '%s' ne semble pas être bien formée.";
 $locale["E-mail address '%s' is properly formatted"] = "L'adresse électronique '%s' semble être bien formée.";
 $locale["ERROR uploading '%s'"] = "ERREUR en déposant '%s' : ";
@@ -719,7 +717,6 @@
 $locale["No pages removed."] = "Aucune page n'a été supprimée.";
 $locale["No pages renamed."] = "Aucune page n'a été renommée.";
 $locale["No pages with bad names had to be deleted."] = "Aucune page supprimées avec un nom invalide.";
-$locale["No response from server"] = "Pas de réponse du serveur";
 $locale["No revisions found"] = "Aucune version trouvée";
 $locale["No uploaded file to upload?"] = "Pas de fichier à déposer ?";
 $locale["No userid"] = "Pas d'identifiant utilisateur";
@@ -983,7 +980,6 @@
 $locale["Semantic relations for %s"] = "Relations sémantiques pour %s";
 $locale["Send email"] = "Envoyer message";
 $locale["Serialized file %s"] = "Fichier sérialisé %s";
-$locale["Server rejected address: "] = "Le serveur a rejeté l'adresse : ";
 $locale["Set Password"] = "Choisir un mot de passe";
 $locale["Set USE_DB_SESSION to false."] = "Mettre USE_DB_SESSION à false.";
 $locale["Set individual page permissions."] = "Modifier les permissions individuelles de la page.";
@@ -1110,7 +1106,6 @@
 $locale["This page has been locked by the administrator so your changes can not be saved."] = "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrés.";
 $locale["This page is external."] = "Cette page est externe.";
 $locale["This plugin is currently under development and does not work!"] = "Ce plugin est en cours de développement et ne marche pas !";
-$locale["This project is shared with third-party users (non Alcatel-Lucent users)."] = "The projet est partagé avec des utilisateurs extérieurs (ne faisant pas partie d'Alcatel-Lucent).";
 $locale["This revision of the page does not exist."] = "Cette version de la page n'existe pas";
 $locale["Time Zone"] = "Fuseau horaire";
 $locale["Title"] = "Titre";

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	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/de.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3329,7 +3329,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Nächste"
 
@@ -3764,7 +3763,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7393,24 +7392,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-#, fuzzy
-msgid "Server rejected address: "
-msgstr "Ausgewählte Seiten löschen"
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr ""
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -8299,13 +8280,11 @@
 msgstr "Gäste"
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 #, fuzzy
 msgid "Prev"
 msgstr "Vorschau"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8837,10 +8816,14 @@
 msgstr "Formatierung der Seite '%s' auf '%s' geändert."
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -9099,6 +9082,10 @@
 msgstr "Alte Version Bearbeiten"
 
 #, fuzzy
+#~ msgid "Server rejected address: "
+#~ msgstr "Ausgewählte Seiten löschen"
+
+#, fuzzy
 #~ msgid "Next >>"
 #~ msgstr "Nächste"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/es.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3333,7 +3333,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Siguiente"
 
@@ -3765,7 +3764,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7330,23 +7329,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr "La dirección ' %s' del email se ajusta a formato correctamente"
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-msgid "Server rejected address: "
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, fuzzy, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr "La dirección ' %s' del email se ajusta a formato correctamente"
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -8226,13 +8208,11 @@
 msgstr ""
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 #, fuzzy
 msgid "Prev"
 msgstr "Previsualizar"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8740,10 +8720,14 @@
 msgstr "Página desbloquear."
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -8996,6 +8980,10 @@
 msgstr "Corrija versión archivada"
 
 #, fuzzy
+#~ msgid "E-mail address '%s' appears to be valid."
+#~ msgstr "La dirección ' %s' del email se ajusta a formato correctamente"
+
+#, fuzzy
 #~ msgid "Next >>"
 #~ msgstr "Siguiente"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/fr.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3250,7 +3250,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Suivant"
 
@@ -3679,7 +3678,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7167,23 +7166,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr "L'adresse électronique '%s' semble être bien formée."
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-msgid "Server rejected address: "
-msgstr "Le serveur a rejeté l'adresse : "
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr "Pas de réponse du serveur"
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr "Impossible de se connecter au serveur de courriel"
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr "L'adresse électronique '%s' semble être valide."
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -8049,12 +8031,10 @@
 msgstr "Invités"
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 msgid "Prev"
 msgstr "Précédent"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr " - %d / %d - "
@@ -8556,12 +8536,17 @@
 msgstr "Cette page est externe."
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+#, fuzzy
+msgid "This project is shared with third-party users"
 msgstr ""
 "The projet est partagé avec des utilisateurs extérieurs (ne faisant pas "
 "partie d'Alcatel-Lucent)."
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 msgid "Views"
@@ -8778,6 +8763,18 @@
 msgid "Edit old revision"
 msgstr "Modifier l'ancienne version"
 
+#~ msgid "Server rejected address: "
+#~ msgstr "Le serveur a rejeté l'adresse : "
+
+#~ msgid "No response from server"
+#~ msgstr "Pas de réponse du serveur"
+
+#~ msgid "Cannot connect e-mail server."
+#~ msgstr "Impossible de se connecter au serveur de courriel"
+
+#~ msgid "E-mail address '%s' appears to be valid."
+#~ msgstr "L'adresse électronique '%s' semble être valide."
+
 #~ msgid "<< Prev"
 #~ msgstr "<< Précédent"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/it.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3253,7 +3253,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Seguente"
 
@@ -3677,7 +3676,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7145,23 +7144,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-msgid "Server rejected address: "
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr ""
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -8015,13 +7997,11 @@
 msgstr ""
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 #, fuzzy
 msgid "Prev"
 msgstr "Anteprima"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8522,10 +8502,14 @@
 msgstr "Pagina sbloccata."
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/ja.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3333,7 +3333,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "次へ"
 
@@ -3763,7 +3762,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7317,24 +7316,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-#, fuzzy
-msgid "Server rejected address: "
-msgstr "選択ページを全て削除"
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr ""
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -8205,13 +8186,11 @@
 msgstr ""
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 #, fuzzy
 msgid "Prev"
 msgstr "プレビューする"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8725,10 +8704,14 @@
 msgstr "'%s' の削除に成功しました。"
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy
@@ -8972,6 +8955,10 @@
 msgstr "古いリビジョンを編集する"
 
 #, fuzzy
+#~ msgid "Server rejected address: "
+#~ msgstr "選択ページを全て削除"
+
+#, fuzzy
 #~ msgid "Next >>"
 #~ msgstr "次へ"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/nl.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -3224,7 +3224,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Volgende"
 
@@ -3648,7 +3647,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7100,23 +7099,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-msgid "Server rejected address: "
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr ""
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -7972,13 +7954,11 @@
 msgstr ""
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 #, fuzzy
 msgid "Prev"
 msgstr "Voorvertonig"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8469,10 +8449,14 @@
 msgstr "Pagina '%s' verwijderd."
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/phpwiki.pot	2011-04-08 13:03:38 UTC (rev 8027)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3198,7 +3198,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr ""
 
@@ -3619,7 +3618,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7036,23 +7035,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-msgid "Server rejected address: "
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr ""
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -7893,12 +7875,10 @@
 msgstr ""
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 msgid "Prev"
 msgstr ""
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8381,10 +8361,14 @@
 msgstr ""
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 msgid "Views"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/sv.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3233,7 +3233,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Nästa"
 
@@ -3656,7 +3655,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7116,23 +7115,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-msgid "Server rejected address: "
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr ""
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -7989,13 +7971,11 @@
 msgstr ""
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 #, fuzzy
 msgid "Prev"
 msgstr "Översikt"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8493,10 +8473,14 @@
 msgstr "Sätter in sidan %s, version %s från %s"
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 #, fuzzy

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2011-04-08 13:00:41 UTC (rev 8026)
+++ trunk/locale/po/zh.po	2011-04-08 13:03:38 UTC (rev 8027)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 18:07+0200\n"
+"POT-Creation-Date: 2011-04-08 15:02+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3342,7 +3342,6 @@
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
 #: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "下一個"
 
@@ -3775,7 +3774,7 @@
 msgid "Render inline Processing"
 msgstr ""
 
-#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:77
+#: ../lib/plugin/RandomPage.php:33 ../lib/plugin/RandomPage.php:85
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "RandomPage"
@@ -7356,24 +7355,6 @@
 msgid "E-mail address '%s' is properly formatted"
 msgstr ""
 
-#: ../lib/WikiUserNew.php:1871 ../lib/WikiUserNew.php:1876
-#, fuzzy
-msgid "Server rejected address: "
-msgstr "移除選定頁面"
-
-#: ../lib/WikiUserNew.php:1881
-msgid "No response from server"
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1886
-msgid "Cannot connect e-mail server."
-msgstr ""
-
-#: ../lib/WikiUserNew.php:1890
-#, php-format
-msgid "E-mail address '%s' appears to be valid."
-msgstr ""
-
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
 msgid "PersonalPage login method:"
@@ -8250,13 +8231,11 @@
 msgstr "訪客"
 
 #: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
 #, fuzzy
 msgid "Prev"
 msgstr "預覽"
 
 #: ../themes/default/templates/pagelink.tmpl:23
-#: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
@@ -8775,10 +8754,14 @@
 msgstr "改變頁面 '%s' 權限為 '%s'."
 
 #: ../themes/fusionforge/themeinfo.php:63
-msgid ""
-"This project is shared with third-party users (non Alcatel-Lucent users)."
+msgid "This project is shared with third-party users"
 msgstr ""
 
+#: ../themes/fusionforge/themeinfo.php:64
+#, php-format
+msgid " (non %s users)."
+msgstr ""
+
 #: ../themes/MonoBook/templates/actionbar.tmpl:13
 #: ../themes/Sidebar/templates/actionbar.tmpl:12
 msgid "Views"
@@ -9022,6 +9005,10 @@
 msgstr "編輯舊修訂"
 
 #, fuzzy
+#~ msgid "Server rejected address: "
+#~ msgstr "移除選定頁面"
+
+#, fuzzy
 #~ msgid "Next >>"
 #~ msgstr "下一個"
 

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

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


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8026] trunk/g

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

Revision: 8026
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8026&view=rev
Author:   vargenau
Date:     2011-04-08 13:00:41 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Web DAV location for DEFAULT_DUMP_DIR and HTML_DUMP_DIR

Modified Paths:
--------------
    trunk/g

Modified: trunk/g
===================================================================
--- trunk/g	2011-04-08 12:54:42 UTC (rev 8025)
+++ trunk/g	2011-04-08 13:00:41 UTC (rev 8026)
@@ -193,9 +193,9 @@
 
     define('ENABLE_REVERSE_DNS', false);
 
-    // Perhaps propose Web DAV location ?
-    define('DEFAULT_DUMP_DIR', "");
-    define('HTML_DUMP_DIR', "");
+    // Web DAV location
+    define('DEFAULT_DUMP_DIR', "/opt/groups/".$group_name."/wikidump/");
+    define('HTML_DUMP_DIR', "/opt/groups/".$group_name."/wikidumphtml/");
 
     define('COMPRESS_OUTPUT', 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:[8025] trunk/lib

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

Revision: 8025
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8025&view=rev
Author:   vargenau
Date:     2011-04-08 12:54:42 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Avoid warnings

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
    trunk/lib/plugin/Template.php

Modified: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2011-04-08 12:53:56 UTC (rev 8024)
+++ trunk/lib/WikiDB/backend/PearDB_ffpgsql.php	2011-04-08 12:54:42 UTC (rev 8025)
@@ -110,8 +110,12 @@
             $this->_get_pageid($pagename, true); // Creates page record
         }
       
-        @$hits = (int)$data['hits'];
-        unset($data['hits']);
+        if (isset($data['hits'])) {
+             $hits = (int)$data['hits'];
+             unset($data['hits']);
+        } else {
+             $hits = 0;
+        }
 
         foreach ($newdata as $key => $val) {
             if ($key == 'hits')

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2011-04-08 12:53:56 UTC (rev 8024)
+++ trunk/lib/plugin/Template.php	2011-04-08 12:54:42 UTC (rev 8025)
@@ -83,7 +83,7 @@
     // TODO: check if page can really be pulled from the args, or if it is just the basepage.
     function getWikiPageLinks($argstr, $basepage) {
         $args = $this->getArgs($argstr);
-        $page = @$args['page'];
+        $page = isset($args['page'])? $args['page']: '';
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);


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

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

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

Revision: 8024
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8024&view=rev
Author:   vargenau
Date:     2011-04-08 12:53:56 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Translate strings

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

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2011-04-08 12:52:26 UTC (rev 8023)
+++ trunk/lib/WikiUserNew.php	2011-04-08 12:53:56 UTC (rev 8024)
@@ -1867,27 +1867,27 @@
             fputs ($Connect, "QUIT\r\n");
             fclose($Connect);
             if (!ereg ("^250", $From)) {
-                $result[0] = false;
-                $result[1] = _("Server rejected address: ") . $From;
+                $result[0]=false;
+                $result[1]="Server rejected address: ". $From;
                 return $result;
             }
             if (!ereg ( "^250", $To )) {
-                $result[0] = false;
-                $result[1] = _("Server rejected address: ") . $To;
+                $result[0]=false;
+                $result[1]="Server rejected address: ". $To;
                 return $result;
             }
         } else {
             $result[0] = false;
-            $result[1] = _("No response from server");
+            $result[1] = "No response from server";
             return $result;
           }
     }  else {
-        $result[0] = false;
-        $result[1] = _("Cannot connect e-mail server.");
+        $result[0]=false;
+        $result[1]="Cannot connect e-mail server.";
         return $result;
     }
-    $result[0] = true;
-    $result[1] = sprintf(_("E-mail address '%s' appears to be valid."), $email);
+    $result[0]=true;
+    $result[1]="E-mail address '$email' appears to be valid.";
     return $result;
 } // end of function
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8023] trunk/themes/fusionforge/themeinfo.php

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

Revision: 8023
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8023&view=rev
Author:   vargenau
Date:     2011-04-08 12:52:26 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Do not hardcode Alcatel-Lucent

Modified Paths:
--------------
    trunk/themes/fusionforge/themeinfo.php

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2011-04-08 12:38:32 UTC (rev 8022)
+++ trunk/themes/fusionforge/themeinfo.php	2011-04-08 12:52:26 UTC (rev 8023)
@@ -18,7 +18,7 @@
 
         $pagename = $request->getArg('pagename');
 
-        $submenu = Template('navbar');
+        $submenu = Template('navbar')->asXML();
 
         $domain = textdomain(NULL);
         textdomain('fusionforge');
@@ -43,7 +43,7 @@
                             'title'=> $group_public_name._(": ").htmlspecialchars($pagename),
                             'group' => $group_id,
                             'toptab' => 'wiki',
-                            'submenu' => $submenu->asXML()
+                            'submenu' => $submenu
                            )
                      );
 
@@ -60,7 +60,8 @@
                 if ($page->get('external')) {
                     $external_msg = _("This page is external.");
                 }
-                echo $HTML->warning_msg(_("This project is shared with third-party users (non Alcatel-Lucent users).") .
+                echo $HTML->warning_msg(_("This project is shared with third-party users") . 
+                                        sprintf(_(" (non %s users)."), forge_get_config('company')) .
                                         (isset($external_msg) ? ' ' . $external_msg : ''));
             }
         }


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8022] trunk/lib/plugin/RandomPage.php

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

Revision: 8022
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8022&view=rev
Author:   vargenau
Date:     2011-04-08 12:38:32 +0000 (Fri, 08 Apr 2011)

Log Message:
-----------
Redirect breaks HTML dump

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

Modified: trunk/lib/plugin/RandomPage.php
===================================================================
--- trunk/lib/plugin/RandomPage.php	2011-04-05 17:19:14 UTC (rev 8021)
+++ trunk/lib/plugin/RandomPage.php	2011-04-08 12:38:32 UTC (rev 8022)
@@ -50,9 +50,17 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
+
+        global $WikiTheme;
+
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
+        // Redirect would break HTML dump
+        if (!empty($WikiTheme->DUMP_MODE)) {
+            $redirect = false;
+        }
+
         // fix deprecated arg
         if (is_integer($pages)) {
             $numpages = $pages;


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

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

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

Revision: 8021
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8021&view=rev
Author:   vargenau
Date:     2011-04-05 17:19:14 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
Better use CSS than custom template

Modified Paths:
--------------
    trunk/themes/default/templates/pagelink.tmpl
    trunk/themes/fusionforge/fusionforge.css

Removed Paths:
-------------
    trunk/themes/fusionforge/templates/pagelink.tmpl

Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl	2011-04-05 16:08:40 UTC (rev 8020)
+++ trunk/themes/default/templates/pagelink.tmpl	2011-04-05 17:19:14 UTC (rev 8021)
@@ -13,7 +13,7 @@
   $NEXT = false;
 }
 ?>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"><table width="100%"><tr class="wikipaging">
+<tr><td width="100%" colspan="<?php echo $COLS ?>"><table width="100%" class="wikipaging"><tr class="wikipaging">
   <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
       <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
       &nbsp;

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2011-04-05 16:08:40 UTC (rev 8020)
+++ trunk/themes/fusionforge/fusionforge.css	2011-04-05 17:19:14 UTC (rev 8021)
@@ -203,6 +203,15 @@
 .interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
 .interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
 
+table.wikipaging { 
+    border-width: 1px;
+    border-style: solid; 
+    border-color: black; 
+    font-weight: bold;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
 /* CreateToc plugin =================================================== */
 
 div.toc {

Deleted: trunk/themes/fusionforge/templates/pagelink.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/pagelink.tmpl	2011-04-05 16:08:40 UTC (rev 8020)
+++ trunk/themes/fusionforge/templates/pagelink.tmpl	2011-04-05 17:19:14 UTC (rev 8021)
@@ -1,32 +0,0 @@
-<?php // -*-php-*-
-// $Id$
-
-/**
- * Themable paging "|<< <<   - i/sum - >> >>|" links
- *
- * Variables: PREV, NEXT, PREV_LINK, NEXT_LINK,
- * COUNT, OFFSET, SIZE
- * More ideas: FIRST, LAST, ...
- */
-if ($WikiTheme->DUMP_MODE) {
-  $PREV = false;
-  $NEXT = false;
-}
-?>
-<tr><td width="100%" colspan="<?php echo $COLS ?>">&nbsp;</td></tr>
-<tr><td width="100%" colspan="<?php echo $COLS ?>"><table style="border-width: 1px; border-style: solid; border-color: black; font-weight: bold;" width="100%"><tr class="wikipaging">
-  <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
-      <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
-      &nbsp;
-      <?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), "<< " . _("Prev")) : "<<" ?>
-  </td>
-  <td class="wikipaging-enabled" align="center">
-      <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
-  </td>
-  <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
-      <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK), _("Next") . " >>") : ">>" ?>
-      &nbsp;
-      <?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK), ">>|") : ">>|" ?>
-  </td>
-</tr></table></td></tr>
-<tr><td width="100%" colspan="<?php echo $COLS ?>">&nbsp;</td></tr>


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

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

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

Revision: 8020
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8020&view=rev
Author:   vargenau
Date:     2011-04-05 16:08:40 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
Update locale

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

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

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

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-04-05 16:08:40 UTC (rev 8020)
@@ -84,14 +84,14 @@
 $locale["(%d Links)"] = "(%d liens)";
 $locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(Copiez vos modifications dans le presse-papier. Vous pouvez essayer de modifier une page différente ou enregistrer votre texte à l'aide d'un éditeur).";
 $locale["(Redirected from %s)"] = "(Redirigé de %s)";
-$locale["(Your preferences are stored as hidden data within this page)."] = "Vos préférences sont enregistrées en mode invisible sur cette page.";
+$locale["(Your preferences are stored as hidden data within this page)."] = "(Vos préférences sont enregistrées en mode invisible sur cette page.)";
 $locale["(diff)"] = "(diff)";
 $locale["(disable individual page permissions, enable inheritance)?"] = "(désactive les permissions individuelles par page, activer l'héritage) ?";
 $locale["(formatted for PhpWiki developers as pgsrc template, not for backing up)"] = "(format pour les développeurs, pas pour la sauvegarde)";
 $locale["(formatted for backing up: all revisions)"] = "(format de sauvegarde : toutes les versions)";
 $locale["(max. recursion level: %d)"] = "(niveau maximum de récursivité: %d)";
 $locale["(ugo : rwx)"] = "(ugo : rwx)";
-$locale[", Memory: %s"] = ", RAM: %s";
+$locale[", Memory: %s"] = ", mémoire : %s";
 $locale["- saved to database as version %d"] = "- enregistrée dans la base de données sous la version %d";
 $locale["- version %d saved to database as version %d"] = "- version %d sauvée dans la base de données sous la version %d";
 $locale["-???"] = "-???";
@@ -103,15 +103,13 @@
 $locale["1 word"] = "1 mot";
 $locale[": "] = " : ";
 $locale["<%s: no such section>"] = "<%s : pas de section de ce type>";
-$locale["<<"] = "<<";
-$locale["<< Prev"] = "<< Précédent";
 $locale["<empty>"] = "<vide>";
 $locale["<no matches>"] = "<aucun résultat>";
 $locale["<none>"] = "<aucun>";
 $locale["<not displayed>"] = "<non affiché>";
-$locale["<system language>"] = "< langue du système >";
+$locale["<system language>"] = "<langue du système>";
+$locale["<system theme>"] = "<thème du système>";
 $locale["<unknown>"] = "<inconnu>";
-$locale[">>"] = ">>";
 $locale["A plugin to provide for raw HTML within wiki pages."] = "Un Plugin pour intégrer du code HTML dans les WikiPages.";
 $locale["ACCESS DENIED: You must log in to upload files."] = "ACCES REFUSE: Vous devez être connecté pour uploader.";
 $locale["ACL"] = "ACL";
@@ -427,6 +425,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["External"] = "Externe";
 $locale["External Links"] = "Liens externes";
 $locale["External link (remember http:// prefix)"] = "Lien externe (le préfixe http:// est obligatoire)";
@@ -653,6 +652,7 @@
 $locale["Major modifications only"] = "Que les modifications majeures";
 $locale["Make the page external?"] = "Rendre la page externe ?";
 $locale["Make the page public?"] = "Rendre la page publique ?";
+$locale["Make the page read-only?"] = "Rendre la page non modifiable ?";
 $locale["Make use of the Google API"] = "Faire usage de l'API Google";
 $locale["Markup"] = "Syntaxe";
 $locale["Markup cache purged!"] = "Cache de marques purgé !";
@@ -696,7 +696,6 @@
 $locale["New watchlist: "] = "Nouvelle liste de suivi : ";
 $locale["Newer page:"] = "Page plus récente :";
 $locale["Next"] = "Suivant";
-$locale["Next >>"] = "Suivant >>";
 $locale["Next Month"] = "Mois suivant";
 $locale["No"] = "Non";
 $locale["No DSN alias for SqlResult.ini specified"] = "Aucun alias DSN spécifié pour SqlResult.ini";
@@ -766,7 +765,7 @@
 $locale["Page '%s' does not exist"] = "La page '%s' n'existe pas";
 $locale["Page '%s' does not exist."] = "La page « %s » n'existe pas";
 $locale["Page Content: "] = "Contenu de la page : ";
-$locale["Page Execution took %s seconds"] = "L'exécution de la page a pris %s seconds";
+$locale["Page Execution took %s seconds"] = "L'exécution de la page a pris %s secondes";
 $locale["Page Info"] = "Infos sur la page";
 $locale["Page Locked"] = "Page verrouillée";
 $locale["Page Name"] = "Nom de la page";
@@ -845,11 +844,12 @@
 $locale["PluginManager"] = "GestionsDesPlugins";
 $locale["Plugins"] = "Greffons";
 $locale["PopularNearby"] = "PopulairesAlentour";
-$locale["Post new"] = "Poster un nouveau";
+$locale["Post new"] = "Poster une annonce";
 $locale["Posted: %s"] = "Posté le %s";
 $locale["Postponed %s for %s."] = "Pas de listes trouvées pour %1\$s";
 $locale["Preferences"] = "Préférences";
 $locale["PreferencesInfo"] = "PréférencesInfo";
+$locale["Prev"] = "Précédent";
 $locale["PrevNext"] = "PrécédentSuivant";
 $locale["Preview"] = "Prévisualiser";
 $locale["Preview as developer format"] = "Prévisualisation au format développeurs";
@@ -1078,7 +1078,7 @@
 $locale["The %d oldest %s during the past %s days are listed below."] = "Les %d %s les plus anciennes pendant les derniers %s jours sont listées ci-dessous.";
 $locale["The %d oldest %s during the past day are listed below."] = "Les %d %s les plus anciennes pendant le dernier jour sont listées ci-dessous.";
 $locale["The %s files are in the %s directory. Please read the INSTALL file and move the database to a permanent location or risk losing all the pages!"] = "Les fichiers %s sont dans le répertoire %s. Veuillez lire le fichier INSTALL et déplacez le fichier DB vers un emplacement permanent, sinon vous risquez de perdre toutes vos pages !";
-$locale["The %s subpage enables simple weblogging."] = "Les sous pages de %s permettent le simple weblogging.";
+$locale["The %s subpage enables simple weblogging."] = "Les sous-pages de %s permettent l'utilisation d'un blog simple.";
 $locale["The DBA handler %s is unsupported!"] = "Le gestionnaire DBA %s n'est pas supporté !";
 $locale["The ICAO '%s' wasn't recognized."] = "L'ICAO '%s' n'a pas été reconnu.";
 $locale["The PECL %s extension cannot be loaded."] = "L'extension PECL %s ne peut être chargée.";

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	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/de.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -3328,6 +3328,8 @@
 msgstr "<%s: unbekannte Sektion>"
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Nächste"
 
@@ -7714,7 +7716,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr "Ausführung dieser Seite dauerte %s Sekunden"
@@ -8003,9 +8005,9 @@
 msgstr "%s von %s"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ", RAM: %s"
@@ -8296,43 +8298,18 @@
 msgid "Guests"
 msgstr "Gäste"
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Vorschau"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-#, fuzzy
-msgid "Next >>"
-msgstr "Nächste"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -9122,6 +9099,10 @@
 msgstr "Alte Version Bearbeiten"
 
 #, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Nächste"
+
+#, fuzzy
 #~ msgid "%s pages have been permanently changed:"
 #~ msgstr "%s Seiten wurden geändert."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/es.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -3332,6 +3332,8 @@
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Siguiente"
 
@@ -7658,7 +7660,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7944,9 +7946,9 @@
 msgstr "%s por %s"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ""
@@ -8223,43 +8225,18 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Previsualizar"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-#, fuzzy
-msgid "Next >>"
-msgstr "Siguiente"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -9018,6 +8995,10 @@
 msgid "Edit old revision"
 msgstr "Corrija versión archivada"
 
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Siguiente"
+
 #~ msgid "Version %s, saved %s"
 #~ msgstr "versión %s, %s ahorrado"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/fr.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-05 16:11+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -3249,6 +3249,8 @@
 msgstr "<%s : pas de section de ce type>"
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Suivant"
 
@@ -8046,42 +8048,17 @@
 msgid "Guests"
 msgstr "Invités"
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr "<< Précédent"
+msgid "Prev"
+msgstr "Précédent"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr "<<"
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr " - %d / %d - "
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid "Next >>"
-msgstr "Suivant >>"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ">>"
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -8801,6 +8778,18 @@
 msgid "Edit old revision"
 msgstr "Modifier l'ancienne version"
 
+#~ msgid "<< Prev"
+#~ msgstr "<< Précédent"
+
+#~ msgid "<<"
+#~ msgstr "<<"
+
+#~ msgid "Next >>"
+#~ msgstr "Suivant >>"
+
+#~ msgid ">>"
+#~ msgstr ">>"
+
 #~ msgid "NewMarkupTestPage"
 #~ msgstr "PageTestNouvellesMarques"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/it.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -3252,6 +3252,8 @@
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Seguente"
 
@@ -7452,7 +7454,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7734,9 +7736,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ", RAM: %s"
@@ -8012,43 +8014,18 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Anteprima"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-#, fuzzy
-msgid "Next >>"
-msgstr "Seguente"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -8791,6 +8768,10 @@
 msgid "Edit old revision"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Seguente"
+
 #~ msgid "Version %s, saved %s"
 #~ msgstr "Versione %s, salvata %s"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/ja.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3332,6 +3332,8 @@
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "次へ"
 
@@ -7632,7 +7634,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7924,9 +7926,9 @@
 msgstr "%s バイト"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, fuzzy, php-format
 msgid ", Memory: %s"
 msgstr "編集: %s"
@@ -8202,43 +8204,18 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "プレビューする"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-#, fuzzy
-msgid "Next >>"
-msgstr "次へ"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -8995,6 +8972,10 @@
 msgstr "古いリビジョンを編集する"
 
 #, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "次へ"
+
+#, fuzzy
 #~ msgid "Version %s, saved %s"
 #~ msgstr "バージョン %s"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/nl.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -3223,6 +3223,8 @@
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Volgende"
 
@@ -7409,7 +7411,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7692,9 +7694,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ""
@@ -7969,43 +7971,18 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Voorvertonig"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-#, fuzzy
-msgid "Next >>"
-msgstr "Volgende"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -8726,6 +8703,10 @@
 msgid "Edit old revision"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Volgende"
+
 #~ msgid "Version %s, saved %s"
 #~ msgstr "Versie %s, bewarrd %s"
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/phpwiki.pot	2011-04-05 16:08:40 UTC (rev 8020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -3197,6 +3197,8 @@
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr ""
 
@@ -7337,7 +7339,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7614,9 +7616,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
 msgstr ""
@@ -7890,42 +7892,17 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
+msgid "Prev"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid "Next >>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/sv.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -3232,6 +3232,8 @@
 msgstr ""
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "Nästa"
 
@@ -7423,7 +7425,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr ""
@@ -7709,9 +7711,9 @@
 msgstr ""
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, fuzzy, php-format
 msgid ", Memory: %s"
 msgstr "Redigera: %s"
@@ -7986,43 +7988,18 @@
 msgid "Guests"
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "Översikt"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-#, fuzzy
-msgid "Next >>"
-msgstr "Nästa"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -8758,6 +8735,10 @@
 msgid "Edit old revision"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "Nästa"
+
 #~ msgid "Version %s, saved %s"
 #~ msgstr "Version %s, sparade %s"
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2011-04-05 15:34:22 UTC (rev 8019)
+++ trunk/locale/po/zh.po	2011-04-05 16:08:40 UTC (rev 8020)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 18:07+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -3341,6 +3341,8 @@
 msgstr "<%s: 沒有此部份>"
 
 #: ../lib/plugin/PageGroup.php:101 ../lib/plugin/PrevNext.php:62
+#: ../themes/default/templates/pagelink.tmpl:26
+#: ../themes/fusionforge/templates/pagelink.tmpl:27
 msgid "Next"
 msgstr "下一個"
 
@@ -7673,7 +7675,7 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
 msgstr "執行此頁面花了 %s 秒"
@@ -7964,9 +7966,9 @@
 # This entry is important for French punctuation rules which stipulate
 # a space before each colon.
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, fuzzy, php-format
 msgid ", Memory: %s"
 msgstr "User: %s"
@@ -8247,43 +8249,18 @@
 msgid "Guests"
 msgstr "訪客"
 
-#: ../themes/default/templates/pagelink.tmpl:18
-#: ../themes/fusionforge/templates/pagelink.tmpl:19
-msgid "|<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:20
 #: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<< Prev"
-msgstr ""
+#, fuzzy
+msgid "Prev"
+msgstr "預覽"
 
-#: ../themes/default/templates/pagelink.tmpl:20
-#: ../themes/fusionforge/templates/pagelink.tmpl:21
-msgid "<<"
-msgstr ""
-
 #: ../themes/default/templates/pagelink.tmpl:23
 #: ../themes/fusionforge/templates/pagelink.tmpl:24
 #, php-format
 msgid " - %d / %d - "
 msgstr ""
 
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-#, fuzzy
-msgid "Next >>"
-msgstr "下一個"
-
-#: ../themes/default/templates/pagelink.tmpl:26
-#: ../themes/fusionforge/templates/pagelink.tmpl:27
-msgid ">>"
-msgstr ""
-
-#: ../themes/default/templates/pagelink.tmpl:28
-#: ../themes/fusionforge/templates/pagelink.tmpl:29
-msgid ">>|"
-msgstr ""
-
 #: ../themes/default/templates/redirect.tmpl:42
 #, php-format
 msgid "Your browser should have redirected you to %s."
@@ -9045,6 +9022,10 @@
 msgstr "編輯舊修訂"
 
 #, fuzzy
+#~ msgid "Next >>"
+#~ msgstr "下一個"
+
+#, fuzzy
 #~ msgid "%s pages have been permanently changed:"
 #~ msgstr "%s pages 已經永久更名了."
 

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

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


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

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

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

Revision: 8019
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8019&view=rev
Author:   vargenau
Date:     2011-04-05 15:34:22 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
No need to translate that

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

Modified: trunk/themes/fusionforge/templates/pagelink.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/pagelink.tmpl	2011-04-05 15:13:36 UTC (rev 8018)
+++ trunk/themes/fusionforge/templates/pagelink.tmpl	2011-04-05 15:34:22 UTC (rev 8019)
@@ -16,17 +16,17 @@
 <tr><td width="100%" colspan="<?php echo $COLS ?>">&nbsp;</td></tr>
 <tr><td width="100%" colspan="<?php echo $COLS ?>"><table style="border-width: 1px; border-style: solid; border-color: black; font-weight: bold;" width="100%"><tr class="wikipaging">
   <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
-      <?php echo $PREV ?  HTML::a(array('href'=>$FIRST_LINK),_("|<<")) : _("|<<") ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
       &nbsp;
-      <?php echo $PREV ?  HTML::a(array('href'=>$PREV_LINK),_("<< Prev")) : _("<<") ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), "<< " . _("Prev")) : "<<" ?>
   </td>
   <td class="wikipaging-enabled" align="center">
       <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
   </td>
   <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
-      <?php echo $NEXT ?  HTML::a(array('href'=>$NEXT_LINK),_("Next >>"))  : _(">>") ?>
+      <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK), _("Next") . " >>") : ">>" ?>
       &nbsp;
-      <?php echo $NEXT ?  HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>
+      <?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK), ">>|") : ">>|" ?>
   </td>
 </tr></table></td></tr>
 <tr><td width="100%" colspan="<?php echo $COLS ?>">&nbsp;</td></tr>


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

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

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

Revision: 8018
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8018&view=rev
Author:   vargenau
Date:     2011-04-05 15:13:36 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
No need to translate that

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

Modified: trunk/themes/default/templates/pagelink.tmpl
===================================================================
--- trunk/themes/default/templates/pagelink.tmpl	2011-04-05 14:16:50 UTC (rev 8017)
+++ trunk/themes/default/templates/pagelink.tmpl	2011-04-05 15:13:36 UTC (rev 8018)
@@ -15,16 +15,16 @@
 ?>
 <tr><td width="100%" colspan="<?php echo $COLS ?>"><table width="100%"><tr class="wikipaging">
   <td class="wikipaging<?php echo $PREV ? "-enabled" : "-disabled" ?>" align="left">
-      <?php echo $PREV ?  HTML::a(array('href'=>$FIRST_LINK),_("|<<")) : _("|<<") ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$FIRST_LINK), "|<<") : "|<<" ?>
       &nbsp;
-      <?php echo $PREV ?  HTML::a(array('href'=>$PREV_LINK),_("<< Prev")) : _("<<") ?>
+      <?php echo $PREV ? HTML::a(array('href'=>$PREV_LINK), "<< " . _("Prev")) : "<<" ?>
   </td>
   <td class="wikipaging-enabled" align="center">
       <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
   </td>
   <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
-      <?php echo $NEXT ?  HTML::a(array('href'=>$NEXT_LINK),_("Next >>"))  : _(">>") ?> 
+      <?php echo $NEXT ? HTML::a(array('href'=>$NEXT_LINK), _("Next") . " >>") : ">>" ?>
       &nbsp;
-      <?php echo $NEXT ?  HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>
+      <?php echo $NEXT ? HTML::a(array('href'=>$LAST_LINK), ">>|") : ">>|" ?>
   </td>
 </tr></table></td></tr>


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

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

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

Revision: 8017
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8017&view=rev
Author:   vargenau
Date:     2011-04-05 14:16:50 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
Update French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-04-05 09:52:20 UTC (rev 8016)
+++ trunk/locale/po/fr.po	2011-04-05 14:16:50 UTC (rev 8017)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-04 17:31+0200\n"
+"POT-Creation-Date: 2011-04-05 16:11+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -7480,10 +7480,10 @@
 #: ../themes/fusionforge/templates/debug.tmpl:7
 #: ../themes/Portland/templates/debug.tmpl:11
 #: ../themes/shamino_com/templates/debug.tmpl:9
-#: ../themes/Sidebar/templates/debug.tmpl:18
+#: ../themes/Sidebar/templates/debug.tmpl:17
 #, php-format
 msgid "Page Execution took %s seconds"
-msgstr "L'exécution de la page a pris %s seconds"
+msgstr "L'exécution de la page a pris %s secondes"
 
 #: ../themes/blog/templates/info.tmpl:8
 #: ../themes/MonoBook/templates/info.tmpl:189
@@ -7762,12 +7762,12 @@
 msgstr "%s par %s"
 
 #: ../themes/default/templates/debug.tmpl:20
-#: ../themes/fusionforge/templates/debug.tmpl:9
+#: ../themes/fusionforge/templates/debug.tmpl:10
 #: ../themes/shamino_com/templates/debug.tmpl:11
-#: ../themes/Sidebar/templates/debug.tmpl:19
+#: ../themes/Sidebar/templates/debug.tmpl:18
 #, php-format
 msgid ", Memory: %s"
-msgstr ", RAM: %s"
+msgstr ", mémoire : %s"
 
 #: ../themes/default/templates/dialog.tmpl:18
 msgid "Dialog"
@@ -7776,11 +7776,11 @@
 #: ../themes/default/templates/editpage.tmpl:81
 #: ../themes/fusionforge/templates/editpage.tmpl:62
 msgid "Make the page read-only?"
-msgstr ""
+msgstr "Rendre la page non modifiable ?"
 
 #: ../themes/default/templates/editpage.tmpl:83
 msgid "Export to a seperate public area?"
-msgstr ""
+msgstr "Exporter dans une zone publique distincte ?"
 
 #: ../themes/default/templates/editpage.tmpl:83
 #: ../themes/fusionforge/templates/editpage.tmpl:64
@@ -7790,7 +7790,7 @@
 #: ../themes/default/templates/forumadd.tmpl:11
 #: ../themes/default/templates/wikiforum.tmpl:20
 msgid "Post new"
-msgstr "Poster un nouveau"
+msgstr "Poster une annonce"
 
 #: ../themes/default/templates/forumadd.tmpl:13
 msgid "Title:"
@@ -7812,12 +7812,12 @@
 
 #: ../themes/default/templates/homepage.tmpl:13
 msgid "(Your preferences are stored as hidden data within this page)."
-msgstr "Vos préférences sont enregistrées en mode invisible sur cette page."
+msgstr "(Vos préférences sont enregistrées en mode invisible sur cette page.)"
 
 #: ../themes/default/templates/homepage.tmpl:16
 #, php-format
 msgid "The %s subpage enables simple weblogging."
-msgstr "Les sous pages de %s permettent le simple weblogging."
+msgstr "Les sous-pages de %s permettent l'utilisation d'un blog simple."
 
 #: ../themes/default/templates/info.tmpl:31
 #: ../themes/MonoBook/templates/info.tmpl:38
@@ -8137,7 +8137,7 @@
 #: ../themes/fusionforge/templates/userprefs.tmpl:134
 #: ../themes/fusionforge/templates/userprefs.tmpl:136
 msgid "<system theme>"
-msgstr ""
+msgstr "<thème du système>"
 
 #: ../themes/default/templates/userprefs.tmpl:83
 #: ../themes/default/templates/userprefs.tmpl:109
@@ -8151,7 +8151,7 @@
 #: ../themes/fusionforge/templates/userprefs.tmpl:151
 #: ../themes/fusionforge/templates/userprefs.tmpl:153
 msgid "<system language>"
-msgstr "< langue du système >"
+msgstr "<langue du système>"
 
 #: ../themes/default/templates/userprefs.tmpl:100
 #: ../themes/default/templates/userprefs.tmpl:110


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

[phpwiki-checkins] SF.net SVN: phpwiki:[8016] trunk/themes/Sidebar/templates/debug.tmpl

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

Revision: 8016
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8016&view=rev
Author:   vargenau
Date:     2011-04-05 09:52:20 +0000 (Tue, 05 Apr 2011)

Log Message:
-----------
Remove wrong comment

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/debug.tmpl

Modified: trunk/themes/Sidebar/templates/debug.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/debug.tmpl	2011-04-05 09:47:42 UTC (rev 8015)
+++ trunk/themes/Sidebar/templates/debug.tmpl	2011-04-05 09:52:20 UTC (rev 8016)
@@ -4,7 +4,6 @@
 <?php global $RUNTIMER; ?>
 <table width="%100" border="0" cellpadding="0" cellspacing="0">
 <tr><td>
-<?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?>
 <div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img
         id="xhtml"
         src="<?php echo $WikiTheme->_findData('buttons/valid-xhtml10.png')?>"


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