phpwiki-checkins Mailing List for PhpWiki (Page 110)

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

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

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 108 109 110 111 112 .. 538 > >> (Page 110 of 538)

[phpwiki-checkins] SF.net SVN: phpwiki:[8464] trunk/lib/stdlib.php

From: <var...@us...> - 2012-11-14 17:52:38

Revision: 8464
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8464&view=rev
Author:   vargenau
Date:     2012-11-14 17:52:31 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add brackets

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-11-14 17:41:10 UTC (rev 8463)
+++ trunk/lib/stdlib.php	2012-11-14 17:52:31 UTC (rev 8464)
@@ -422,8 +422,9 @@
     // FIXED: This was broken for moniker:TP30 test/image.png => url="moniker:TP30" attr="test/image.png"
     $ori_url = $url;
     // support new syntax: [prefix/image.jpg size=50% border=n]
-    if (empty($alt)) $alt = "";
-
+    if (empty($alt)) {
+        $alt = "";
+    }
     if (!IsSafeURL($url)) {
         $link = HTML::span(array('class' => 'error'), _('Bad URL for image -- remove all of <, >, "'));
         return $link;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8463] trunk/lib/main.php

From: <var...@us...> - 2012-11-14 17:41:21

Revision: 8463
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8463&view=rev
Author:   vargenau
Date:     2012-11-14 17:41:10 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add action DeleteAcl

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-11-14 17:38:49 UTC (rev 8462)
+++ trunk/lib/main.php	2012-11-14 17:41:10 UTC (rev 8463)
@@ -737,6 +737,7 @@
                 case 'unlock':
                 case 'upgrade':
                 case 'chown':
+                case 'deleteacl':
                 case 'setacl':
                 case 'setaclsimple':
                     return WIKIAUTH_ADMIN;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8462] trunk/lib/plugin/WikiAdminDeleteAcl.php

From: <var...@us...> - 2012-11-14 17:38:55

Revision: 8462
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8462&view=rev
Author:   vargenau
Date:     2012-11-14 17:38:49 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add action DeleteAcl

Added Paths:
-----------
    trunk/lib/plugin/WikiAdminDeleteAcl.php

Added: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php	                        (rev 0)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php	2012-11-14 17:38:49 UTC (rev 8462)
@@ -0,0 +1,167 @@
+<?php
+
+/*
+ * Copyright 2004 $ThePhpWikiProgrammingTeam
+ * Copyright 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
+ *
+ * This file is part of PhpWiki.
+ *
+ * PhpWiki is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PhpWiki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * Set simple individual PagePermissions
+ *
+ * Usage:   <<WikiAdminAclDelete >> or called via WikiAdminSelect
+ * Author:  Marc-Etienne Vargenau, Alcatel-Lucent
+ *
+ */
+
+require_once 'lib/PageList.php';
+require_once 'lib/plugin/WikiAdminSelect.php';
+
+class WikiPlugin_WikiAdminDeleteAcl
+    extends WikiPlugin_WikiAdminSelect
+{
+    function getName()
+    {
+        return _("WikiDeleteAcl");
+    }
+
+    function getDescription()
+    {
+        return _("Delete page permissions.");
+    }
+
+    function deleteaclPages(&$request, $pages)
+    {
+        $result = HTML::div();
+        $count = 0;
+        $dbi =& $request->_dbi;
+        $perm = new PagePermission('');
+        $perm->sanify();
+        foreach ($pages as $pagename) {
+            // check if unchanged? we need a deep array_equal
+            $page = $dbi->getPage($pagename);
+            $oldperm = getPagePermissions($page);
+            setPagePermissions($page, $perm);
+            $result->setAttr('class', 'feedback');
+            $result->pushContent(HTML::p(fmt("ACL deleted for page '%s'", $pagename)));
+            $current = $page->getCurrentRevision();
+            $version = $current->getVersion();
+            $meta = $current->_data;
+            $text = $current->getPackedContent();
+            $meta['summary'] = sprintf(_("ACL deleted for page '%s'."), $pagename);
+            $meta['is_minor_edit'] = 1;
+            $meta['author'] = $request->_user->UserName();
+            unset($meta['mtime']); // force new date
+            $page->save($text, $version + 1, $meta);
+            $count++;
+        }
+        if ($count) {
+            $dbi->touch();
+            $result->setAttr('class', 'feedback');
+            if ($count > 1) {
+                $result->pushContent(HTML::p(fmt("%d pages have been changed.", $count)));
+            }
+        } else {
+            $result->setAttr('class', 'error');
+            $result->pushContent(HTML::p(_("No pages changed.")));
+        }
+        return $result;
+    }
+
+    function run($dbi, $argstr, &$request, $basepage)
+    {
+        if ($request->getArg('action') != 'browse') {
+            if ($request->getArg('action') != _("PhpWikiAdministration/AdminAclDelete")) {
+                return $this->disabled(_("Plugin not run: not in browse mode"));
+            }
+        }
+        if (!ENABLE_PAGEPERM) {
+            return $this->disabled("ENABLE_PAGEPERM = false");
+        }
+
+        $args = $this->getArgs($argstr, $request);
+        $this->_args = $args;
+        $this->preSelectS($args, $request);
+
+        $p = $request->getArg('p');
+        $post_args = $request->getArg('admin_deleteacl');
+        $pages = array();
+        if ($p && !$request->isPost())
+            $pages = $p;
+        elseif ($this->_list)
+            $pages = $this->_list;
+        $header = HTML::fieldset();
+        if ($p && $request->isPost()) {
+            if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
+                $request->_notAuthorized(WIKIAUTH_ADMIN);
+                $this->disabled("! user->isAdmin");
+            }
+            return $this->deleteaclPages($request, array_keys($p));
+        }
+        if (empty($pages)) {
+            // List all pages to select from.
+            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
+        }
+        $pagelist = new PageList_Selectable($args['info'],
+            $args['exclude'],
+            array('types' => array(
+                'acl'
+                => new _PageList_Column_acl('acl', _("ACL")))));
+
+        $pagelist->addPageList($pages);
+        $button_label_delete_acl = _("Delete ACL");
+        $header = $this->deleteaclForm($header, $pages);
+        $header->pushContent(HTML::legend(_("Select the pages where to delete access rights")));
+
+        $buttons = HTML::p(Button('submit:admin_deleteacl', $button_label_delete_acl, 'wikiadmin'));
+        $header->pushContent($buttons);
+
+        return HTML::form(array('action' => $request->getPostURL(),
+                'method' => 'post'),
+            $header,
+            $pagelist->getContent(),
+            HiddenInputs($request->getArgs(),
+                false,
+                array('admin_deleteacl')),
+            ENABLE_PAGEPERM
+                ? ''
+                : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
+    }
+
+    function deleteaclForm(&$header, $pagehash)
+    {
+
+        $pages = array();
+        foreach ($pagehash as $name => $checked) {
+            if ($checked) $pages[] = $name;
+        }
+
+        $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ', $pages)), HTML::br());
+        return $header;
+    }
+}
+
+
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// 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:[8461] trunk

From: <var...@us...> - 2012-11-14 17:35:15

Revision: 8461
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8461&view=rev
Author:   vargenau
Date:     2012-11-14 17:35:05 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add action DeleteAcl

Modified Paths:
--------------
    trunk/lib/IniConfig.php
    trunk/lib/PagePerm.php
    trunk/lib/main.php
    trunk/pgsrc/PhpWikiAdministration
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/IniConfig.php	2012-11-14 17:35:05 UTC (rev 8461)
@@ -716,6 +716,7 @@
     $AllAllowedPlugins[] = 'WikiAdminRemove';
     $AllAllowedPlugins[] = 'WikiAdminRename';
     $AllAllowedPlugins[] = 'WikiAdminSearchReplace';
+    $AllAllowedPlugins[] = 'WikiAdminDeleteAcl';
     $AllAllowedPlugins[] = 'WikiAdminSetAcl';
     $AllAllowedPlugins[] = 'WikiAdminSetAclSimple';
     $AllAllowedPlugins[] = 'WikiAdminUtils';
@@ -781,6 +782,7 @@
     $AllActionPages[] = 'PhpWikiAdministration/Remove';
     $AllActionPages[] = 'PhpWikiAdministration/Rename';
     $AllActionPages[] = 'PhpWikiAdministration/SearchReplace';
+    $AllActionPages[] = 'PhpWikiAdministration/DeleteAcl';
     $AllActionPages[] = 'PhpWikiAdministration/SetAcl';
     $AllActionPages[] = 'PhpWikiAdministration/SetAclSimple';
     $AllActionPages[] = 'RecentChangesMyPages';
@@ -1131,9 +1133,9 @@
     // Detect PrettyWiki setup (not loading index.php directly)
     // $SCRIPT_FILENAME should be the same as __FILE__ in index.php
     if (!isset($SCRIPT_FILENAME))
-        $SCRIPT_FILENAME = @$HTTP_SERVER_VARS['SCRIPT_FILENAME'];
+        $SCRIPT_FILENAME = @$_SERVER['SCRIPT_FILENAME'];
     if (!isset($SCRIPT_FILENAME))
-        $SCRIPT_FILENAME = @$HTTP_ENV_VARS['SCRIPT_FILENAME'];
+        $SCRIPT_FILENAME = @$_ENV['SCRIPT_FILENAME'];
     if (!isset($SCRIPT_FILENAME))
         $SCRIPT_FILENAME = dirname(__FILE__ . '/../') . '/index.php';
     if (isWindows())

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/PagePerm.php	2012-11-14 17:35:05 UTC (rev 8461)
@@ -211,6 +211,7 @@
         case 'upgrade':
         case 'chown':
         case 'setacl':
+        case 'deleteacl':
             return 'change';
         default:
             //Todo: Plugins should be able to override its access type

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/main.php	2012-11-14 17:35:05 UTC (rev 8461)
@@ -1129,6 +1129,11 @@
         $this->adminActionSubpage(_("SetAclSimple"));
     }
 
+    function action_deleteacl()
+    {
+        $this->adminActionSubpage(_("DeleteAcl"));
+    }
+
     function action_rename()
     {
         $this->adminActionSubpage(_("Rename"));

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/pgsrc/PhpWikiAdministration	2012-11-14 17:35:05 UTC (rev 8461)
@@ -20,7 +20,7 @@
 
 or call the available ~WikiAdmin actions directly:
 
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
 
 == Global Access Rights ==
 

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012-11-14 17:35:05 UTC (rev 8461)
@@ -20,7 +20,7 @@
 
 or call the available ~WikiAdmin actions directly:
 
-| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
 
 == Global Access Rights ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8460] trunk/lib/stdlib.php

From: <var...@us...> - 2012-11-14 17:33:15

Revision: 8460
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8460&view=rev
Author:   vargenau
Date:     2012-11-14 17:33:09 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
is_localhost has no parameter

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-11-14 17:31:23 UTC (rev 8459)
+++ trunk/lib/stdlib.php	2012-11-14 17:33:09 UTC (rev 8460)
@@ -94,7 +94,7 @@
     printSimpleTrace($bt)
     getMemoryUsage()
     binary_search($needle, $haystack)
-    is_localhost($url)
+    is_localhost()
     javascript_quote_string($s)
     isSerialized($s)
     is_whole_number($var)
@@ -2448,12 +2448,9 @@
     }
 }
 
-function is_localhost($url = false)
+function is_localhost()
 {
-    if (!$url) {
-        global $HTTP_SERVER_VARS;
-        return $HTTP_SERVER_VARS['SERVER_ADDR'] == '127.0.0.1';
-    }
+    return $_SERVER['SERVER_ADDR'] == '127.0.0.1';
 }
 
 /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8459] trunk/lib/Request.php

From: <var...@us...> - 2012-11-14 17:31:33

Revision: 8459
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8459&view=rev
Author:   vargenau
Date:     2012-11-14 17:31:23 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
ob_get_level

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

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2012-11-14 17:30:28 UTC (rev 8458)
+++ trunk/lib/Request.php	2012-11-14 17:31:23 UTC (rev 8459)
@@ -436,8 +436,12 @@
             $this->_do_chunked_output = true;
             if (empty($this->_ob_get_length)) $this->_ob_get_length = 0;
             $this->_ob_get_length += ob_get_length();
-            while (@ob_end_flush()) ;
-            @ob_end_clean();
+            while (ob_get_level() > 0) {
+                ob_end_flush();
+            }
+            if (ob_get_level() > 0) {
+                ob_end_clean();
+            }
             ob_start();
         }
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8458] trunk/lib/Request.php

From: <var...@us...> - 2012-11-14 17:30:39

Revision: 8458
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8458&view=rev
Author:   vargenau
Date:     2012-11-14 17:30:28 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
get_old is false for FUSIONFORGE

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

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2012-11-14 17:10:09 UTC (rev 8457)
+++ trunk/lib/Request.php	2012-11-14 17:30:28 UTC (rev 8458)
@@ -653,6 +653,9 @@
 
     function get_old($key)
     {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
+            return false;
+        }
         $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
         if (isset($vars[$key])) {
             @$decode = base64_decode($vars[$key]);

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

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

From: <var...@us...> - 2012-11-14 17:10:22

Revision: 8457
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8457&view=rev
Author:   vargenau
Date:     2012-11-14 17:10:09 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Update locale

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

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-14 17:04:48 UTC (rev 8456)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-14 17:10:09 UTC (rev 8457)
@@ -426,7 +426,6 @@
 $locale["Found by "] = "Gefunden von ";
 $locale["FrameInclude"] = "FrameEinbetten";
 $locale["From english to %s: "] = "Von Englisch nach %s: ";
-$locale["Full text search results for '%s'"] = "Volltext-Suchresultate nach »%s«";
 $locale["FullDump"] = "VollSicherung";
 $locale["FullRecentChanges"] = "AlleNeuesteÄnderungen";
 $locale["FullTextSearch"] = "VolltextSuche";

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

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-14 17:04:48 UTC (rev 8456)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-14 17:10:09 UTC (rev 8457)
@@ -173,7 +173,6 @@
 $locale["Find page"] = "Buscar Página";
 $locale["FindPage"] = "BuscarPágina";
 $locale["First"] = "Primera";
-$locale["Full text search results for '%s'"] = "Resultados de la búsqueda en el texto completo para '%s'";
 $locale["FullDump"] = "DescargaCompleta";
 $locale["FullTextSearch"] = "BúsquedaDelTexto";
 $locale["Given password ignored."] = "Contraseña no hecho caso.";

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-14 17:04:48 UTC (rev 8456)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-14 17:10:09 UTC (rev 8457)
@@ -442,7 +442,6 @@
 $locale["FrameInclude"] = "InclureUnCadre";
 $locale["From english to %s: "] = "De l'Anglais au %s: ";
 $locale["Full changes"] = "Changements exhaustifs";
-$locale["Full text search results for '%s'"] = "Résultats de la recherche en texte intégral de ' %s '";
 $locale["FullDump"] = "SauvegardeTotale";
 $locale["FullRecentChanges"] = "DernièresModifs";
 $locale["FullTextSearch"] = "RechercheEnTexteIntégral";
@@ -1169,6 +1168,7 @@
 $locale["Uploading zip dumps"] = "Déposer la sauvegarde compressée";
 $locale["Use old markup"] = "Anciennes règles";
 $locale["User %s removed page %s"] = "L'utilisateur %s a supprimé la page %s";
+$locale["User Preferences"] = "Préférences de l'utilisateur";
 $locale["User not found in LDAP"] = "Utilisateur non trouvé dans l'annuaire LDAP";
 $locale["User page"] = "Page d'utilisateur";
 $locale["User preferences for this project"] = "Préférences pour ce projet";

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

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php	2012-11-14 17:04:48 UTC (rev 8456)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2012-11-14 17:10:09 UTC (rev 8457)
@@ -77,7 +77,6 @@
 $locale["Find page"] = "Trova Pagina";
 $locale["FindPage"] = "TrovaPagina";
 $locale["First"] = "Prima";
-$locale["Full text search results for '%s'"] = "Risultati della ricerca su tutto il testo per '%s'";
 $locale["FullTextSearch"] = "RicercaDelTesto";
 $locale["Global user preferences (for all projects)"] = "Preferenze dell'utente globale (per tutti i progetti)";
 $locale["Go"] = "Vai";

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/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/nl/LC_MESSAGES/phpwiki.php	2012-11-14 17:04:48 UTC (rev 8456)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php	2012-11-14 17:10:09 UTC (rev 8457)
@@ -28,7 +28,6 @@
 $locale["Fatal PhpWiki Error"] = "PhpWiki Fatale Fout";
 $locale["Find page"] = "Zoek Pagina";
 $locale["FindPage"] = "ZoekPagina";
-$locale["Full text search results for '%s'"] = "Volledige tekst zoek resultaten naar '%s'";
 $locale["FullTextSearch"] = "VolledigeTekstZoek";
 $locale["H"] = "H";
 $locale["Height"] = "Hoogte";

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-11-14 17:04:48 UTC (rev 8456)
+++ trunk/locale/po/de.po	2012-11-14 17:10:09 UTC (rev 8457)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-10 18:07+0200\n"
+"POT-Creation-Date: 2012-11-14 18:09+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -80,7 +80,7 @@
 msgstr "von %s"
 
 #: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:380
+#: ../lib/wikilens/PageListColumns.php:369
 msgid "None"
 msgstr "Keine"
 
@@ -188,7 +188,7 @@
 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:230
 #: ../lib/plugin/RecentChanges.php:237 ../lib/plugin/RecentChanges.php:440
 #: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentChanges.php:1280
-#: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:11
+#: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
 #: ../themes/default/templates/head.tmpl:59
@@ -196,7 +196,7 @@
 #: ../themes/default/templates/navbar.tmpl:13
 #: ../themes/fusionforge/templates/navbar.tmpl:8
 #: ../themes/MonoBook/templates/navbar.tmpl:13
-#: ../themes/Portland/templates/navbar.tmpl:23
+#: ../themes/Portland/templates/navbar.tmpl:22
 #: ../themes/shamino_com/templates/top.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:42
 #: ../themes/Sidebar/templates/rc.tmpl:3
@@ -218,7 +218,7 @@
 #: ../themes/blog/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/actionbar.tmpl:82
+#: ../themes/fusionforge/templates/actionbar.tmpl:73
 #: ../themes/MonoBook/templates/navbar.tmpl:49
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/smaller/templates/navbar.tmpl:14
@@ -365,7 +365,7 @@
 "eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)"
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:831
-#: ../lib/main.php:1209 ../lib/plugin/ModeratedPage.php:43
+#: ../lib/main.php:1214 ../lib/plugin/ModeratedPage.php:43
 #: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
 #: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
 #: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
@@ -390,7 +390,7 @@
 #: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/homepage.tmpl:10
 #: ../themes/default/templates/navbar.tmpl:24
-#: ../themes/fusionforge/templates/navbar.tmpl:25
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:25
 #: ../themes/Sidebar/templates/navbar.tmpl:49
@@ -636,7 +636,7 @@
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
-#: ../lib/EditToolbar.php:199 ../lib/PageList.php:560
+#: ../lib/EditToolbar.php:199 ../lib/PageList.php:539
 #: ../lib/plugin/AuthorHistory.php:154 ../lib/plugin/WantedPagesOld.php:147
 msgid "Page Name"
 msgstr "Seitenname"
@@ -703,16 +703,16 @@
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
 
-#: ../lib/IniConfig.php:1010
+#: ../lib/IniConfig.php:1012
 msgid "CategoryGroup"
 msgstr "KategorieGruppen"
 
 # (namenlos=unbenannt; depends on interpretation)
-#: ../lib/IniConfig.php:1012
+#: ../lib/IniConfig.php:1014
 msgid "An unnamed PhpWiki"
 msgstr "Unbenanntes PhpWiki"
 
-#: ../lib/IniConfig.php:1014 ../lib/upgrade.php:73
+#: ../lib/IniConfig.php:1016 ../lib/upgrade.php:73
 #: ../themes/blog/templates/browse-footer.tmpl:3
 #: ../themes/default/templates/userprefs.tmpl:129
 #: ../themes/fusionforge/templates/navbar.tmpl:7
@@ -762,7 +762,7 @@
 msgid "Dump to directory"
 msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern"
 
-#: ../lib/loadsave.php:79 ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../lib/loadsave.php:79 ../themes/fusionforge/templates/navbar.tmpl:18
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Sidebar/templates/navbar.tmpl:48
 msgid "Upload File"
@@ -784,7 +784,7 @@
 # must also be renamed to match what is here.
 #: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1041
 #: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1097
-#: ../lib/main.php:1229 ../lib/main.php:1242 ../lib/PagePerm.php:190
+#: ../lib/main.php:1234 ../lib/main.php:1247 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
@@ -793,9 +793,9 @@
 #: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
 #: ../themes/default/templates/navbar.tmpl:39
-#: ../themes/fusionforge/templates/navbar.tmpl:19
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:55
-#: ../themes/Portland/templates/navbar.tmpl:25
+#: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:68
 #: ../themes/smaller/templates/navbar.tmpl:17
@@ -923,7 +923,6 @@
 #: ../lib/loadsave.php:921 ../lib/loadsave.php:1557 ../lib/PageType.php:163
 #: ../lib/plugin/InterWikiSearch.php:56 ../lib/plugin/WantedPagesOld.php:77
 #: ../lib/plugin/WantedPages.php:56 ../themes/default/templates/info.tmpl:155
-#: ../themes/default/templates/info.tmpl:156
 #: ../themes/MonoBook/templates/info.tmpl:161
 #: ../themes/MonoBook/templates/info.tmpl:162
 msgid "InterWikiMap"
@@ -1026,7 +1025,7 @@
 #: ../lib/plugin/WikiAdminRename.php:215
 #: ../lib/plugin/WikiAdminSearchReplace.php:194
 #: ../lib/plugin/WikiAdminSetAcl.php:204
-#: ../themes/default/templates/info.tmpl:129
+#: ../themes/default/templates/info.tmpl:128
 msgid "Yes"
 msgstr "Ja"
 
@@ -1178,7 +1177,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:111 ../lib/WikiDB.php:1067
+#: ../lib/main.php:111 ../lib/WikiDB.php:1064
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
@@ -1442,30 +1441,35 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1134 ../lib/PagePerm.php:190
+#: ../lib/main.php:1134
+#, fuzzy
+msgid "DeleteAcl"
+msgstr "Gelöscht"
+
+#: ../lib/main.php:1139 ../lib/PagePerm.php:190
 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:118
+#: ../themes/fusionforge/templates/actionbar.tmpl:104
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../lib/main.php:1139 ../lib/main.php:1144 ../lib/plugin/PageDump.php:57
+#: ../lib/main.php:1144 ../lib/main.php:1149 ../lib/plugin/PageDump.php:57
 #: ../themes/Crao/templates/actionbar.tmpl:31
-#: ../themes/default/templates/actionbar.tmpl:37
+#: ../themes/default/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
 #: ../themes/shamino_com/templates/actionbar.tmpl:21
 #: ../themes/Sidebar/templates/actionbar.tmpl:60
-#: ../themes/smaller/templates/actionbar.tmpl:40
+#: ../themes/smaller/templates/actionbar.tmpl:39
 #: ../themes/smaller/templates/info.tmpl:10
 #: ../themes/Wordpress/templates/actionbar.tmpl:74
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
-#: ../lib/main.php:1164 ../lib/plugin/FullTextSearch.php:47
+#: ../lib/main.php:1169 ../lib/plugin/FullTextSearch.php:47
 #: ../lib/plugin/WantedPagesOld.php:130
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
-#: ../lib/main.php:1170 ../lib/plugin/RecentChanges.php:900
+#: ../lib/main.php:1175 ../lib/plugin/RecentChanges.php:900
 #: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
 #: ../themes/Crao/templates/navbar.tmpl:2
 #: ../themes/Crao/templates/navbar.tmpl:6
@@ -1480,37 +1484,37 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/main.php:1366 ../lib/main.php:1379 ../lib/Request.php:870
+#: ../lib/main.php:1371 ../lib/main.php:1384 ../lib/Request.php:870
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht änderbar."
 
-#: ../lib/main.php:1367
+#: ../lib/main.php:1372
 msgid "The session.save_path directory"
 msgstr "Das session.save_path Verzeichnis"
 
-#: ../lib/main.php:1369 ../lib/Request.php:872
+#: ../lib/main.php:1374 ../lib/Request.php:872
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Bitte überprüfen Sie, dass %s änderbar ist, oder ändern Sie %s in config/"
 "config.ini."
 
-#: ../lib/main.php:1370
+#: ../lib/main.php:1375
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "das session.save_path Verzeichnis »%s«"
 
-#: ../lib/main.php:1374
+#: ../lib/main.php:1379
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Versuche stattdessen das Verzeichnis »%s« zu verwenden."
 
-#: ../lib/main.php:1381
+#: ../lib/main.php:1386
 msgid "Users will not be able to sign in."
 msgstr "Benutzer werden sich nicht anmelden können."
 
-#: ../lib/main.php:1393
+#: ../lib/main.php:1398
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 
@@ -1532,151 +1536,151 @@
 msgid "Click to sort by %s"
 msgstr "Sortiere nach %s"
 
-#: ../lib/PageList.php:300
+#: ../lib/PageList.php:294
 msgid "Click to de-/select all pages"
 msgstr "Klicken Sie um alle/keine Seiten auszuwählen"
 
-#: ../lib/PageList.php:394 ../lib/plugin/IncludePage.php:207
+#: ../lib/PageList.php:382 ../lib/plugin/IncludePage.php:207
 #, php-format
 msgid " ... first %d bytes"
 msgstr " ... erste %d Bytes"
 
-#: ../lib/PageList.php:401
+#: ../lib/PageList.php:389
 #, php-format
 msgid " ... around %s"
 msgstr "... cirka %s"
 
-#: ../lib/PageList.php:458 ../lib/plugin/AppendText.php:59
+#: ../lib/PageList.php:446 ../lib/plugin/AppendText.php:59
 #, php-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../lib/PageList.php:610 ../lib/plugin/WikiAdminSetAcl.php:249
-#: ../themes/default/templates/info.tmpl:70
+#: ../lib/PageList.php:585 ../lib/plugin/WikiAdminSetAcl.php:249
+#: ../themes/default/templates/info.tmpl:69
 #: ../themes/MonoBook/templates/info.tmpl:83
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "Zugriffsrecht geerbt von %s"
 
-#: ../lib/PageList.php:612 ../lib/plugin/WikiAdminSetAcl.php:251
-#: ../themes/default/templates/info.tmpl:72
+#: ../lib/PageList.php:587 ../lib/plugin/WikiAdminSetAcl.php:251
+#: ../themes/default/templates/info.tmpl:71
 #: ../themes/MonoBook/templates/info.tmpl:85
 msgid "individual page permission"
 msgstr "individuelles Zugriffsrecht"
 
-#: ../lib/PageList.php:614 ../lib/plugin/WikiAdminSetAcl.php:252
-#: ../themes/default/templates/info.tmpl:74
+#: ../lib/PageList.php:589 ../lib/plugin/WikiAdminSetAcl.php:252
+#: ../themes/default/templates/info.tmpl:73
 #: ../themes/MonoBook/templates/info.tmpl:87
 msgid "default page permission"
 msgstr "Vorgabe Zugriffsrecht"
 
-#: ../lib/PageList.php:742 ../lib/plugin/FullTextSearch.php:119
+#: ../lib/PageList.php:715 ../lib/plugin/FullTextSearch.php:119
 msgid "<no matches>"
 msgstr "<nichts gefunden>"
 
-#: ../lib/PageList.php:1276 ../lib/plugin/FullTextSearch.php:90
+#: ../lib/PageList.php:1249 ../lib/plugin/FullTextSearch.php:90
 #: ../lib/plugin/WikiAdminSearchReplace.php:185
 msgid "Content"
 msgstr "Inhalt"
 
-#: ../lib/PageList.php:1288 ../lib/plugin/WikiAdminChmod.php:142
+#: ../lib/PageList.php:1261 ../lib/plugin/WikiAdminChmod.php:142
 #: ../lib/plugin/WikiAdminSetAcl.php:198
 msgid "Permission"
 msgstr "Zugriffsrecht"
 
-#: ../lib/PageList.php:1290 ../lib/plugin/WikiAdminSetAcl.php:200
+#: ../lib/PageList.php:1263 ../lib/plugin/WikiAdminSetAcl.php:200
 #: ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../themes/default/templates/info.tmpl:137
+#: ../themes/default/templates/info.tmpl:136
 #: ../themes/MonoBook/templates/info.tmpl:143
 msgid "ACL"
 msgstr "ACL"
 
-#: ../lib/PageList.php:1292
+#: ../lib/PageList.php:1265
 msgid "All"
 msgstr ""
 
-#: ../lib/PageList.php:1296 ../themes/default/templates/info.tmpl:54
+#: ../lib/PageList.php:1269 ../themes/default/templates/info.tmpl:54
 #: ../themes/MonoBook/templates/info.tmpl:68
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../lib/PageList.php:1298 ../themes/default/templates/info.tmpl:113
+#: ../lib/PageList.php:1271 ../themes/default/templates/info.tmpl:112
 #: ../themes/MonoBook/templates/info.tmpl:125
 msgid "Hits"
 msgstr "Treffer"
 
-#: ../lib/PageList.php:1300 ../themes/Crao/templates/editpage.tmpl:35
+#: ../lib/PageList.php:1273 ../themes/Crao/templates/editpage.tmpl:35
 #: ../themes/default/templates/editpage.tmpl:37
-#: ../themes/default/templates/info.tmpl:108
-#: ../themes/fusionforge/templates/editpage.tmpl:35
+#: ../themes/default/templates/info.tmpl:107
+#: ../themes/fusionforge/templates/editpage.tmpl:70
 #: ../themes/MonoBook/templates/info.tmpl:120
 #: ../themes/Wordpress/templates/editpage.tmpl:38
 msgid "Size"
 msgstr "Größe"
 
-#: ../lib/PageList.php:1303 ../themes/default/templates/info.tmpl:56
+#: ../lib/PageList.php:1276 ../themes/default/templates/info.tmpl:56
 #: ../themes/MonoBook/templates/info.tmpl:70
 msgid "Last Summary"
 msgstr "Letzte Zusammenfassung"
 
-#: ../lib/PageList.php:1305 ../lib/plugin/AuthorHistory.php:114
+#: ../lib/PageList.php:1278 ../lib/plugin/AuthorHistory.php:114
 #: ../lib/plugin/AuthorHistory.php:156
 msgid "Version"
 msgstr "Version"
 
-#: ../lib/PageList.php:1308 ../themes/default/templates/info.tmpl:55
+#: ../lib/PageList.php:1281 ../themes/default/templates/info.tmpl:55
 #: ../themes/MonoBook/templates/info.tmpl:69
 msgid "Last Author"
 msgstr "Letzter Autor"
 
-#: ../lib/PageList.php:1310 ../lib/WikiGroup.php:37
+#: ../lib/PageList.php:1283 ../lib/WikiGroup.php:37
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../lib/PageList.php:1312 ../lib/WikiGroup.php:38
+#: ../lib/PageList.php:1285 ../lib/WikiGroup.php:38
 msgid "Creator"
 msgstr "Erzeuger"
 
-#: ../lib/PageList.php:1318 ../themes/Crao/templates/editpage.tmpl:59
+#: ../lib/PageList.php:1291 ../themes/Crao/templates/editpage.tmpl:59
 #: ../themes/default/templates/editpage.tmpl:78
-#: ../themes/default/templates/info.tmpl:124
-#: ../themes/fusionforge/templates/editpage.tmpl:62
+#: ../themes/default/templates/info.tmpl:123
+#: ../themes/fusionforge/templates/editpage.tmpl:96
 #: ../themes/MonoBook/templates/info.tmpl:136
 #: ../themes/Wordpress/templates/editpage.tmpl:61
 msgid "Locked"
 msgstr "Gesperrt"
 
-#: ../lib/PageList.php:1319
+#: ../lib/PageList.php:1292
 msgid "locked"
 msgstr "gesperrt"
 
-#: ../lib/PageList.php:1321 ../themes/fusionforge/templates/editpage.tmpl:67
+#: ../lib/PageList.php:1294 ../themes/fusionforge/templates/editpage.tmpl:101
 msgid "External"
 msgstr "Externe"
 
-#: ../lib/PageList.php:1322
+#: ../lib/PageList.php:1295
 msgid "external"
 msgstr "externe"
 
-#: ../lib/PageList.php:1325
+#: ../lib/PageList.php:1298
 msgid "Minor Edit"
 msgstr "Kleinere Änderung"
 
-#: ../lib/PageList.php:1325
+#: ../lib/PageList.php:1298
 msgid "minor"
 msgstr "kleinere"
 
-#: ../lib/PageList.php:1327 ../themes/default/templates/info.tmpl:104
+#: ../lib/PageList.php:1300 ../themes/default/templates/info.tmpl:103
 #: ../themes/MonoBook/templates/info.tmpl:116
 msgid "Markup"
 msgstr "Quelltext"
 
-#: ../lib/PageList.php:1500 ../lib/PageList.php:1507 ../lib/PageList.php:1512
+#: ../lib/PageList.php:1473 ../lib/PageList.php:1480 ../lib/PageList.php:1485
 #: ../lib/WikiDB/backend.php:574 ../lib/WikiDB/backend.php:579
 msgid "Illegal 'limit' argument: must be numeric"
 msgstr ""
 
-#: ../lib/PageList.php:1627 ../lib/plugin/WantedPagesOld.php:175
+#: ../lib/PageList.php:1600 ../lib/plugin/WantedPagesOld.php:175
 #, php-format
 msgid "Columns: %s."
 msgstr "Spalten: %s."
@@ -1685,82 +1689,82 @@
 msgid "SearchReplace"
 msgstr "Suchen & Ersetzen"
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:328
 msgid "List this page and all subpages"
 msgstr "Auflistung aller Seiten und Unterseiten"
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:329
 msgid "View this page and all subpages"
 msgstr "Anzeige aller Seiten und Unterseiten"
 
-#: ../lib/PagePerm.php:329
+#: ../lib/PagePerm.php:330
 msgid "Edit this page and all subpages"
 msgstr "Bearbeiten aller Seiten und Unterseiten"
 
 # Erzeugen??
-#: ../lib/PagePerm.php:330
+#: ../lib/PagePerm.php:331
 msgid "Create a new (sub)page"
 msgstr "Erzeuge eine neue (Unter)Seite"
 
-#: ../lib/PagePerm.php:331
+#: ../lib/PagePerm.php:332
 msgid "Download page contents"
 msgstr "Runterladen der Seite"
 
-#: ../lib/PagePerm.php:332
+#: ../lib/PagePerm.php:333
 msgid "Change page attributes"
 msgstr "Ändern von Eigenschaften"
 
-#: ../lib/PagePerm.php:333
+#: ../lib/PagePerm.php:334
 msgid "Remove this page"
 msgstr "Löschen der Seite"
 
-#: ../lib/PagePerm.php:334
+#: ../lib/PagePerm.php:335
 msgid "Purge this page"
 msgstr "Lösche diese Seite endgültig"
 
-#: ../lib/PagePerm.php:366
+#: ../lib/PagePerm.php:367
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr "Nicht unterstützter ACL Zugiffsmodus %s ignoriert."
 
-#: ../lib/PagePerm.php:601
+#: ../lib/PagePerm.php:602
 msgid "Access"
 msgstr "Zugriff"
 
-#: ../lib/PagePerm.php:603
+#: ../lib/PagePerm.php:604
 msgid "Group/User"
 msgstr "Gruppe/Benutzer"
 
-#: ../lib/PagePerm.php:604
+#: ../lib/PagePerm.php:605
 msgid "Grant"
 msgstr "Erlaube"
 
-#: ../lib/PagePerm.php:605
+#: ../lib/PagePerm.php:606
 msgid "Del/+"
 msgstr "Lö/+"
 
-#: ../lib/PagePerm.php:606 ../lib/plugin/PluginManager.php:76
+#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76
 #: ../lib/plugin/WikiAdminSetAcl.php:256
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../lib/PagePerm.php:627
+#: ../lib/PagePerm.php:628
 msgid "Add this ACL"
 msgstr "Füge diese ACL hinzu"
 
-#: ../lib/PagePerm.php:651
+#: ../lib/PagePerm.php:652
 msgid "Allow / Deny"
 msgstr "Erlaube / Sperre"
 
-#: ../lib/PagePerm.php:663
+#: ../lib/PagePerm.php:664
 msgid "Delete this ACL"
 msgstr "Lösche diese ACL"
 
-#: ../lib/PagePerm.php:689
+#: ../lib/PagePerm.php:690
 msgid "add "
 msgstr "hinzufügen "
 
-#: ../lib/PagePerm.php:693
+#: ../lib/PagePerm.php:694
 msgid "Check to add this ACL"
 msgstr "Anklicken um diese ACL hinzuzufügen"
 
@@ -1771,10 +1775,10 @@
 #: ../lib/PageType.php:289 ../lib/PageType.php:292 ../lib/stdlib.php:854
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
-#: ../themes/fusionforge/templates/actionbar.tmpl:14
-#: ../themes/fusionforge/templates/actionbar.tmpl:25
-#: ../themes/fusionforge/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:42
+#: ../themes/fusionforge/templates/actionbar.tmpl:13
+#: ../themes/fusionforge/templates/actionbar.tmpl:23
+#: ../themes/fusionforge/templates/actionbar.tmpl:29
+#: ../themes/fusionforge/templates/actionbar.tmpl:39
 #: ../themes/MonoBook/templates/actionbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -1854,17 +1858,17 @@
 msgid "List of pages owned by [%s] (%d total):"
 msgstr "Liste der Seiten owned by [%s] (%d insgesamt):"
 
-#: ../lib/plugin/AllPages.php:100 ../lib/plugin/LinkDatabase.php:98
+#: ../lib/plugin/AllPages.php:99 ../lib/plugin/LinkDatabase.php:98
 #, php-format
 msgid "List of pages last edited by [%s] (%d total):"
 msgstr "Liste der Seiten last edited by [%s] (%d insgesamt):"
 
-#: ../lib/plugin/AllPages.php:113 ../lib/plugin/LinkDatabase.php:105
+#: ../lib/plugin/AllPages.php:111 ../lib/plugin/LinkDatabase.php:105
 #, php-format
 msgid "List of pages created by [%s] (%d total):"
 msgstr "Liste der Seiten erzeugt von [%s] (%d insgesamt):"
 
-#: ../lib/plugin/AllPages.php:143 ../lib/plugin/AllUsers.php:107
+#: ../lib/plugin/AllPages.php:140 ../lib/plugin/AllUsers.php:107
 #, php-format
 msgid "Elapsed time: %s s"
 msgstr "Dauer: %s s"
@@ -2104,7 +2108,7 @@
 #: ../themes/Crao/templates/editpage.tmpl:46
 #: ../themes/default/templates/editpage.tmpl:48
 #: ../themes/default/templates/info.tmpl:61
-#: ../themes/fusionforge/templates/editpage.tmpl:42
+#: ../themes/fusionforge/templates/editpage.tmpl:77
 #: ../themes/MonoBook/templates/info.tmpl:75
 #: ../themes/Portland/templates/editpage.tmpl:34
 #: ../themes/Wordpress/templates/editpage.tmpl:46
@@ -2130,7 +2134,7 @@
 
 #: ../lib/plugin/_BackendInfo.php:31 ../lib/plugin/_WikiTranslation.php:53
 #: ../themes/Crao/templates/actionbar.tmpl:30
-#: ../themes/default/templates/actionbar.tmpl:36
+#: ../themes/default/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:186
 #: ../themes/Portland/templates/actionbar.tmpl:15
 #: ../themes/smaller/templates/info.tmpl:13
@@ -2212,7 +2216,7 @@
 msgstr ""
 
 #: ../lib/plugin/BlogArchives.php:40 ../lib/plugin/BlogArchives.php:149
-#: ../themes/blog/templates/actionbar.tmpl:8
+#: ../themes/blog/templates/actionbar.tmpl:7
 msgid "Archives"
 msgstr ""
 
@@ -2226,7 +2230,7 @@
 msgstr "Blog-Einträge für %s:"
 
 #: ../lib/plugin/BlogArchives.php:110
-#: ../themes/blog/templates/actionbar.tmpl:8
+#: ../themes/blog/templates/actionbar.tmpl:7
 msgid "BlogArchives"
 msgstr "BlogArchiv"
 
@@ -2629,8 +2633,8 @@
 msgstr "Den Text aller Seiten dieses Wikis durchsuchen."
 
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
-#, php-format
-msgid "Full text search results for '%s'"
+#, fuzzy, php-format
+msgid "Full text search results for “%s”"
 msgstr "Volltext-Suchresultate nach »%s«"
 
 #: ../lib/plugin/FullTextSearch.php:117
@@ -2873,11 +2877,11 @@
 msgid "Perform searches on InterWiki sites listed in InterWikiMap."
 msgstr "Durchsuchen im InterWiki sites die im InterWikiMap verzeichnet sind."
 
-#: ../lib/plugin/InterWikiSearch.php:97
+#: ../lib/plugin/InterWikiSearch.php:95
 msgid "Wiki Name"
 msgstr "Name des Wikis"
 
-#: ../lib/plugin/InterWikiSearch.php:98 ../lib/plugin/RecentChanges.php:897
+#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:897
 #: ../lib/plugin/SemanticSearchAdvanced.php:113
 #: ../themes/Crao/templates/navbar.tmpl:40
 #: ../themes/Crao/templates/navbar.tmpl:42
@@ -3371,7 +3375,8 @@
 #: ../lib/plugin/PageHistory.php:132 ../lib/plugin/PageHistory.php:278
 #: ../lib/plugin/PageHistory.php:333 ../lib/plugin/RecentChanges.php:102
 #: ../themes/Crao/templates/actionbar.tmpl:25
-#: ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/default/templates/actionbar.tmpl:30
+#: ../themes/fusionforge/templates/actionbar.tmpl:61
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/info.tmpl:179
 #: ../themes/Portland/templates/actionbar.tmpl:12
@@ -3379,7 +3384,7 @@
 #: ../themes/shamino_com/templates/actionbar.tmpl:19
 #: ../themes/Sidebar/templates/actionbar.tmpl:26
 #: ../themes/Sidebar/templates/actionbar.tmpl:57
-#: ../themes/smaller/templates/actionbar.tmpl:38
+#: ../themes/smaller/templates/actionbar.tmpl:37
 #: ../themes/smaller/templates/info.tmpl:5
 #: ../themes/Wordpress/templates/actionbar.tmpl:68
 #: ../themes/Wordpress/templates/viewsource.tmpl:20
@@ -3413,7 +3418,8 @@
 msgstr "Das Änderungsprotokoll für %s auflisten"
 
 #: ../lib/plugin/PageInfo.php:33 ../themes/Crao/templates/actionbar.tmpl:27
-#: ../themes/default/templates/actionbar.tmpl:33
+#: ../themes/default/templates/actionbar.tmpl:32
+#: ../themes/fusionforge/templates/actionbar.tmpl:71
 #: ../themes/MonoBook/templates/actionbar.tmpl:74
 #: ../themes/Portland/templates/actionbar.tmpl:13
 #: ../themes/shamino_com/templates/actionbar.tmpl:4
@@ -3514,7 +3520,7 @@
 msgid "An email will be sent."
 msgstr ""
 
-#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:9
+#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
 msgid "PhotoAlbum"
 msgstr "BilderAlbum"
 
@@ -4272,7 +4278,7 @@
 msgstr ""
 
 #: ../lib/plugin/SemanticSearchAdvanced.php:192
-#: ../lib/plugin/SemanticSearch.php:334 ../lib/SemanticWeb.php:150
+#: ../lib/plugin/SemanticSearch.php:334 ../lib/SemanticWeb.php:149
 msgid "Relation"
 msgstr ""
 
@@ -4346,7 +4352,7 @@
 msgid "Only text operators can be used with strings: %s"
 msgstr ""
 
-#: ../lib/plugin/SemanticSearch.php:410 ../lib/SemanticWeb.php:152
+#: ../lib/plugin/SemanticSearch.php:410 ../lib/SemanticWeb.php:151
 msgid "Attribute"
 msgstr "Attribut"
 
@@ -4932,17 +4938,17 @@
 msgid "ERROR uploading '%s'"
 msgstr "FEHLER beim Hochladen von »%s«"
 
-#: ../lib/plugin/UpLoad.php:221
+#: ../lib/plugin/UpLoad.php:220
 #, php-format
 msgid "Files with extension %s are not allowed."
 msgstr "Dateien mit der Endung %s sind nicht erlaubt."
 
-#: ../lib/plugin/UpLoad.php:228
+#: ../lib/plugin/UpLoad.php:227
 #, php-format
 msgid "Only files with the extension %s are allowed."
 msgstr "Nur Dateien mit der Endung %s sind erlaubt"
 
-#: ../lib/plugin/UpLoad.php:232
+#: ../lib/plugin/UpLoad.php:231
 msgid ""
 "Invalid filename. File names may only contain alphanumeric characters and "
 "dot, underscore, space or dash."
@@ -4950,41 +4956,41 @@
 "Dateinamen dürfen nur folgende Zeichen enthalten: alphanumerische Zeichen, "
 "Punkt, Unterstrich, Leerzeichen und Bindestrich."
 
-#: ../lib/plugin/UpLoad.php:235
+#: ../lib/plugin/UpLoad.php:234
 #, php-format
 msgid "There is already a file with name %s uploaded."
 msgstr "Es existiert schon eine gleichnamige, hochgeladene Datei %s."
 
-#: ../lib/plugin/UpLoad.php:239
+#: ../lib/plugin/UpLoad.php:237
 msgid "Sorry but this file is too big."
 msgstr "Leider ist diese Datei zu groß."
 
-#: ../lib/plugin/UpLoad.php:246
+#: ../lib/plugin/UpLoad.php:245
 msgid "File successfully uploaded."
 msgstr "Datei erfolgreich hochgeladen."
 
-#: ../lib/plugin/UpLoad.php:263
+#: ../lib/plugin/UpLoad.php:262
 #, php-format
 msgid "uploaded %s"
 msgstr "%s wurde hochgeladen"
 
-#: ../lib/plugin/UpLoad.php:269
+#: ../lib/plugin/UpLoad.php:267
 msgid "Uploading failed."
 msgstr "Hochladen fehlgeschlagen."
 
-#: ../lib/plugin/UpLoad.php:272
+#: ../lib/plugin/UpLoad.php:271
 msgid "No file selected. Please select one."
 msgstr ""
 
-#: ../lib/plugin/UpLoad.php:287
+#: ../lib/plugin/UpLoad.php:286
 msgid "The upload logfile exists but is not writable."
 msgstr "Die Upload Logdatei ist nicht schreibbar."
 
-#: ../lib/plugin/UpLoad.php:289
+#: ../lib/plugin/UpLoad.php:288
 msgid "Can't open the upload logfile."
 msgstr "Die Upload-Logdatei konnte nicht geöffnet worden."
 
-#: ../lib/plugin/UriResolver.php:37 ../lib/SemanticWeb.php:136
+#: ../lib/plugin/UriResolver.php:37 ../lib/SemanticWeb.php:135
 msgid "UriResolver"
 msgstr ""
 
@@ -5077,7 +5083,7 @@
 msgid "Pred"
 msgstr ""
 
-#: ../lib/plugin/UserRatings.php:207 ../lib/wikilens/PageListColumns.php:400
+#: ../lib/plugin/UserRatings.php:207 ../lib/wikilens/PageListColumns.php:387
 msgid "Rate"
 msgstr "Bewerte"
 
@@ -5160,7 +5166,7 @@
 msgstr "WunschZettelSeiten in diesem Wiki:"
 
 #: ../lib/plugin/WatchPage.php:37
-#: ../themes/fusionforge/templates/actionbar.tmpl:130
+#: ../themes/fusionforge/templates/actionbar.tmpl:115
 #: ../themes/MonoBook/templates/actionbar.tmpl:54
 #: ../themes/Sidebar/templates/actionbar.tmpl:29
 msgid "WatchPage"
@@ -5193,19 +5199,19 @@
 msgstr "Diese Seite %s is schon beobachtet"
 
 #: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1054
-#: ../themes/blog/templates/actionbar.tmpl:16 ../themes/blog/themeinfo.php:69
+#: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
-#: ../themes/default/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:54
+#: ../themes/default/templates/actionbar.tmpl:12
+#: ../themes/fusionforge/templates/actionbar.tmpl:50
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
-#: ../themes/smaller/templates/actionbar.tmpl:17
+#: ../themes/smaller/templates/actionbar.tmpl:16
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: ../lib/plugin/WatchPage.php:99
-#: ../themes/fusionforge/templates/actionbar.tmpl:130
+#: ../themes/fusionforge/templates/actionbar.tmpl:115
 msgid "Watch Page"
 msgstr "Seite beobarchten"
 
@@ -6288,7 +6294,7 @@
 msgstr ""
 
 #: ../lib/plugin/_WikiTranslation.php:106
-#: ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../themes/fusionforge/templates/navbar.tmpl:18
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Sidebar/templates/navbar.tmpl:48
 msgid "UpLoad"
@@ -6518,7 +6524,7 @@
 msgid "%s KiB (%s bytes)"
 msgstr "%s KiB (%s Bytes)"
 
-#: ../lib/stdlib.php:1548 ../lib/XmlElement.php:522
+#: ../lib/stdlib.php:1548 ../lib/XmlElement.php:518
 #, php-format
 msgid "Can't mix '%s' with '%s' type format strings"
 msgstr "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen."
@@ -6834,18 +6840,18 @@
 msgid "WikiDB::renamePage() not yet implemented for this backend"
 msgstr "WikiDB::renamePage() für dieses Backend noch nicht implementiert"
 
-#: ../lib/WikiDB.php:989
+#: ../lib/WikiDB.php:986
 #, php-format
 msgid "%s: Date of new revision is %s"
 msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
 
-#: ../lib/WikiDB.php:1760 ../lib/WikiDB.php:1764
+#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
 #: ../themes/default/templates/homepage.tmpl:6
 #, php-format
 msgid "Describe %s here."
 msgstr "Beschreiben Sie %s hier."
 
-#: ../lib/WikiDB.php:1799
+#: ../lib/WikiDB.php:1794
 #, php-format
 msgid "Oops! Revision %s of %s seems to have been deleted!"
 msgstr "Hoppla! Es scheint, die Version %s von %s wurde gelöscht!"
@@ -6932,27 +6938,27 @@
 msgid "Buddies:"
 msgstr ""
 
-#: ../lib/wikilens/PageListColumns.php:397
+#: ../lib/wikilens/PageListColumns.php:384
 msgid "# things"
 msgstr ""
 
-#: ../lib/wikilens/PageListColumns.php:403
+#: ../lib/wikilens/PageListColumns.php:390
 msgid "Rating"
 msgstr "BenutzerBewertungen"
 
-#: ../lib/wikilens/PageListColumns.php:406
+#: ../lib/wikilens/PageListColumns.php:393
 msgid "Go?"
 msgstr "Los?"
 
-#: ../lib/wikilens/PageListColumns.php:409
+#: ../lib/wikilens/PageListColumns.php:396
 msgid "MinMisery"
 msgstr ""
 
-#: ../lib/wikilens/PageListColumns.php:412
+#: ../lib/wikilens/PageListColumns.php:399
 msgid "Avg. Rating"
 msgstr "Durchschnittsbewertung"
 
-#: ../lib/wikilens/PageListColumns.php:415
+#: ../lib/wikilens/PageListColumns.php:402
 msgid "Top Recommendations"
 msgstr "Beste Bewertungungen"
 
@@ -7114,16 +7120,16 @@
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1885
+#: ../lib/WikiTheme.php:1874
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1912
+#: ../lib/WikiTheme.php:1901
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1935
+#: ../lib/WikiTheme.php:1924
 msgid "External Links"
 msgstr "Externe Links"
 
@@ -7439,37 +7445,37 @@
 msgid "References"
 msgstr "Fußnoten"
 
-#: ../themes/blog/templates/actionbar.tmpl:6
+#: ../themes/blog/templates/actionbar.tmpl:5
 msgid "Home"
 msgstr "Start"
 
-#: ../themes/blog/templates/actionbar.tmpl:7
+#: ../themes/blog/templates/actionbar.tmpl:6
 #: ../themes/MonoBook/templates/browse-footer.tmpl:13
 #: ../themes/MonoBook/templates/browse-footer.tmpl:14
 msgid "About"
 msgstr "Über"
 
-#: ../themes/blog/templates/actionbar.tmpl:10
+#: ../themes/blog/templates/actionbar.tmpl:9
 msgid "HowTo"
 msgstr ""
 
-#: ../themes/blog/templates/actionbar.tmpl:12
-#: ../themes/smaller/templates/actionbar.tmpl:35
+#: ../themes/blog/templates/actionbar.tmpl:11
+#: ../themes/smaller/templates/actionbar.tmpl:34
 msgid "Info"
 msgstr "Info"
 
-#: ../themes/blog/templates/actionbar.tmpl:18
+#: ../themes/blog/templates/actionbar.tmpl:17
 #: ../themes/Crao/templates/actionbar.tmpl:6
 #: ../themes/Crao/templates/head.tmpl:37
-#: ../themes/default/templates/actionbar.tmpl:18
+#: ../themes/default/templates/actionbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:43
-#: ../themes/fusionforge/templates/actionbar.tmpl:60
+#: ../themes/fusionforge/templates/actionbar.tmpl:56
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:178
 #: ../themes/Portland/templates/actionbar.tmpl:6
 #: ../themes/Sidebar/templates/actionbar.tmpl:24
 #: ../themes/Sidebar/templates/actionbar.tmpl:54
-#: ../themes/smaller/templates/actionbar.tmpl:19
+#: ../themes/smaller/templates/actionbar.tmpl:18
 #: ../themes/smaller/templates/info.tmpl:4
 #: ../themes/wikilens/templates/head.tmpl:35
 #: ../themes/Wordpress/templates/actionbar.tmpl:8
@@ -7519,7 +7525,7 @@
 #: ../themes/Crao/templates/editpage.tmpl:96
 #: ../themes/default/templates/blogform.tmpl:22
 #: ../themes/default/templates/editpage.tmpl:120
-#: ../themes/fusionforge/templates/editpage.tmpl:79
+#: ../themes/fusionforge/templates/editpage.tmpl:114
 #: ../themes/Portland/templates/editpage.tmpl:81
 #: ../themes/Wordpress/templates/editpage.tmpl:96
 msgid "Help/TextFormattingRules"
@@ -7532,8 +7538,8 @@
 #: ../themes/default/templates/editpage.tmpl:115
 #: ../themes/default/templates/editpage.tmpl:120
 #: ../themes/fusionforge/templates/blogform.tmpl:21
-#: ../themes/fusionforge/templates/editpage.tmpl:79
-#: ../themes/fusionforge/templates/editpage.tmpl:81
+#: ../themes/fusionforge/templates/editpage.tmpl:114
+#: ../themes/fusionforge/templates/editpage.tmpl:116
 #: ../themes/Portland/templates/editpage.tmpl:76
 #: ../themes/Portland/templates/editpage.tmpl:81
 #: ../themes/Wordpress/templates/editpage.tmpl:91
@@ -7651,13 +7657,13 @@
 msgstr "Kommentar zu %s von %s."
 
 #: ../themes/blog/themeinfo.php:77
-#: ../themes/fusionforge/templates/actionbar.tmpl:99
+#: ../themes/fusionforge/templates/actionbar.tmpl:88
 #: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Sperren"
 
 #: ../themes/blog/themeinfo.php:79
-#: ../themes/fusionforge/templates/actionbar.tmpl:97
+#: ../themes/fusionforge/templates/actionbar.tmpl:86
 msgid "Unlock"
 msgstr "Entsperren"
 
@@ -7670,19 +7676,19 @@
 msgstr "(diff)"
 
 #: ../themes/Crao/templates/actionbar.tmpl:4
-#: ../themes/default/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/default/templates/actionbar.tmpl:12
+#: ../themes/fusionforge/templates/actionbar.tmpl:52
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Portland/templates/actionbar.tmpl:4
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
-#: ../themes/smaller/templates/actionbar.tmpl:17
+#: ../themes/smaller/templates/actionbar.tmpl:16
 #: ../themes/Wordpress/templates/actionbar.tmpl:6
 msgid "Edit Old Revision"
 msgstr "Alte Version Bearbeiten"
 
 #: ../themes/Crao/templates/actionbar.tmpl:33
-#: ../themes/default/templates/actionbar.tmpl:41
+#: ../themes/default/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/info.tmpl:189
 #: ../themes/Sidebar/templates/actionbar.tmpl:62
 #: ../themes/smaller/templates/info.tmpl:16
@@ -7690,7 +7696,7 @@
 msgstr "HtmlCacheSäubern"
 
 #: ../themes/Crao/templates/actionbar.tmpl:34
-#: ../themes/default/templates/actionbar.tmpl:42
+#: ../themes/default/templates/actionbar.tmpl:41
 #: ../themes/MonoBook/templates/actionbar.tmpl:81
 #: ../themes/MonoBook/templates/info.tmpl:190
 #: ../themes/Sidebar/templates/actionbar.tmpl:63
@@ -7704,7 +7710,6 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:2
 #: ../themes/default/templates/editpage.tmpl:2
-#: ../themes/fusionforge/templates/editpage.tmpl:5
 #: ../themes/Portland/templates/editpage.tmpl:52
 #: ../themes/Wordpress/templates/editpage.tmpl:67
 msgid "Preview only!  Changes not saved."
@@ -7713,13 +7718,11 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:7
 #: ../themes/default/templates/editpage.tmpl:7
-#: ../themes/fusionforge/templates/editpage.tmpl:7
 msgid "edit area"
 msgstr "Texteingabe Fenster"
 
 #: ../themes/Crao/templates/editpage.tmpl:6
 #: ../themes/default/templates/editpage.tmpl:6
-#: ../themes/fusionforge/templates/editpage.tmpl:6
 #, php-format
 msgid ""
 "Please continue editing.  (You'll find your %s at the bottom of the page.)"
@@ -7727,7 +7730,6 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:16
 #: ../themes/default/templates/editpage.tmpl:18
-#: ../themes/fusionforge/templates/editpage.tmpl:16
 #: ../themes/Portland/templates/editpage.tmpl:20
 #: ../themes/Wordpress/templates/editpage.tmpl:23
 msgid "Warning: You are editing an old revision."
@@ -7735,7 +7737,6 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:17
 #: ../themes/default/templates/editpage.tmpl:19
-#: ../themes/fusionforge/templates/editpage.tmpl:17
 #: ../themes/Portland/templates/editpage.tmpl:21
 #: ../themes/Wordpress/templates/editpage.tmpl:24
 msgid "Saving this page will overwrite the current version."
@@ -7745,7 +7746,7 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:36
 #: ../themes/default/templates/editpage.tmpl:38
-#: ../themes/fusionforge/templates/editpage.tmpl:36
+#: ../themes/fusionforge/templates/editpage.tmpl:71
 #: ../themes/Portland/templates/editpage.tmpl:43
 #: ../themes/Wordpress/templates/editpage.tmpl:39
 msgid "H"
@@ -7753,7 +7754,7 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:37
 #: ../themes/default/templates/editpage.tmpl:39
-#: ../themes/fusionforge/templates/editpage.tmpl:37
+#: ../themes/fusionforge/templates/editpage.tmpl:72
 #: ../themes/Portland/templates/editpage.tmpl:44
 #: ../themes/Wordpress/templates/editpage.tmpl:40
 msgid "W"
@@ -7761,7 +7762,7 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:38
 #: ../themes/default/templates/editpage.tmpl:40
-#: ../themes/fusionforge/templates/editpage.tmpl:38
+#: ../themes/fusionforge/templates/editpage.tmpl:73
 #: ../themes/Portland/templates/editpage.tmpl:45
 #: ../themes/Wordpress/templates/editpage.tmpl:41
 msgid "Adjust"
@@ -7773,7 +7774,7 @@
 
 #: ../themes/Crao/templates/editpage.tmpl:56
 #: ../themes/default/templates/editpage.tmpl:60
-#: ../themes/fusionforge/templates/editpage.tmpl:48
+#: ../themes/fusionforge/templates/editpage.tmpl:82
 msgid "This is a minor change."
 msgstr "Kleinere Änderung."
 
@@ -7837,12 +7838,12 @@
 msgid "Enter your UserId to sign in"
 msgstr "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein"
 
-#: ../themes/default/templates/actionbar.tmpl:28
-#: ../themes/fusionforge/templates/actionbar.tmpl:75
+#: ../themes/default/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:68
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:70
 #: ../themes/Sidebar/templates/actionbar.tmpl:46
-#: ../themes/smaller/templates/actionbar.tmpl:30
+#: ../themes/smaller/templates/actionbar.tmpl:29
 #: ../themes/Wordpress/templates/actionbar.tmpl:56
 msgid "Revert"
 msgstr "Zurückspeichern"
@@ -7879,7 +7880,7 @@
 msgstr "Dialog"
 
 #: ../themes/default/templates/editpage.tmpl:78
-#: ../themes/fusionforge/templates/editpage.tmpl:62
+#: ../themes/fusionforge/templates/editpage.tmpl:96
 msgid "Make the page read-only?"
 msgstr ""
 
@@ -7888,7 +7889,7 @@
 msgstr ""
 
 #: ../themes/default/templates/editpage.tmpl:80
-#: ../themes/fusionforge/templates/editpage.tmpl:64
+#: ../themes/fusionforge/templates/editpage.tmpl:98
 msgid "Public"
 msgstr ""
 
@@ -7953,15 +7954,15 @@
 #: ../themes/default/templates/info.tmpl:59
 #: ../themes/default/templates/info.tmpl:60
 #: ../themes/default/templates/info.tmpl:61
-#: ../themes/default/templates/info.tmpl:82
-#: ../themes/default/templates/info.tmpl:100
-#: ../themes/default/templates/info.tmpl:104
-#: ../themes/default/templates/info.tmpl:108
-#: ../themes/default/templates/info.tmpl:113
-#: ../themes/default/templates/info.tmpl:128
-#: ../themes/default/templates/info.tmpl:133
-#: ../themes/default/templates/info.tmpl:137
-#: ../themes/default/templates/info.tmpl:164
+#: ../themes/default/templates/info.tmpl:81
+#: ../themes/default/templates/info.tmpl:99
+#: ../themes/default/templates/info.tmpl:103
+#: ../themes/default/templates/info.tmpl:107
+#: ../themes/default/templates/info.tmpl:112
+#: ../themes/default/templates/info.tmpl:127
+#: ../themes/default/templates/info.tmpl:132
+#: ../themes/default/templates/info.tmpl:136
+#: ../themes/default/templates/info.tmpl:163
 #: ../themes/default/templates/userprefs.tmpl:141
 #: ../themes/default/templates/userprefs.tmpl:144
 #: ../themes/default/templates/userprefs.tmpl:154
@@ -7992,65 +7993,59 @@
 msgid "Saved on"
 msgstr "Gespeichert am"
 
-#: ../themes/default/templates/info.tmpl:64
-#: ../themes/MonoBook/templates/info.tmpl:78
-#, php-format
-msgid "Statistics about %s."
-msgstr "Statistik über %s."
-
-#: ../themes/default/templates/info.tmpl:82
+#: ../themes/default/templates/info.tmpl:81
 #: ../themes/MonoBook/templates/info.tmpl:95
 msgid "Supplanted on"
 msgstr "Ersetzt am"
 
-#: ../themes/default/templates/info.tmpl:100
+#: ../themes/default/templates/info.tmpl:99
 #: ../themes/MonoBook/templates/info.tmpl:112
 msgid "Page Version"
 msgstr "Seiten Version"
 
-#: ../themes/default/templates/info.tmpl:128
+#: ../themes/default/templates/info.tmpl:127
 msgid "Is External"
 msgstr ""
 
-#: ../themes/default/templates/info.tmpl:129
+#: ../themes/default/templates/info.tmpl:128
 msgid "No"
 msgstr "Nein"
 
-#: ../themes/default/templates/info.tmpl:133
+#: ../themes/default/templates/info.tmpl:132
 #: ../themes/MonoBook/templates/info.tmpl:139
 msgid "ACL type"
 msgstr ""
 
-#: ../themes/default/templates/info.tmpl:144
+#: ../themes/default/templates/info.tmpl:143
 #: ../themes/fusionforge/templates/navbar.tmpl:7
 #: ../themes/MonoBook/templates/info.tmpl:150
 #: ../themes/MonoBook/templates/navbar.tmpl:12
 msgid "Home Page"
 msgstr "Start Seite"
 
-#: ../themes/default/templates/info.tmpl:147
+#: ../themes/default/templates/info.tmpl:146
 #: ../themes/MonoBook/templates/info.tmpl:153
 msgid "User page"
 msgstr "Benutzer Seite"
 
-#: ../themes/default/templates/info.tmpl:150
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/fusionforge/templates/actionbar.tmpl:38
+#: ../themes/default/templates/info.tmpl:149
+#: ../themes/fusionforge/templates/actionbar.tmpl:17
+#: ../themes/fusionforge/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/info.tmpl:156
 msgid "Action Page"
 msgstr "Aktion Seite"
 
-#: ../themes/default/templates/info.tmpl:153
+#: ../themes/default/templates/info.tmpl:152
 #: ../themes/MonoBook/templates/info.tmpl:159
 msgid "Blog page"
 msgstr "Blog Seite"
 
-#: ../themes/default/templates/info.tmpl:159
+#: ../themes/default/templates/info.tmpl:158
 #: ../themes/MonoBook/templates/info.tmpl:165
 msgid "Subpage"
 msgstr "Unterseite"
 
-#: ../themes/default/templates/info.tmpl:164
+#: ../themes/default/templates/info.tmpl:163
 #: ../themes/MonoBook/templates/info.tmpl:170
 msgid "Page Type"
 msgstr "Seitentyp"
@@ -8518,57 +8513,57 @@
 msgid "Posted: %s"
 msgstr "Gepostet: %s"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:18
-#: ../themes/fusionforge/templates/actionbar.tmpl:38
+#: ../themes/fusionforge/templates/actionbar.tmpl:17
+#: ../themes/fusionforge/templates/actionbar.tmpl:36
 msgid "Page"
 msgstr "Seite"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:30
+#: ../themes/fusionforge/templates/actionbar.tmpl:28
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 msgid "Template/Talk"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:52
+#: ../themes/fusionforge/templates/actionbar.tmpl:48
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
 msgid "Create Page"
 msgstr "Neue Seite"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:66
+#: ../themes/fusionforge/templates/actionbar.tmpl:61
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/Sidebar/templates/actionbar.tmpl:26
 msgid "History"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:70
+#: ../themes/fusionforge/templates/actionbar.tmpl:64
 #: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:79
+#: ../themes/fusionforge/templates/actionbar.tmpl:71
 msgid "Page Info"
 msgstr "Seiten Info"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:82
+#: ../themes/fusionforge/templates/actionbar.tmpl:73
 msgid "Back Links"
 msgstr "Back Links"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:106
+#: ../themes/fusionforge/templates/actionbar.tmpl:94
 #: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:111
+#: ../themes/fusionforge/templates/actionbar.tmpl:98
 #: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:123
+#: ../themes/fusionforge/templates/actionbar.tmpl:108
 msgid "Purge"
 msgstr ""
 
 #: ../themes/fusionforge/templates/blogform.tmpl:21
-#: ../themes/fusionforge/templates/editpage.tmpl:81
+#: ../themes/fusionforge/templates/editpage.tmpl:116
 msgid "TextFormattingRules"
 msgstr "TextFormatierungsRegeln"
 
@@ -8580,11 +8575,30 @@
 msgid "This revision of the page does not exist."
 msgstr "Leider, Version ist nicht in der Datenbank."
 
-#: ../themes/fusionforge/templates/editpage.tmpl:64
+#: ../themes/fusionforge/templates/editpage.tmpl:3
+msgid ""
+"Preview only! Changes not saved. Please continue editing. (You'll find your "
+"edit area at the bottom of the page.)"
+msgstr ""
+
+#: ../themes/fusionforge/templates/editpage.tmpl:13
+#, fuzzy
+msgid ""
+"Warning: You are editing an old revision. Saving this page will overwrite "
+"the current version."
+msgstr ""
+"Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version "
+"überschrieben."
+
+#: ../themes/fusionforge/templates/editpage.tmpl:28
+msgid "Warning: leaving the page will lose all your modifications!"
+msgstr ""
+
+#: ../themes/fusionforge/templates/editpage.tmpl:98
 msgid "Make the page public?"
 msgstr ""
 
-#: ../themes/fusionforge/templates/editpage.tmpl:67
+#: ../themes/fusionforge/templates/editpage.tmpl:101
 msgid "Make the page external?"
 msgstr ""
 
@@ -8617,18 +8631,18 @@
 msgid "Like Pages"
 msgstr "Ähnliche Seiten"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:19
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 msgid "Wiki Admin"
 msgstr ""
 
-#: ../themes/fusionforge/templates/navbar.tmpl:23
+#: ../themes/fusionforge/templates/navbar.tmpl:25
 msgid "My User Page"
 msgstr "Meine Benutzer Seite"
 
-#: ../themes/fusionforge/templates/navbar.tmpl:25
-#: ../themes/MonoBook/templates/signin.tmpl:9
-msgid "My Preferences"
-msgstr "Meine Voreinstellungen"
+#: ../themes/fusionforge/templates/navbar.tmpl:27
+#, fuzzy
+msgid "User Preferences"
+msgstr "BenutzerEinstellungen"
 
 #: ../themes/fusionforge/templates/userprefs.tmpl:188
 msgid "User preferences for this project"
@@ -8729,6 +8743,11 @@
 msgid "GeneralDisclaimer"
 msgstr ""
 
+#: ../themes/MonoBook/templates/info.tmpl:78
+#, php-format
+msgid "Statistics about %s."
+msgstr "Statistik über %s."
+
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
@@ -8807,6 +8826,10 @@
 msgid "My Discussion"
 msgstr "Meine Diskussion"
 
+#: ../themes/MonoBook/templates/signin.tmpl:9
+msgid "My Preferences"
+msgstr "Meine Voreinstellungen"
+
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-14 17:04:48 UTC (rev 8456)
+++ trunk/locale/po/es.po	2012-11-14 17:10:09 UTC (rev 8457)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-10 18:07+0200\n"
+"POT-Creation-Date: 2012-11-14 18:09+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -87,7 +87,7 @@
 msgstr "por %s"
 
 #: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:380
+#: ../lib/wikilens/PageListColumns.php:369
 msgid "None"
 msgstr "Ninguna"
 
@@ -189,7 +189,7 @@
 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:230
 #: ../lib/plugin/RecentChanges.php:237 ../lib/plugin/RecentChanges.php:440
 #: ../lib/plugin/RecentChanges.php:751 ../lib/plugin/RecentChanges.php:1280
-#: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:11
+#: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10
 #: ../themes/Crao/templates/head.tmpl:53
 #: ../themes/Crao/templates/navbar.tmpl:11
 #: ../themes/default/templates/head.tmpl:59
@@ -197,7 +197,7 @@
 #: ../themes/default/templates/navbar.tmpl:13
 #: ../themes/fusionforge/templates/navbar.tmpl:8
 #: ../themes/MonoBook/templates/navbar.tmpl:13
-#: ../themes/Portland/templates/navbar.tmpl:23
+#: ../themes/Portland/templates/navbar.tmpl:22
 #: ../themes/shamino_com/templates/top.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:42
 #: ../themes/Sidebar/templates/rc.tmpl:3
@@ -219,7 +219,7 @@
 #: ../themes/blog/templates/navbar.tmpl:8
 #: ../themes/Crao/templates/navbar.tmpl:15
 #: ../themes/default/templates/navbar.tmpl:18
-#: ../themes/fusionforge/templates/actionbar.tmpl:82
+#: ../themes/fusionforge/templates/actionbar.tmpl:73
 #: ../themes/MonoBook/templates/navbar.tmpl:49
 #: ../themes/Sidebar/templates/navbar.tmpl:45
 #: ../themes/smaller/templates/navbar.tmpl:14
@@ -363,7 +363,7 @@
 "textos)."
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:831
-#: ../lib/main.php:1209 ../lib/plugin/ModeratedPage.php:43
+#: ../lib/main.php:1214 ../lib/plugin/ModeratedPage.php:43
 #: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
 #: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
 #: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
@@ -388,7 +388,7 @@
 #: ../themes/default/templates/head.tmpl:85
 #: ../themes/default/templates/homepage.tmpl:10
 #: ../themes/default/templates/navbar.tmpl:24
-#: ../themes/fusionforge/templates/navbar.tmpl:25
+#: ../themes/fusionforge/templates/navbar.tmpl:27
 #: ../themes/MonoBook/templates/signin.tmpl:9
 #: ../themes/shamino_com/templates/top.tmpl:25
 #: ../themes/Sidebar/templates/navbar.tmpl:49
@@ -630,7 +630,7 @@
 msgid "Table of Contents"
 msgstr "Tabla de contenidos"
 
-#: ../lib/EditToolbar.php:199 ../lib/PageList.php:560
+#: ../lib/EditToolbar.php:199 ../lib/PageList.php:539
 #: ../lib/plugin/AuthorHistory.php:154 ../lib/plugin/WantedPagesOld.php:147
 msgid "Page Name"
 msgstr "Nombre de la Página"
@@ -697,15 +697,15 @@
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
 
-#: ../lib/IniConfig.php:1010
+#: ../lib/IniConfig.php:1012
 msgid "CategoryGroup"
 msgstr "GrupoCategoría"
 
-#: ../lib/IniConfig.php:1012
+#: ../lib/IniConfig.php:1014
 msgid "An unnamed PhpWiki"
 msgstr "Un PhpWiki sin un nombre"
 
-#: ../lib/IniConfig.php:1014 ../lib/upgrade.php:73
+#: ../lib/IniConfig.php:1016 ../lib/upgrade.php:73
 #: ../themes/blog/templates/browse-footer.tmpl:3
 #: ../themes/default/templates/userprefs.tmpl:129
 #: ../themes/fusionforge/templates/navbar.tmpl:7
@@ -755,7 +755,7 @@
 msgid "Dump to directory"
 msgstr "Descarga al directorio"
 
-#: ../lib/loadsave.php:79 ../themes/fusionforge/templates/navbar.tmpl:17
+#: ../lib/loadsave.php:79 ../themes/fusionforge/templates/navbar.tmpl:18
 #: ../themes/MonoBook/templates/navbar.tmpl:58
 #: ../themes/Sidebar/templates/navbar.tmpl:48
 msgid "Upload File"
@@ -775,7 +775,7 @@
 
 #: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1041
 #: ../lib/loadsave.php:1047 ../lib/loadsave.php:1055 ../lib/main.php:1097
-#: ../lib/main.php:1229 ../lib/main.php:1242 ../lib/PagePerm.php:190
+#: ../lib/main.php:1234 ../lib/main.php:1247 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminSelect.php:221
 #: ../themes/blog/templates/navbar.tmpl:11
@@ -784,9 +784,9 @@
 #: ../themes/default/templates/head.tmpl:78
 #: ../themes/default/templates/head.tmpl:79
 #: ../themes/default/templates/navbar.tmpl:39
-#: ../themes/fusionforge/templates/navbar.tmpl:19
+#: ../themes/fusionforge/templates/navbar.tmpl:21
 #: ../themes/MonoBook/templates/navbar.tmpl:55
-#: ../themes/Portland/templates/navbar.tmpl:25
+#: ../themes/Portland/templates/navbar.tmpl:24
 #: ../themes/shamino_com/templates/actionbar.tmpl:17
 #: ../themes/Sidebar/templates/navbar.tmpl:68
 #: ../themes/smaller/templates/navbar.tmpl:17
@@ -909,7 +909,6 @@
 #: ../lib/loadsave.php:921 ../lib/loadsave.php:1557 ../lib/PageType.php:163
 #: ../lib/plugin/InterWikiSearch.php:56 ../lib/plugin/WantedPagesOld.php:77
 #: ../lib/plugin/WantedPages.php:56 ../themes/default/templates/info.tmpl:155
-#: ../themes/default/templates/info.tmpl:156
 #: ../themes/MonoBook/templates/info.tmpl:161
 #: ../themes/MonoBook/templates/info.tmpl:162
 msgid "InterWikiMap"
@@ -1007,7 +1006,7 @@
 #: ../lib/plugin/WikiAdminRename.php:215
 #: ../lib/plugin/WikiAdminSearchReplace.php:194
 #: ../lib/plugin/WikiAdminSetAcl.php:204
-#: ../themes/default/templates/info.tmpl:129
+#: ../themes/default/templates/info.tmpl:128
 msgid "Yes"
 msgstr "Si"
 
@@ -1159,7 +1158,7 @@
 "will expire at %s."
 msgstr ""
 
-#: ../lib/main.php:111 ../lib/WikiDB.php:1067
+#: ../lib/main.php:111 ../lib/WikiDB.php:1064
 msgid "Optimizing database"
 msgstr "Base de datos óptima"
 
@@ -1420,30 +1419,35 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1134 ../lib/PagePerm.php:190
+#: ../lib/main.php:1134
+#, fuzzy
+msgid "DeleteAcl"
+msgstr "Borrada"
+
+#: ../lib/main.php:1139 ../lib/PagePerm.php:190
 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:118
+#: ../themes/fusionforge/templates/actionbar.tmpl:104
 msgid "Rename"
 msgstr "Retitule"
 
-#: ../lib/main.php:1139 ../lib/main.php:1144 ../lib/plugin/PageDump.php:57
+#: ../lib/main.php:1144 ../lib/main.php:1149 ../lib/plugin/PageDump.php:57
 #: ../themes/Crao/templates/actionbar.tmpl:31
-#: ../themes/default/templates/actionbar.tmpl:37
+#: ../themes/default/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
 #: ../themes/shamino_com/templates/actionbar.tmpl:21
 #: ../themes/Sidebar/templates/actionbar.tmpl:60
-#: ../themes/smaller/templates/actionbar.tmpl:40
+#: ../themes/smaller/templates/actionbar.tmpl:39
 #: ../themes/smaller/templates/info.tmpl:10
 #: ../themes/Wordpress/templates/actionbar.tmpl:74
 msgid "...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8456] trunk/lib/config.php

From: <var...@us...> - 2012-11-14 17:04:57

Revision: 8456
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8456&view=rev
Author:   vargenau
Date:     2012-11-14 17:04:48 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use &$_SERVER

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2012-11-14 17:01:33 UTC (rev 8455)
+++ trunk/lib/config.php	2012-11-14 17:04:48 UTC (rev 8456)
@@ -297,7 +297,7 @@
 
 function deduce_script_name()
 {
-    $s = &$GLOBALS['HTTP_SERVER_VARS'];
+    $s = &$_SERVER;
     $script = @$s['SCRIPT_NAME'];
     if (empty($script) or $script[0] != '/') {
         // Some places (e.g. Lycos) only supply a relative name in

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8455] trunk/lib/BlockParser.php

From: <var...@us...> - 2012-11-14 17:01:39

Revision: 8455
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8455&view=rev
Author:   vargenau
Date:     2012-11-14 17:01:33 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove debug

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

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2012-11-14 16:49:23 UTC (rev 8454)
+++ trunk/lib/BlockParser.php	2012-11-14 17:01:33 UTC (rev 8455)
@@ -905,59 +905,6 @@
             $li = &$this->_content[0];
             $li->setTightness($top, $bot);
         } else {
-            // This is where php5 usually brakes.
-            // wrong duplicated <li> contents
-            if (DEBUG and DEBUG & _DEBUG_PARSER and check_php_version(5)) {
-                if (count($this->_content) != 2) {
-                    echo "<pre>";
-                    /*
-                    $class = new Reflection_Class('XmlElement');
-                    // Print out basic information
-                    printf(
-                           "===> The %s%s%s %s '%s' [extends %s]\n".
-                           "     declared in %s\n".
-                           "     lines %d to %d\n".
-                           "     having the modifiers %d [%s]\n",
-                           $class->isInternal() ? 'internal' : 'user-defined',
-                           $class->isAbstract() ? ' abstract' : '',
-                           $class->isFinal() ? ' final' : '',
-                           $class->isInterface() ? 'interface' : 'class',
-                           $class->getName(),
-                           var_export($class->getParentClass(), 1),
-                           $class->getFileName(),
-                           $class->getStartLine(),
-                           $class->getEndline(),
-                           $class->getModifiers(),
-                           implode(' ', Reflection::getModifierNames($class->getModifiers()))
-                           );
-                    // Print class properties
-                    printf("---> Properties: %s\n", var_export($class->getProperties(), 1));
-                    */
-                    echo 'count($this->_content): ', count($this->_content), "\n";
-                    echo "\$this->_content[0]: ";
-                    var_dump($this->_content[0]);
-
-                    for ($i = 1; $i < min(5, count($this->_content)); $i++) {
-                        $c =& $this->_content[$i];
-                        echo '$this->_content[', $i, "]: \n";
-                        echo "_tag: ";
-                        var_dump($c->_tag);
-                        echo "_content: ";
-                        var_dump($c->_content);
-                        echo "_properties: ";
-                        var_dump($c->_properties);
-                    }
-                    debug_print_backtrace();
-                    if (DEBUG & _DEBUG_APD) {
-                        if (function_exists("xdebug_get_function_stack")) {
-                            var_dump(xdebug_get_function_stack());
-                        }
-                    }
-                    echo "</pre>";
-                }
-            }
-            if (!check_php_version(5))
-                assert(count($this->_content) == 2);
             $dt = &$this->_content[0];
             $dd = &$this->_content[1];
             $dt->setTightness($top, 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:[8454] trunk/lib

From: <var...@us...> - 2012-11-14 16:49:32

Revision: 8454
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8454&view=rev
Author:   vargenau
Date:     2012-11-14 16:49:23 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

Modified Paths:
--------------
    trunk/lib/difflib.php
    trunk/lib/gif.php

Modified: trunk/lib/difflib.php
===================================================================
--- trunk/lib/difflib.php	2012-11-14 16:44:11 UTC (rev 8453)
+++ trunk/lib/difflib.php	2012-11-14 16:49:23 UTC (rev 8454)
@@ -275,7 +275,7 @@
                         $this->in_seq[$this->seq[$k]] = false;
                         $this->seq[$k] = $y;
                         $this->in_seq[$y] = 1;
-                    } else if (empty($this->in_seq[$y])) {
+                    } elseif (empty($this->in_seq[$y])) {
                         $k = $this->_lcs_pos($y);
                         assert($k > 0);
                         $ymids[$k] = $ymids[$k - 1];

Modified: trunk/lib/gif.php
===================================================================
--- trunk/lib/gif.php	2012-11-14 16:44:11 UTC (rev 8453)
+++ trunk/lib/gif.php	2012-11-14 16:49:23 UTC (rev 8454)
@@ -86,7 +86,7 @@
     if (isSet($gif) && (@get_class($gif) == "cgif") && $gif->loaded()) {
         $width = $gif->width();
         $height = $gif->height();
-    } else if (@file_exists($gif)) {
+    } elseif (@file_exists($gif)) {
         $myGIF = new CGIF();
         if (!$myGIF->getSize($gif, $width, $height)) {
             return false;
@@ -763,7 +763,7 @@
             if ($bgColor != -1) {
                 $bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
             }
-        } else if ($this->m_gfh->m_bGlobalClr) {
+        } elseif ($this->m_gfh->m_bGlobalClr) {
             $nColors = $this->m_gfh->m_nTableSize;
             $rgbq = $this->m_gfh->m_colorTable->toRGBQuad();
             if ($bgColor != -1) {
@@ -862,7 +862,7 @@
             if ($bgColor != -1) {
                 $bgColor = $this->m_img->m_gih->m_colorTable->colorIndex($bgColor);
             }
-        } else if ($this->m_gfh->m_bGlobalClr) {
+        } elseif ($this->m_gfh->m_bGlobalClr) {
             $nColors = $this->m_gfh->m_nTableSize;
             $pal = $this->m_gfh->m_colorTable->toString();
             if ($bgColor != -1) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8453] trunk/lib/loadsave.php

From: <var...@us...> - 2012-11-14 16:44:17

Revision: 8453
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8453&view=rev
Author:   vargenau
Date:     2012-11-14 16:44:11 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012-11-14 16:42:43 UTC (rev 8452)
+++ trunk/lib/loadsave.php	2012-11-14 16:44:11 UTC (rev 8453)
@@ -936,7 +936,7 @@
 
     if ($request->getArg('merge')) {
         $merging = true;
-    } else if ($request->getArg('overwrite')) {
+    } elseif ($request->getArg('overwrite')) {
         $overwrite = true;
     }
 
@@ -1004,7 +1004,7 @@
                 }
                 $skip = true;
             }
-        } else if ($current->getPackedContent() == $content) {
+        } elseif ($current->getPackedContent() == $content) {
             // The page content is the same, we don't need a new revision.
             $mesg->pushContent(' ',
                 fmt("content is identical to current version %d - no new revision created",
@@ -1305,7 +1305,7 @@
                 $request->setArg('overwrite', $overwrite);
             else
                 unset($request->_args['overwrite']);
-    } else if (($pageinfo = ParseSerializedPage($text, $default_pagename,
+    } elseif (($pageinfo = ParseSerializedPage($text, $default_pagename,
         $request->getUser()))
     ) {
         SavePage($request, $pageinfo, sprintf(_("Serialized file %s"),
@@ -1462,11 +1462,11 @@
 
     if (!$type) {
         $request->finish(fmt("Empty or not existing source. Unable to load: %s", $file_or_dir));
-    } else if ($type == 'dir') {
+    } elseif ($type == 'dir') {
         LoadDir($request, $file_or_dir, $files, $exclude);
-    } else if ($type != 'file' && !preg_match('/^(http|ftp):/', $file_or_dir)) {
+    } elseif ($type != 'file' && !preg_match('/^(http|ftp):/', $file_or_dir)) {
         $request->finish(fmt("Bad file type: %s", $type));
-    } else if (IsZipFile($file_or_dir)) {
+    } elseif (IsZipFile($file_or_dir)) {
         LoadZip($request, $file_or_dir, $files, $exclude);
     } else /* if (!$files || in_array(basename($file_or_dir), $files)) */ {
         LoadFile($request, $file_or_dir);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8452] trunk/lib/ErrorManager.php

From: <var...@us...> - 2012-11-14 16:42:52

Revision: 8452
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8452&view=rev
Author:   vargenau
Date:     2012-11-14 16:42:43 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

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

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012-11-14 16:41:08 UTC (rev 8451)
+++ trunk/lib/ErrorManager.php	2012-11-14 16:42:43 UTC (rev 8452)
@@ -286,7 +286,7 @@
                 $error->printSimpleTrace(debug_backtrace());
             }
             $this->_die($error);
-        } else if (($error->errno & error_reporting()) != 0) {
+        } elseif (($error->errno & error_reporting()) != 0) {
             if (($error->errno & $this->_postpone_mask) != 0) {
                 if ((function_exists('isa') and isa($error, 'PhpErrorOnce'))
                     or (!function_exists('isa') and

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8451] trunk/lib/ExternalReferrer.php

From: <var...@us...> - 2012-11-14 16:41:18

Revision: 8451
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8451&view=rev
Author:   vargenau
Date:     2012-11-14 16:41:08 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

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

Modified: trunk/lib/ExternalReferrer.php
===================================================================
--- trunk/lib/ExternalReferrer.php	2012-11-14 16:33:03 UTC (rev 8450)
+++ trunk/lib/ExternalReferrer.php	2012-11-14 16:41:08 UTC (rev 8451)
@@ -105,7 +105,7 @@
             $url = $url["query"];
         if ($query1 and @stristr($url, $query1)) {
             $query = @explode($query1, $url);
-        } else if ($query2 and @stristr($url, $query2)) {
+        } elseif ($query2 and @stristr($url, $query2)) {
             $query = explode($query2, $url);
         }
         if (!empty($query)) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8450] trunk/lib/main.php

From: <var...@us...> - 2012-11-14 16:33:10

Revision: 8450
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8450&view=rev
Author:   vargenau
Date:     2012-11-14 16:33:03 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove parentheses

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-11-14 16:24:39 UTC (rev 8449)
+++ trunk/lib/main.php	2012-11-14 16:33:03 UTC (rev 8450)
@@ -73,13 +73,13 @@
                 if ($method == 'Db')
                     switch (DATABASE_TYPE) {
                         case 'SQL'  :
-                            include_once("lib/WikiUser/PearDb.php");
+                            include_once 'lib/WikiUser/PearDb.php';
                             break;
                         case 'ADODB':
-                            include_once("lib/WikiUser/AdoDb.php");
+                            include_once 'lib/WikiUser/AdoDb.php';
                             break;
                         case 'PDO'  :
-                            include_once("lib/WikiUser/PdoDb.php");
+                            include_once 'lib/WikiUser/PdoDb.php';
                             break;
                     }
             }
@@ -208,7 +208,7 @@
                     and defined('THEME')
                         and $user_theme != THEME
         ) {
-            include_once 'themes/' . THEME . "/themeinfo.php";
+            include_once 'themes/'. THEME . '/themeinfo.php';
         }
         if (empty($WikiTheme) and $user_theme) {
             if (strcspn($user_theme, "./\x00]") != strlen($user_theme)) {
@@ -218,10 +218,10 @@
                 $user_theme = "default";
             }
             if (!$user_theme) $user_theme = "default";
-            include_once("themes/$user_theme/themeinfo.php");
+            include_once "themes/$user_theme/themeinfo.php";
         }
         if (empty($WikiTheme) and defined('THEME'))
-            include_once 'themes/' . THEME . "/themeinfo.php";
+            include_once 'themes/'. THEME . '/themeinfo.php';
         if (empty($WikiTheme))
             include_once 'themes/default/themeinfo.php';
         assert(!empty($WikiTheme));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8449] trunk/lib/PageList.php

From: <var...@us...> - 2012-11-14 16:24:48

Revision: 8449
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8449&view=rev
Author:   vargenau
Date:     2012-11-14 16:24:39 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove empty lines

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2012-11-14 16:23:06 UTC (rev 8448)
+++ trunk/lib/PageList.php	2012-11-14 16:24:39 UTC (rev 8449)
@@ -176,8 +176,6 @@
     }
 }
 
-
-
 class _PageList_Column extends _PageList_Column_base
 {
     function _PageList_Column($field, $default_heading, $align = false)
@@ -216,8 +214,6 @@
     }
 }
 
-
-
 /* overcome a call_user_func limitation by not being able to do:
  * call_user_func_array(array(&$class, $class_name), $params);
  * So we need $class = new $classname($params);
@@ -289,8 +285,6 @@
     }
 }
 
-
-
 class _PageList_Column_checkbox extends _PageList_Column
 {
     function _PageList_Column_checkbox($field, $default_heading, $name = 'p')
@@ -341,8 +335,6 @@
     }
 }
 
-
-
 class _PageList_Column_time extends _PageList_Column
 {
     function _PageList_Column_time($field, $default_heading)
@@ -364,8 +356,6 @@
     }
 }
 
-
-
 class _PageList_Column_version extends _PageList_Column
 {
     function _getValue($page_handle, &$revision_handle)
@@ -376,8 +366,6 @@
     }
 }
 
-
-
 // Output is hardcoded to limit of first 50 bytes. Otherwise
 // on very large Wikis this will fail if used with AllPages
 // (PHP memory limit exceeded)
@@ -485,9 +473,6 @@
     }
 }
 
-
-
-
 class _PageList_Column_author extends _PageList_Column
 {
     function _PageList_Column_author($field, $default_heading, $align = false)
@@ -511,8 +496,6 @@
     }
 }
 
-
-
 class _PageList_Column_owner extends _PageList_Column_author
 {
     function _getValue($page_handle, &$revision_handle)
@@ -530,8 +513,6 @@
     }
 }
 
-
-
 class _PageList_Column_creator extends _PageList_Column_author
 {
     function _getValue($page_handle, &$revision_handle)
@@ -549,8 +530,6 @@
     }
 }
 
-
-
 class _PageList_Column_pagename extends _PageList_Column_base
 {
     var $_field = 'pagename';
@@ -584,8 +563,6 @@
     }
 }
 
-
-
 class _PageList_Column_perm extends _PageList_Column
 {
     function _getValue($page_handle, &$revision_handle)
@@ -597,8 +574,6 @@
     }
 }
 
-
-
 class _PageList_Column_acl extends _PageList_Column
 {
     function _getValue($page_handle, &$revision_handle)
@@ -621,8 +596,6 @@
     }
 }
 
-
-
 class PageList
 {
     var $_group_rows = 3;
@@ -1875,8 +1848,6 @@
 
 }
 
-
-
 /* List pages with checkboxes to select from.
  * The [Select] button toggles via Javascript flipAll
  */

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8448] trunk/lib/nusoap/nusoap.php

From: <var...@us...> - 2012-11-14 16:23:13

Revision: 8448
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8448&view=rev
Author:   vargenau
Date:     2012-11-14 16:23:06 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

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

Modified: trunk/lib/nusoap/nusoap.php
===================================================================
--- trunk/lib/nusoap/nusoap.php	2012-11-14 16:22:05 UTC (rev 8447)
+++ trunk/lib/nusoap/nusoap.php	2012-11-14 16:23:06 UTC (rev 8448)
@@ -3414,7 +3414,7 @@
                 $this->message[$pos]['typePrefix'] = $value_prefix;
                 if (isset($this->namespaces[$value_prefix])) {
                     $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-                } else if (isset($attrs['xmlns:' . $value_prefix])) {
+                } elseif (isset($attrs['xmlns:' . $value_prefix])) {
                     $this->message[$pos]['type_namespace'] = $attrs['xmlns:' . $value_prefix];
                 }
                 // should do something here with the namespace of specified type?

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8447] trunk/lib/plugin/FullTextSearch.php

From: <var...@us...> - 2012-11-14 16:22:16

Revision: 8447
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8447&view=rev
Author:   vargenau
Date:     2012-11-14 16:22:05 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use English quotes

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

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2012-11-14 16:21:21 UTC (rev 8446)
+++ trunk/lib/plugin/FullTextSearch.php	2012-11-14 16:22:05 UTC (rev 8447)
@@ -89,7 +89,7 @@
             $args['types'] = array(new _PageList_Column_content
             ('rev:hi_content', _("Content"), "left", $s, $hilight_re));
             $list = new PageList(false, $exclude, $args);
-            $list->setCaption(fmt("Full text search results for '%s'", $s));
+            $list->setCaption(fmt("Full text search results for “%s”", $s));
             while ($page = $pages->next()) {
                 $list->addPage($page);
             }
@@ -124,7 +124,7 @@
                 $list);
         if ($noheader)
             return $list;
-        return HTML(HTML::p(fmt("Full text search results for '%s'", $s)),
+        return HTML(HTML::p(fmt("Full text search results for “%s”", $s)),
             $list);
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8446] trunk/lib/plugin/AllPages.php

From: <var...@us...> - 2012-11-14 16:21:28

Revision: 8446
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8446&view=rev
Author:   vargenau
Date:     2012-11-14 16:21:21 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove wiki warning

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

Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php	2012-11-14 16:07:15 UTC (rev 8445)
+++ trunk/lib/plugin/AllPages.php	2012-11-14 16:21:21 UTC (rev 8446)
@@ -89,7 +89,6 @@
                         ? $request->_user->getAuthenticatedId()
                         : $args['owner'],
                     'if_known'), $args['count']);
-            $pages->_options['count'] = $args['count'];
         } elseif (!empty($args['author'])) {
             $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
                 $args['sortby'], ''
@@ -102,7 +101,6 @@
                         ? $request->_user->getAuthenticatedId()
                         : $args['author'],
                     'if_known'), $args['count']);
-            $pages->_options['count'] = $args['count'];
         } elseif (!empty($args['creator'])) {
             $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
                 $args['sortby'], ''
@@ -115,7 +113,6 @@
                         ? $request->_user->getAuthenticatedId()
                         : $args['creator'],
                     'if_known'), $args['count']);
-            $pages->_options['count'] = $args['count'];
             //} elseif ($pages) {
             //    $args['count'] = count($pages);
         } else {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8445] trunk/lib/plugin/UpLoad.php

From: <var...@us...> - 2012-11-14 16:07:26

Revision: 8445
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8445&view=rev
Author:   vargenau
Date:     2012-11-14 16:07:15 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
message --> err_header

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

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2012-11-14 16:05:45 UTC (rev 8444)
+++ trunk/lib/plugin/UpLoad.php	2012-11-14 16:07:15 UTC (rev 8445)
@@ -217,26 +217,25 @@
             if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")(\.|\$)/i",
                 $userfile_name)
             ) {
-                $message->pushContent($err_header);
-                $message->pushContent(HTML::p(fmt("Files with extension %s are not allowed.",
+                $err_header->pushContent(HTML::p(fmt("Files with extension %s are not allowed.",
                     join(", ", $this->disallowed_extensions))));
+                $message->pushContent($err_header);
             } elseif (!DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS and
                 !preg_match("/(\." . join("|\.", $this->allowed_extensions) . ")\$/i",
                     $userfile_name)
             ) {
-                $message->pushContent($err_header);
-                $message->pushContent(HTML::p(fmt("Only files with the extension %s are allowed.",
+                $err_header->pushContent(HTML::p(fmt("Only files with the extension %s are allowed.",
                     join(", ", $this->allowed_extensions))));
+                $message->pushContent($err_header);
             } elseif (preg_match("/[^._a-zA-Z0-9- ]/", strip_accents($userfile_name))) {
+                $err_header->pushContent(HTML::p(_("Invalid filename. File names may only contain alphanumeric characters and dot, underscore, space or dash.")));
                 $message->pushContent($err_header);
-                $message->pushContent(HTML::p(_("Invalid filename. File names may only contain alphanumeric characters and dot, underscore, space or dash.")));
             } elseif (file_exists($file_dir . $userfile_name)) {
+                $err_header->pushContent(HTML::p(fmt("There is already a file with name %s uploaded.", $u_userfile)));
                 $message->pushContent($err_header);
-                $message->pushContent(HTML::p(fmt("There is already a file with name %s uploaded.",
-                    $u_userfile)));
             } elseif ($userfile->getSize() > (MAX_UPLOAD_SIZE)) {
+                $err_header->pushContent(HTML::p(_("Sorry but this file is too big.")));
                 $message->pushContent($err_header);
-                $message->pushContent(HTML::p(_("Sorry but this file is too big.")));
             } elseif (move_uploaded_file($userfile_tmpname, $file_dir . $userfile_name) or
                 (IsWindows() and rename($userfile_tmpname, $file_dir . $userfile_name))
             ) {
@@ -265,8 +264,8 @@
                     }
                 }
             } else {
+                $err_header->pushContent(HTML::p(_("Uploading failed.")));
                 $message->pushContent($err_header);
-                $message->pushContent(HTML::br(), _("Uploading failed."), HTML::br());
             }
         } else {
             $message->pushContent(HTML::br(), _("No file selected. Please select one."), HTML::br());
@@ -303,7 +302,6 @@
         }
         return;
     }
-
 }
 
 // Local Variables:

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8444] trunk/lib/plugin/InterWikiSearch.php

From: <var...@us...> - 2012-11-14 16:05:56

Revision: 8444
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8444&view=rev
Author:   vargenau
Date:     2012-11-14 16:05:45 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove empty lines

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

Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php	2012-11-14 16:05:06 UTC (rev 8443)
+++ trunk/lib/plugin/InterWikiSearch.php	2012-11-14 16:05:45 UTC (rev 8444)
@@ -64,8 +64,6 @@
     }
 }
 
-
-
 /**
  * @desc
  */

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8443] trunk/lib/WikiDB/adodb/drivers/adodb-firebird. inc.php

From: <var...@us...> - 2012-11-14 16:05:13

Revision: 8443
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8443&view=rev
Author:   vargenau
Date:     2012-11-14 16:05:06 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove useless semicolon

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2012-11-14 16:04:21 UTC (rev 8442)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php	2012-11-14 16:05:06 UTC (rev 8443)
@@ -62,8 +62,6 @@
 
 }
 
-;
-
 class  ADORecordSet_firebird extends ADORecordSet_ibase
 {
 

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

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

From: <var...@us...> - 2012-11-14 16:04:34

Revision: 8442
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8442&view=rev
Author:   vargenau
Date:     2012-11-14 16:04:21 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
    trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
    trunk/lib/plugin/FoafViewer.php

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php	2012-11-14 16:04:21 UTC (rev 8442)
@@ -194,7 +194,7 @@
                 //$o->max_length = -1; // fbsql returns the max length less spaces -- so it is unrealiable
                 $f = @fbsql_field_flags($this->_queryID, $fieldOffset);
                 $o->binary = (strpos($f, 'binary') !== false);
-            } else if ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
+            } elseif ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
                 $o = @fbsql_fetch_field($this->_queryID); // fbsql returns the max length less spaces -- so it is unrealiable
                 //$o->max_length = -1;
             }

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php	2012-11-14 16:04:21 UTC (rev 8442)
@@ -697,7 +697,7 @@
     {
         if ($fieldOffset != -1) {
             return @mssql_fetch_field($this->_queryID, $fieldOffset);
-        } else if ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
+        } elseif ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
             return @mssql_fetch_field($this->_queryID);
         }
         return null;

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php	2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php	2012-11-14 16:04:21 UTC (rev 8442)
@@ -541,7 +541,7 @@
                 $o->max_length = @mysql_field_len($this->_queryID, $fieldOffset); // suggested by: Jim Nicholson (jn...@at...)
                 //$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable
                 $o->binary = (strpos($f, 'binary') !== false);
-            } else if ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
+            } elseif ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
                 $o = @mysql_fetch_field($this->_queryID);
                 $o->max_length = @mysql_field_len($this->_queryID); // suggested by: Jim Nicholson (jn...@at...)
                 //$o->max_length = -1; // mysql returns the max length less spaces -- so it is unrealiable

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2012-11-14 15:54:02 UTC (rev 8441)
+++ trunk/lib/plugin/FoafViewer.php	2012-11-14 16:04:21 UTC (rev 8442)
@@ -208,9 +208,9 @@
             if ($index == "mboxsha1sum") {
                 $string = '<a href="http://beta.plink.org/profile/' . $array[$index][$i] . '">'
                     . '<img src="http://beta.plink.org/images/plink.png" alt="Plink - ' . $array[$index][$i] . '" /></a>';
-            } else if ($index == "depiction") {
+            } elseif ($index == "depiction") {
                 $string = '<img src="' . $array[$index][$i] . '" />';
-            } else if ((substr($array[$index][$i], 0, 7) == "http://") || (substr($array[$index][$i], 0, 7) == "mailto:")) {
+            } elseif ((substr($array[$index][$i], 0, 7) == "http://") || (substr($array[$index][$i], 0, 7) == "mailto:")) {
                 $string = '<a href="' . $array[$index][$i] . '"';
 
                 if (@$dc["description"][$array[$index][$i]]) {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8441] trunk/lib/WikiDB/adodb/drivers/ adodb-borland_ibase.inc.php

From: <var...@us...> - 2012-11-14 15:54:08

Revision: 8441
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8441&view=rev
Author:   vargenau
Date:     2012-11-14 15:54:02 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Remove useless semicolon

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2012-11-14 15:51:58 UTC (rev 8440)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php	2012-11-14 15:54:02 UTC (rev 8441)
@@ -73,8 +73,6 @@
 
 }
 
-;
-
 class  ADORecordSet_borland_ibase extends ADORecordSet_ibase
 {
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8440] trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc. php

From: <var...@us...> - 2012-11-14 15:52:04

Revision: 8440
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8440&view=rev
Author:   vargenau
Date:     2012-11-14 15:51:58 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

Modified Paths:
--------------
    trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php

Modified: trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
===================================================================
--- trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php	2012-11-14 15:47:08 UTC (rev 8439)
+++ trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php	2012-11-14 15:51:58 UTC (rev 8440)
@@ -292,7 +292,7 @@
     {
         if ($fieldOffset != -1) {
             $o = @sybase_fetch_field($this->_queryID, $fieldOffset);
-        } else if ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
+        } elseif ($fieldOffset == -1) { /*	The $fieldOffset argument is not provided thus its -1 	*/
             $o = @sybase_fetch_field($this->_queryID);
         }
         // older versions of PHP did not support type, only numeric

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

286 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 108 109 110 111 112 .. 538 > >> (Page 110 of 538)