phpwiki-checkins Mailing List for PhpWiki (Page 121)

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 .. 119 120 121 122 123 .. 538 > >> (Page 121 of 538)

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

From: <var...@us...> - 2011-11-29 09:22:01

Revision: 8189
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8189&view=rev
Author:   vargenau
Date:     2011-11-29 09:21:55 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Use sprintf

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2011-11-29 09:07:58 UTC (rev 8188)
+++ trunk/lib/main.php	2011-11-29 09:21:55 UTC (rev 8189)
@@ -766,7 +766,8 @@
         if (preg_match("/[<\[\{\|\"\}\]>]/", $pagename, $matches) > 0) {
             $CONTENT = HTML::div(
                          array('class' => 'error'),
-                         _("Illegal character '"). $matches[0] . _("' in page name."));
+                         sprintf(_("Illegal character '%s' in page name."),
+                                 $matches[0]));
             GeneratePage($CONTENT, $pagename);
             $this->finish();
         }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8188] trunk/lib/InlineParser.php

From: <var...@us...> - 2011-11-29 09:08:09

Revision: 8188
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8188&view=rev
Author:   vargenau
Date:     2011-11-29 09:07:58 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Check page length in LinkBracketLink

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2011-11-28 16:58:01 UTC (rev 8187)
+++ trunk/lib/InlineParser.php	2011-11-29 09:07:58 UTC (rev 8188)
@@ -387,8 +387,14 @@
         if (preg_match("/%2F(%20)+\./i", $rawlink)) {
             $rawlink = preg_replace("/%2F(%20)+\./i","%2F.",$rawlink);
         }
-    } else
+    } else {
+        // Check page name lenght
+        if (strlen($rawlink) > MAX_PAGENAME_LENGTH) {
+            return HTML::span(array('class' => 'error'),
+                                    _('Page name too long'));
+        }
         $link  = UnWikiEscape($rawlink);
+    }
 
     /* Relatives links by Joel Schaubert.
      * Recognize [../bla] or [/bla] as relative links, without needing http://

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8187] trunk/lib/CachedMarkup.php

From: <var...@us...> - 2011-11-28 16:58:07

Revision: 8187
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8187&view=rev
Author:   vargenau
Date:     2011-11-28 16:58:01 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Fix indentation

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

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2011-11-28 15:13:31 UTC (rev 8186)
+++ trunk/lib/CachedMarkup.php	2011-11-28 16:58:01 UTC (rev 8187)
@@ -27,16 +27,15 @@
 
     function CacheableMarkup($content, $basepage) {
         $this->_basepage = $basepage;
-    $this->_buf = '';
-    $this->_content = array();
-    $this->_append($content);
-    if ($this->_buf != '')
-        $this->_content[] = $this->_buf;
-    unset($this->_buf);
+        $this->_buf = '';
+        $this->_content = array();
+        $this->_append($content);
+        if ($this->_buf != '')
+            $this->_content[] = $this->_buf;
+        unset($this->_buf);
     }
 
     function pack() {
-
         // FusionForge hack
         // This causes a strange bug when a comment containing
         // a single quote is entered in the Summary box:
@@ -94,9 +93,9 @@
      * @return array of hashes { linkto=>pagename, relation=>pagename }
      */
     function getWikiPageLinks() {
-    $links = array();
-    foreach ($this->_content as $item) {
-        if (!isa($item, 'Cached_DynamicContent'))
+        $links = array();
+        foreach ($this->_content as $item) {
+            if (!isa($item, 'Cached_DynamicContent'))
                 continue;
             if (!($item_links = $item->getWikiPageLinks($this->_basepage)))
                 continue;
@@ -104,8 +103,8 @@
         }
         // array_unique has a bug with hashes!
         // set_links checks for duplicates, array_merge does not
-    //return array_unique($links);
-    return $links;
+        //return array_unique($links);
+        return $links;
     }
 
     /** Get link info.
@@ -116,63 +115,63 @@
      * Returns an array of hashes.
      */
     function getLinkInfo() {
-    $link = array();
-    foreach ($this->_content as $link) {
-        if (! isa($link, 'Cached_Link'))
-        continue;
-        $info = $link->getLinkInfo($this->_basepage);
-        $links[$info->href] = $info;
+        $link = array();
+        foreach ($this->_content as $link) {
+            if (! isa($link, 'Cached_Link'))
+                continue;
+            $info = $link->getLinkInfo($this->_basepage);
+            $links[$info->href] = $info;
+        }
+        return array_values($links);
     }
-    return array_values($links);
-    }
 
     function _append($item) {
-    if (is_array($item)) {
-        foreach ($item as $subitem)
-        $this->_append($subitem);
-    }
-    elseif (!is_object($item)) {
-        $this->_buf .= $this->_quote((string) $item);
-    }
-    elseif (isa($item, 'Cached_DynamicContent')) {
-        if ($this->_buf) {
-        $this->_content[] = $this->_buf;
-        $this->_buf = '';
+        if (is_array($item)) {
+            foreach ($item as $subitem)
+                $this->_append($subitem);
         }
-        $this->_content[] = $item;
-    }
-    elseif (isa($item, 'XmlElement')) {
-        if ($item->isEmpty()) {
-        $this->_buf .= $item->emptyTag();
+        elseif (!is_object($item)) {
+            $this->_buf .= $this->_quote((string) $item);
         }
-        else {
-        $this->_buf .= $item->startTag();
-        foreach ($item->getContent() as $subitem)
-            $this->_append($subitem);
-        $this->_buf .= "</$item->_tag>";
+        elseif (isa($item, 'Cached_DynamicContent')) {
+            if ($this->_buf) {
+                $this->_content[] = $this->_buf;
+                $this->_buf = '';
+            }
+            $this->_content[] = $item;
+        }
+        elseif (isa($item, 'XmlElement')) {
+            if ($item->isEmpty()) {
+                $this->_buf .= $item->emptyTag();
+            }
+            else {
+                $this->_buf .= $item->startTag();
+                foreach ($item->getContent() as $subitem)
+                    $this->_append($subitem);
+                $this->_buf .= "</$item->_tag>";
 
                 if (!$this->getDescription() and $item->getTag() == 'p') {
                     // performance: when is this really needed?
                     $this->_glean_description($item->asString());
                 }
+            }
+            if (!$item->isInlineElement())
+            $this->_buf .= "\n";
         }
-        if (!$item->isInlineElement())
-        $this->_buf .= "\n";
+        elseif (isa($item, 'XmlContent')) {
+            foreach ($item->getContent() as $item)
+                $this->_append($item);
+        }
+        elseif (method_exists($item, 'asXML')) {
+            $this->_buf .= $item->asXML();
+        }
+        elseif (method_exists($item, 'asString')) {
+            $this->_buf .= $this->_quote($item->asString());
+        }
+        else {
+            $this->_buf .= sprintf("==Object(%s)==", get_class($item));
+        }
     }
-    elseif (isa($item, 'XmlContent')) {
-        foreach ($item->getContent() as $item)
-        $this->_append($item);
-    }
-    elseif (method_exists($item, 'asXML')) {
-        $this->_buf .= $item->asXML();
-    }
-    elseif (method_exists($item, 'asString')) {
-        $this->_buf .= $this->_quote($item->asString());
-    }
-    else {
-        $this->_buf .= sprintf("==Object(%s)==", get_class($item));
-    }
-    }
 
     function _glean_description($text) {
         static $two_sentences;
@@ -206,10 +205,10 @@
     }
 
     function asXML () {
-    $xml = '';
+        $xml = '';
         $basepage = $this->_basepage;
 
-    foreach ($this->_content as $item) {
+        foreach ($this->_content as $item) {
             if (is_string($item)) {
                 $xml .= $item;
             }
@@ -224,15 +223,15 @@
             else {
                 $xml .= $item->asXML();
             }
+        }
+        return $xml;
     }
-    return $xml;
-    }
 
     function printXML () {
         $basepage = $this->_basepage;
         // _content might be changed from a plugin (CreateToc)
-    for ($i=0; $i < count($this->_content); $i++) {
-        $item = $this->_content[$i];
+        for ($i=0; $i < count($this->_content); $i++) {
+            $item = $this->_content[$i];
             if (is_string($item)) {
                 print $item;
             }
@@ -249,8 +248,8 @@
             else {
                 $item->printXML();
             }
+        }
     }
-    }
 }
 
 /**
@@ -262,7 +261,7 @@
 class Cached_DynamicContent {
 
     function cache(&$cache) {
-    $cache[] = $this;
+        $cache[] = $this;
     }
 
     function expand($basepage, &$obj) {
@@ -276,18 +275,18 @@
 
 class XmlRpc_LinkInfo {
     function XmlRpc_LinkInfo($page, $type, $href, $relation = '') {
-    $this->page = $page;
-    $this->type = $type;
-    $this->href = $href;
-    $this->relation = $relation;
-    //$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
+        $this->page = $page;
+        $this->type = $type;
+        $this->href = $href;
+        $this->relation = $relation;
+        //$this->pageref = str_replace("/RPC2.php", "/index.php", $href);
     }
 }
 
 class Cached_Link extends Cached_DynamicContent {
 
     function isInlineElement() {
-    return true;
+        return true;
     }
 
     /** Get link info (for XML-RPC support)
@@ -296,17 +295,17 @@
      * (See http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=WikiRPCInterface)
      */
     function getLinkInfo($basepage) {
-    return new XmlRpc_LinkInfo($this->_getName($basepage),
+        return new XmlRpc_LinkInfo($this->_getName($basepage),
                                    $this->_getType(),
                                    $this->_getURL($basepage),
                                    $this->_getRelation($basepage));
     }
 
     function _getURL($basepage) {
-    return $this->_url;
+        return $this->_url;
     }
     function __getRelation($basepage) {
-    return $this->_relation;
+        return $this->_relation;
     }
 }
 /*
@@ -315,34 +314,34 @@
  */
 class Cached_InlinedImage extends Cached_DynamicContent {
     function isInlineElement() {
-    return true;
+        return true;
     }
     function _getURL($basepage) {
-    return $this->_url;
+        return $this->_url;
     }
     // TODO: fix interwiki inline links in case of static dumps
     function expand($basepage, &$markup) {
-    global $WikiTheme;
+        global $WikiTheme;
         $this->_basepage = $basepage;
-    $label = isset($this->_label) ? $this->_label : false;
-    if ($WikiTheme->DUMP_MODE) {
+        $label = isset($this->_label) ? $this->_label : false;
+        if ($WikiTheme->DUMP_MODE) {
             // In case of static dumps we need to check if we should
             // inline the image or not: external: keep link, internal: copy locally
-        return LinkImage($label);
-    } else {
-        return LinkImage($label);
+            return LinkImage($label);
+        } else {
+            return LinkImage($label);
+        }
     }
-    }
 }
 
 class Cached_WikiLink extends Cached_Link {
 
     function Cached_WikiLink ($page, $label = false, $anchor = false) {
-    $this->_page = $page;
-    /* ":DontStoreLink" */
-    if (substr($this->_page,0,1) == ':') {
-        $this->_page = substr($this->_page,1);
-        $this->_nolink = true;
+        $this->_page = $page;
+        /* ":DontStoreLink" */
+        if (substr($this->_page,0,1) == ':') {
+            $this->_page = substr($this->_page,1);
+            $this->_nolink = true;
         }
         if ($anchor)
             $this->_anchor = $anchor;
@@ -357,13 +356,13 @@
 
     function getPagename($basepage) {
         $page = new WikiPageName($this->_page, $basepage);
-    if ($page->isValid()) return $page->name;
-    else return false;
+        if ($page->isValid()) return $page->name;
+        else return false;
     }
 
     function getWikiPageLinks($basepage) {
         if ($basepage == '') return false;
-    if (isset($this->_nolink)) return false;
+        if (isset($this->_nolink)) return false;
         if ($link = $this->getPagename($basepage))
             return array(array('linkto' => $link));
         else
@@ -371,41 +370,41 @@
     }
 
     function _getName($basepage) {
-    return $this->getPagename($basepage);
+        return $this->getPagename($basepage);
     }
 
     function _getURL($basepage) {
-    return WikiURL($this->getPagename($basepage));
-    //return WikiURL($this->getPagename($basepage), false, 'abs_url');
+        return WikiURL($this->getPagename($basepage));
+        //return WikiURL($this->getPagename($basepage), false, 'abs_url');
     }
 
     function expand($basepage, &$markup) {
-    global $WikiTheme;
+        global $WikiTheme;
         $this->_basepage = $basepage;
-    $label = isset($this->_label) ? $this->_label : false;
-    $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+        $label = isset($this->_label) ? $this->_label : false;
+        $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
         $page = new WikiPageName($this->_page, $basepage, $anchor);
-    if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
-        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-        return HTML($label ? $label : $page->getName());
-    }
+        if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+            if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+                return HTML($label ? $label : $page->getName());
+        }
         if ($page->isValid()) return WikiLink($page, 'auto', $label);
-    else return HTML($label);
+            else return HTML($label);
     }
 
     function asXML() {
-    global $WikiTheme;
-    $label = isset($this->_label) ? $this->_label : false;
-    $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
-    //TODO: need basepage for subpages like /Remove (within CreateTOC)
+        global $WikiTheme;
+        $label = isset($this->_label) ? $this->_label : false;
+        $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+        //TODO: need basepage for subpages like /Remove (within CreateTOC)
         $page = new WikiPageName($this->_page, $this->_basepage, $anchor);
-    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-        return $label ? $label : $page->getName();
+        if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+            if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+                return $label ? $label : $page->getName();
+        }
+        $link = WikiLink($page, 'auto', $label);
+        return $link->asXML();
     }
-    $link = WikiLink($page, 'auto', $label);
-    return $link->asXML();
-    }
 
     function asString() {
         if (isset($this->_label))
@@ -417,15 +416,15 @@
 class Cached_WikiLinkIfKnown extends Cached_WikiLink
 {
     function Cached_WikiLinkIfKnown ($moniker) {
-    $this->_page = $moniker;
+        $this->_page = $moniker;
     }
 
     function expand($basepage, &$markup) {
-    global $WikiTheme;
-    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-        return HTML($label ? $label : $page->getName());
-    }
+        global $WikiTheme;
+        if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+            if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+                return HTML($label ? $label : $page->getName());
+        }
         return WikiLink($this->_page, 'if_known');
     }
 }
@@ -433,8 +432,8 @@
 class Cached_SpellCheck extends Cached_WikiLink
 {
     function Cached_SpellCheck ($word, $suggs) {
-    $this->_page = $word;
-    $this->suggestions = $suggs;
+        $this->_page = $word;
+        $this->suggestions = $suggs;
     }
 
     function expand($basepage, &$markup) {
@@ -455,16 +454,16 @@
     }
 
     function isInlineElement() {
-    return true;
+        return true;
     }
 
     function expand($basepage, &$markup) {
     global $WikiTheme;
         $label = isset($this->_label) ? $this->_label : false;
-    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-        if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
-        return HTML($label ? $label : $page->getName());
-    }
+        if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+            if (!in_array($this->_page, $WikiTheme->VALID_LINKS))
+                return HTML($label ? $label : $page->getName());
+        }
         return LinkPhpwikiURL($this->_url, $label, $basepage);
     }
 
@@ -501,14 +500,14 @@
     }
 
     function isInlineElement() {
-    return true;
+        return true;
     }
 
     function getPagename($basepage) {
-    if (!isset($this->_page)) return false;
-    $page = new WikiPageName($this->_page, $basepage);
-    if ($page->isValid()) return $page->name;
-    else return false;
+        if (!isset($this->_page)) return false;
+        $page = new WikiPageName($this->_page, $basepage);
+        if ($page->isValid()) return $page->name;
+        else return false;
     }
 
     /* Add relation to the link table.
@@ -516,14 +515,14 @@
      */
     function getWikiPageLinks($basepage) {
         if ($basepage == '') return false;
-    if (!isset($this->_page) and isset($this->_attribute)) {
+        if (!isset($this->_page) and isset($this->_attribute)) {
             // An attribute: we store it in the basepage now, to fill the cache for page->save
             // TODO: side-effect free query
             $page = $GLOBALS['request']->getPage($basepage);
             $page->setAttribute($this->_relation, $this->_attribute);
             $this->_page = $basepage;
             return array(array('linkto' => '', 'relation' => $this->_relation));
-    }
+        }
         if ($link = $this->getPagename($basepage))
             return array(array('linkto' => $link, 'relation' => $this->_relation));
         else
@@ -535,50 +534,48 @@
         if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) {
             return HTML::span(array('class' => 'error'), _("BAD semantic relation link"));
         }
-    $this->_relation = urldecode($m[1]);
+        $this->_relation = urldecode($m[1]);
         $is_attribute = ($m[2] == ':=');
         if ($is_attribute) {
             $this->_attribute = urldecode($m[3]);
-        // since this stored in the markup cache, we are extra sensible
-        // not to store false empty stuff.
-        $units = new Units();
-            if (!DISABLE_UNITS and !$units->errcode)
-        {
-        $this->_attribute_base = $units->Definition($this->_attribute);
-        $this->_unit = $units->baseunit($this->_attribute);
-        }
+            // since this stored in the markup cache, we are extra sensible
+            // not to store false empty stuff.
+            $units = new Units();
+            if (!DISABLE_UNITS and !$units->errcode) {
+                $this->_attribute_base = $units->Definition($this->_attribute);
+                $this->_unit = $units->baseunit($this->_attribute);
+            }
         } else {
-        $this->_page = urldecode($m[3]);
+            $this->_page = urldecode($m[3]);
         }
-    return $m;
+        return $m;
     }
 
     function _expand($url, $label = false) {
-    global $WikiTheme;
-    $m = $this->_expandurl($url);
+        global $WikiTheme;
+        $m = $this->_expandurl($url);
         $class = 'wiki';
         // do not link to the attribute value, but to the attribute
         $is_attribute = ($m[2] == ':=');
-    if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
-        if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
-        return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
-    }
-    if ($is_attribute)
-        $title = isset($this->_attribute_base)
-        ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
-        : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
-        if ($label) {
-            return HTML::span
-        (
-         HTML::a(array('href'  => WikiURL($is_attribute ? $this->_relation : $this->_page),
+        if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) {
+            if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS))
+                return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page));
+        }
+        if ($is_attribute)
+            $title = isset($this->_attribute_base)
+            ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base)
+            : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute);
+            if ($label) {
+                return HTML::span(
+                    HTML::a(array('href'  => WikiURL($is_attribute ? $this->_relation : $this->_page),
                    'class' => "wiki ".($is_attribute ? "attribute" : "relation"),
                    'title' => $is_attribute
                    ? $title
                    : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)),
              $label)
          );
-        } elseif ($is_attribute) {
-            return HTML::span
+            } elseif ($is_attribute) {
+                return HTML::span
         (
          HTML::a(array('href'  => WikiURL($this->_relation),
                    'class' => "wiki attribute",
@@ -623,8 +620,8 @@
 class Cached_SearchHighlight extends Cached_DynamicContent
 {
     function Cached_SearchHighlight ($word, $engine) {
-    $this->_word = $word;
-    $this->engine = $engine;
+        $this->_word = $word;
+        $this->engine = $engine;
     }
 
     function expand($basepage, &$markup) {
@@ -637,7 +634,7 @@
 class Cached_ExternalLink extends Cached_Link {
 
     function Cached_ExternalLink($url, $label=false) {
-    $this->_url = $url;
+        $this->_url = $url;
         if ($label && $label != $url)
             $this->_label = $label;
     }
@@ -647,15 +644,15 @@
     }
 
     function _getName($basepage) {
-    $label = isset($this->_label) ? $this->_label : false;
-    return ($label and is_string($label)) ? $label : $this->_url;
+        $label = isset($this->_label) ? $this->_label : false;
+        return ($label and is_string($label)) ? $label : $this->_url;
     }
 
     function expand($basepage, &$markup) {
         global $request;
 
-    $label = isset($this->_label) ? $this->_label : false;
-    $link = LinkURL($this->_url, $label);
+        $label = isset($this->_label) ? $this->_label : false;
+        $link = LinkURL($this->_url, $label);
 
         if (GOOGLE_LINKS_NOFOLLOW) {
             // Ignores nofollow when the user who saved the page was authenticated.
@@ -677,24 +674,24 @@
 class Cached_InterwikiLink extends Cached_ExternalLink {
 
     function Cached_InterwikiLink($link, $label=false) {
-    $this->_link = $link;
+        $this->_link = $link;
         if ($label)
             $this->_label = $label;
     }
 
     function getPagename($basepage) {
         list ($moniker, $page) = explode (":", $this->_link, 2);
-    $page = new WikiPageName($page, $basepage);
-    if ($page->isValid()) return $page->name;
-    else return false;
+        $page = new WikiPageName($page, $basepage);
+        if ($page->isValid()) return $page->name;
+        else return false;
     }
 
     function getWikiPageLinks($basepage) {
         if ($basepage == '') return false;
-    /* ":DontStoreLink" */
-    if (substr($this->_link,0,1) == ':') return false;
-    /* store only links to valid pagenames */
-    $dbi = $GLOBALS['request']->getDbh();
+        /* ":DontStoreLink" */
+        if (substr($this->_link,0,1) == ':') return false;
+        /* store only links to valid pagenames */
+        $dbi = $GLOBALS['request']->getDbh();
         if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) {
             return array(array('linkto' => $link));
         } else {
@@ -703,8 +700,8 @@
     }
 
     function _getName($basepage) {
-    $label = isset($this->_label) ? $this->_label : false;
-    return ($label and is_string($label)) ? $label : $this->_link;
+        $label = isset($this->_label) ? $this->_label : false;
+        return ($label and is_string($label)) ? $label : $this->_link;
     }
 
     /* there may be internal interwiki links also */
@@ -713,21 +710,21 @@
     }
 
     function _getURL($basepage) {
-    $link = $this->expand($basepage, $this);
-    return $link->getAttr('href');
+        $link = $this->expand($basepage, $this);
+        return $link->getAttr('href');
     }
 
     function expand($basepage, &$markup) {
-    global $WikiTheme;
-    $intermap = getInterwikiMap();
-    $label = isset($this->_label) ? $this->_label : false;
-    //FIXME: check Upload: inlined images
-    if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
-        if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
-        return HTML($label ? $label : $this->_link);
+        global $WikiTheme;
+        $intermap = getInterwikiMap();
+        $label = isset($this->_label) ? $this->_label : false;
+        //FIXME: check Upload: inlined images
+        if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) {
+            if (!in_array($this->_link, $WikiTheme->VALID_LINKS))
+            return HTML($label ? $label : $this->_link);
+        }
+        return $intermap->link($this->_link, $label);
     }
-    return $intermap->link($this->_link, $label);
-    }
 
     function asString() {
         if (isset($this->_label))
@@ -742,9 +739,9 @@
 class Cached_UserLink extends Cached_WikiLink {
     function expand($basepage, &$markup) {
         $label = isset($this->_label) ? $this->_label : false;
-    $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
+        $anchor = isset($this->_anchor) ? (string)$this->_anchor : '';
         $page = new WikiPageName($this->_page, $basepage, $anchor);
-    $link = WikiLink($page, 'auto', $label);
+        $link = WikiLink($page, 'auto', $label);
         // $link = HTML::a(array('href' => $PageName));
         $link->setContent(PossiblyGlueIconToText('wikiuser', $this->_page));
         $link->setAttr('class', 'wikiuser');
@@ -760,8 +757,8 @@
 class Cached_PluginInvocation extends Cached_DynamicContent {
 
     function Cached_PluginInvocation ($pi) {
-    $this->_pi = $pi;
-    $loader = $this->_getLoader();
+        $this->_pi = $pi;
+        $loader = $this->_getLoader();
         if (is_array($plugin_cmdline = $loader->parsePI($pi)) and $plugin_cmdline[1]) {
             $this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list
             $this->name = $plugin_cmdline[1]->getName();
@@ -773,7 +770,7 @@
     }
 
     function isInlineElement() {
-    return false;
+        return false;
     }
 
     function expand($basepage, &$markup) {
@@ -795,9 +792,9 @@
     function & _getLoader() {
         static $loader = false;
 
-    if (!$loader) {
+        if (!$loader) {
             include_once('lib/WikiPlugin.php');
-        $loader = new WikiPluginLoader;
+            $loader = new WikiPluginLoader;
         }
         return $loader;
     }

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

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

From: <var...@us...> - 2011-11-28 15:13:42

Revision: 8186
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8186&view=rev
Author:   vargenau
Date:     2011-11-28 15:13:31 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Fix whitespace

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2011-11-28 14:23:07 UTC (rev 8185)
+++ trunk/lib/stdlib.php	2011-11-28 15:13:31 UTC (rev 8186)
@@ -159,7 +159,7 @@
 function getCookieName() {
     return preg_replace("/[^\d\w]/", "_", WIKI_NAME) . "_WIKI_ID";
 }
- 
+
 /**
  * Generates a valid URL for a given Wiki pagename.
  * @param mixed $pagename If a string this will be the name of the Wiki page to link to.
@@ -826,7 +826,7 @@
             $this->shortName = $name;
             if (strstr($name, ':')) {
                 list($moniker, $shortName) = explode (":", $name, 2);
-          $map = getInterwikiMap(); // allow overrides to custom maps
+                $map = getInterwikiMap(); // allow overrides to custom maps
                 if (isset($map->_map[$moniker])) {
                     $url = $map->_map[$moniker];
                     if (strstr($url, '%s'))
@@ -845,17 +845,17 @@
                     }
                     if (strstr($shortName, '?')) {
                         list($shortName, $dummy) = explode("\?", $shortName, 2);
-            }
+                    }
                     $this->shortName = $shortName;
                 }
             }
-        // FIXME: We should really fix the cause for "/PageName" in the WikiDB
+            // FIXME: We should really fix the cause for "/PageName" in the WikiDB
             if ($name == '' or $name[0] == SUBPAGE_SEPARATOR) {
                 if ($basename)
                     $name = $this->_pagename($basename) . $name;
                 else {
                     $name = $this->_normalize_bad_pagename($name);
-            $this->shortName = $name;
+                    $this->shortName = $name;
                 }
             }
         }
@@ -899,20 +899,20 @@
     }
 
     function _pagename($page) {
-    if (isa($page, 'WikiDB_Page'))
-        return $page->getName();
+        if (isa($page, 'WikiDB_Page'))
+            return $page->getName();
         elseif (isa($page, 'WikiDB_PageRevision'))
-        return $page->getPageName();
+            return $page->getPageName();
         elseif (isa($page, 'WikiPageName'))
-        return $page->name;
+            return $page->name;
         // '0' or e.g. '1984' should be allowed though
         if (!is_string($page) and !is_integer($page)) {
             trigger_error(sprintf("Non-string pagename '%s' (%s)(%s)",
                                   $page, gettype($page), get_class($page)),
                           E_USER_NOTICE);
         }
-    //assert(is_string($page));
-    return $page;
+        //assert(is_string($page));
+        return $page;
     }
 
     function _normalize_bad_pagename($name) {

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

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

From: <var...@us...> - 2011-11-28 14:23:18

Revision: 8185
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8185&view=rev
Author:   vargenau
Date:     2011-11-28 14:23:07 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Update French translation

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

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

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

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-28 14:23:07 UTC (rev 8185)
@@ -282,6 +282,10 @@
 $locale["Comments"] = "Commentaires";
 $locale["Comments on %s by %s."] = "Commentaire le %s par %s.";
 $locale["Complete."] = "Terminé.";
+$locale["Confirm markup change"] = "Confirmer le changement de type de syntaxe";
+$locale["Confirm ownership change"] = "Confirmer le changement de propriétaire";
+$locale["Confirm purge"] = "Confirmer la purge";
+$locale["Confirm removal"] = "Confirm la suppression";
 $locale["Conflicting Edits!"] = "Modifications conflictuelles !";
 $locale["Content"] = "Contenu";
 $locale["Content of versions "] = "Contenu des versions ";

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/de.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+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."
@@ -1024,8 +1024,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5356,20 +5356,24 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr "PhpWikiSystemverwalten/Chown"
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Change owner of selected pages"
 msgstr "Den Besitzer der ausgewählte Seiten ändern"
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 msgid "Select the pages to change the owner"
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 msgid "Change owner to: "
 msgstr "Besitzer ändern zu:"
 
@@ -5402,20 +5406,24 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr "PhpWikiSystemverwalten/Formatierung"
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Change markup type"
 msgstr "Ändere Formatierungs-Typ"
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 msgid "Select the pages to change the markup type"
 msgstr "Wählen Sie die Seiten zum Ändern:"
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 msgid "Change markup to: "
 msgstr "Ändere Formatierung zu:"
 
@@ -5456,16 +5464,20 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr "PhpWikiSystemverwalten/Purge"
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Permanently purge selected pages"
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 msgid "Select the files to purge"
 msgstr "Wählen Sie die Seiten zum Löschen:"
 
@@ -5506,30 +5518,34 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr "PhpWikiSystemverwalten/Löschen"
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Löschen"
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr "Ausgewählte Seiten löschen"
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr "Wähle Seiten zum Umbenennen aus:"
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr "Auch Seiten, die in den letzten %s Tagen gelöscht wurden."
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6321,10 +6337,6 @@
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6354,10 +6366,6 @@
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/es.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -1005,8 +1005,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5235,19 +5235,23 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Change owner of selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 msgid "Change owner to: "
 msgstr ""
 
@@ -5278,19 +5282,23 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 msgid "Change markup to: "
 msgstr ""
 
@@ -5329,15 +5337,19 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Permanently purge selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5376,29 +5388,33 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Quite"
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6161,10 +6177,6 @@
 msgid "Purge Page"
 msgstr ""
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6191,10 +6203,6 @@
 msgid "Remove Page"
 msgstr "Borrar Página"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/fr.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1000,8 +1000,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5290,20 +5290,24 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr "AdministrationDePhpWiki/Chown"
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr "Confirmer le changement de propriétaire"
+
+#: ../lib/plugin/WikiAdminChown.php:174
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 "Êtes-vous sûr de vouloir changer le propriétaire des pages sélectionnées ?"
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Change owner of selected pages"
 msgstr "Changer le propriétaire des pages sélectionnées"
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 msgid "Select the pages to change the owner"
 msgstr "Sélectionnez les pages dont vous voulez changer le propriétaire"
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 msgid "Change owner to: "
 msgstr "Changer le propriétaire par : "
 
@@ -5334,19 +5338,23 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr "Confirmer le changement de type de syntaxe"
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Change markup type"
 msgstr "Changer le type de syntaxe"
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 msgid "Change markup to: "
 msgstr ""
 
@@ -5385,15 +5393,19 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr "Confirmer la purge"
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr "Êtes-vous sûr de vouloir purger définitivement les pages suivantes ?"
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Permanently purge selected pages"
 msgstr "Purger définitivement les pages sélectionnées"
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 msgid "Select the files to purge"
 msgstr "Sélectionnez les fichiers à purger"
 
@@ -5432,29 +5444,33 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr "Confirm la suppression"
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?"
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr "Supprimer les pages sélectionnées"
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr "Même les pages qui ont été supprimées il y a au plus %s days."
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6234,10 +6250,6 @@
 msgid "Purge Page"
 msgstr "Purger la page"
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6266,10 +6278,6 @@
 msgid "Remove Page"
 msgstr "Supprimer la page"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/it.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -991,8 +991,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5211,19 +5211,23 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Change owner of selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 msgid "Change owner to: "
 msgstr ""
 
@@ -5254,19 +5258,23 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr "AmministrazioneDiPhpWiki/Disposizione"
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 msgid "Change markup to: "
 msgstr ""
 
@@ -5305,15 +5313,19 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Permanently purge selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5352,29 +5364,33 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr "AmministrazioneDiPhpWiki/Rimuovi"
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "Cancella"
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6137,10 +6153,6 @@
 msgid "Purge Page"
 msgstr ""
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6167,10 +6179,6 @@
 msgid "Remove Page"
 msgstr "Cancella la Pagina"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/ja.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -980,8 +980,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5298,22 +5298,26 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 #, fuzzy
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 #, fuzzy
 msgid "Select the pages to change the owner"
 msgstr "貴方個人の言語を選択"
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 #, fuzzy
 msgid "Change owner to: "
 msgstr "国名変更"
@@ -5346,22 +5350,26 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 #, fuzzy
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 #, fuzzy
 msgid "Change markup type"
 msgstr "国名変更"
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 #, fuzzy
 msgid "Select the pages to change the markup type"
 msgstr "貴方個人の言語を選択"
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 #, fuzzy
 msgid "Change markup to: "
 msgstr "パスワード変更"
@@ -5404,16 +5412,20 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 #, fuzzy
 msgid "Permanently purge selected pages"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 #, fuzzy
 msgid "Select the files to purge"
 msgstr "貴方個人の言語を選択"
@@ -5455,30 +5467,34 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 #, fuzzy
 msgid "Remove"
 msgstr "ページ削除"
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6268,10 +6284,6 @@
 msgid "Purge Page"
 msgstr "変更しませんでした。"
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6298,10 +6310,6 @@
 msgid "Remove Page"
 msgstr "ページ削除"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/nl.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -983,8 +983,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5202,19 +5202,23 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Change owner of selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 msgid "Change owner to: "
 msgstr ""
 
@@ -5245,19 +5249,23 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr "PhpWikiBeheer/Markup"
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 msgid "Change markup to: "
 msgstr ""
 
@@ -5296,15 +5304,19 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Permanently purge selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5343,29 +5355,33 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6127,10 +6143,6 @@
 msgid "Purge Page"
 msgstr ""
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6157,10 +6169,6 @@
 msgid "Remove Page"
 msgstr "Verwijder Pagina"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/phpwiki.pot	2011-11-28 14:23:07 UTC (rev 8185)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -977,8 +977,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5196,19 +5196,23 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Change owner of selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 msgid "Change owner to: "
 msgstr ""
 
@@ -5239,19 +5243,23 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 msgid "Change markup to: "
 msgstr ""
 
@@ -5290,15 +5298,19 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Permanently purge selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5337,29 +5349,33 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6121,10 +6137,6 @@
 msgid "Purge Page"
 msgstr ""
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6150,10 +6162,6 @@
 msgid "Remove Page"
 msgstr ""
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/sv.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -978,8 +978,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5198,19 +5198,23 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 msgid "Change owner of selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 msgid "Select the pages to change the owner"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 msgid "Change owner to: "
 msgstr ""
 
@@ -5241,19 +5245,23 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 msgid "Change markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 msgid "Select the pages to change the markup type"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 msgid "Change markup to: "
 msgstr ""
 
@@ -5292,15 +5300,19 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 msgid "Permanently purge selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 msgid "Select the files to purge"
 msgstr ""
 
@@ -5339,29 +5351,33 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 msgid "Are you sure you want to remove the selected files?"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 msgid "Select the files to remove"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr ""
@@ -6123,10 +6139,6 @@
 msgid "Purge Page"
 msgstr ""
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
@@ -6153,10 +6165,6 @@
 msgid "Remove Page"
 msgstr "Ta bort sida"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2011-11-28 14:04:37 UTC (rev 8184)
+++ trunk/locale/po/zh.po	2011-11-28 14:23:07 UTC (rev 8185)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 16:14+0100\n"
+"POT-Creation-Date: 2011-11-28 15:22+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -1024,8 +1024,8 @@
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
-#: ../lib/plugin/WikiAdminChown.php:183 ../lib/plugin/WikiAdminMarkup.php:175
-#: ../lib/plugin/WikiAdminPurge.php:154 ../lib/plugin/WikiAdminRemove.php:219
+#: ../lib/plugin/WikiAdminChown.php:184 ../lib/plugin/WikiAdminMarkup.php:176
+#: ../lib/plugin/WikiAdminPurge.php:155 ../lib/plugin/WikiAdminRemove.php:220
 #: ../lib/plugin/WikiAdminRename.php:231
 #: ../lib/plugin/WikiAdminSearchReplace.php:199
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
@@ -5422,22 +5422,26 @@
 msgid "PhpWikiAdministration/Chown"
 msgstr "PhpWikiAdministration/Chmod"
 
-#: ../lib/plugin/WikiAdminChown.php:173
+#: ../lib/plugin/WikiAdminChown.php:171
+msgid "Confirm ownership change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminChown.php:174
 #, fuzzy
 msgid "Are you sure you want to change the owner of the selected pages?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminChown.php:177
+#: ../lib/plugin/WikiAdminChown.php:178
 #, fuzzy
 msgid "Change owner of selected pages"
 msgstr "移除選定頁面"
 
-#: ../lib/plugin/WikiAdminChown.php:178
+#: ../lib/plugin/WikiAdminChown.php:179
 #, fuzzy
 msgid "Select the pages to change the owner"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminChown.php:200
+#: ../lib/plugin/WikiAdminChown.php:201
 #, fuzzy
 msgid "Change owner to: "
 msgstr "變更國家"
@@ -5472,22 +5476,26 @@
 msgid "PhpWikiAdministration/Markup"
 msgstr "PhpWikiAdministration"
 
-#: ../lib/plugin/WikiAdminMarkup.php:165
+#: ../lib/plugin/WikiAdminMarkup.php:163
+msgid "Confirm markup change"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminMarkup.php:166
 #, fuzzy
 msgid "Are you sure you want to change the markup type of the selected files?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminMarkup.php:169
+#: ../lib/plugin/WikiAdminMarkup.php:170
 #, fuzzy
 msgid "Change markup type"
 msgstr "變更國家"
 
-#: ../lib/plugin/WikiAdminMarkup.php:170
+#: ../lib/plugin/WikiAdminMarkup.php:171
 #, fuzzy
 msgid "Select the pages to change the markup type"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminMarkup.php:192
+#: ../lib/plugin/WikiAdminMarkup.php:193
 #, fuzzy
 msgid "Change markup to: "
 msgstr "改變密碼"
@@ -5532,17 +5540,21 @@
 msgid "PhpWikiAdministration/Purge"
 msgstr "PhpWikiAdministration"
 
-#: ../lib/plugin/WikiAdminPurge.php:146
+#: ../lib/plugin/WikiAdminPurge.php:145 ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminPurge.php:147
 #, fuzzy
 msgid "Are you sure you want to permanently purge the following files?"
 msgstr "你確定你想要永久變更選定的檔案?"
 
-#: ../lib/plugin/WikiAdminPurge.php:149
+#: ../lib/plugin/WikiAdminPurge.php:150
 #, fuzzy
 msgid "Permanently purge selected pages"
 msgstr "永久移除選定的頁面."
 
-#: ../lib/plugin/WikiAdminPurge.php:150
+#: ../lib/plugin/WikiAdminPurge.php:151
 #, fuzzy
 msgid "Select the files to purge"
 msgstr "選擇頁面以進行更名:"
@@ -5584,31 +5596,35 @@
 msgid "PhpWikiAdministration/Remove"
 msgstr "PhpWikiAdministration/Remove"
 
-#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:237
+#: ../lib/plugin/WikiAdminRemove.php:192 ../lib/plugin/WikiAdminRemove.php:238
 #: ../themes/blog/themeinfo.php:72
 msgid "Remove"
 msgstr "移除"
 
-#: ../lib/plugin/WikiAdminRemove.php:199
+#: ../lib/plugin/WikiAdminRemove.php:198 ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/plugin/WikiAdminRemove.php:200
 #, fuzzy
 msgid "Are you sure you want to remove the selected files?"
 msgstr "你確定你想要永久移除選定的檔案?"
 
-#: ../lib/plugin/WikiAdminRemove.php:202
+#: ../lib/plugin/WikiAdminRemove.php:203
 msgid "Remove selected pages"
 msgstr "移除選定頁面"
 
-#: ../lib/plugin/WikiAdminRemove.php:203
+#: ../lib/plugin/WikiAdminRemove.php:204
 #, fuzzy
 msgid "Select the files to remove"
 msgstr "選擇頁面以進行更名:"
 
-#: ../lib/plugin/WikiAdminRemove.php:206
+#: ../lib/plugin/WikiAdminRemove.php:207
 #, php-format
 msgid "Also pages which have been deleted at least %s days."
 msgstr "也列出過去 %s 天被刪除的頁面."
 
-#: ../lib/plugin/WikiAdminRemove.php:213
+#: ../lib/plugin/WikiAdminRemove.php:214
 #, fuzzy, php-format
 msgid "Pages which have been deleted at least %s days are already checked."
 msgstr "(列出過去 %s 天內已被刪除且檢查過的頁面.)"
@@ -6402,10 +6418,6 @@
 msgid "Purge Page"
 msgstr "沒有頁面被變更."
 
-#: ../lib/purgepage.php:27
-msgid "Confirm purge"
-msgstr ""
-
 #: ../lib/purgepage.php:28
 #, fuzzy, php-format
 msgid "You are about to purge '%s'!"
@@ -6434,10 +6446,6 @@
 msgid "Remove Page"
 msgstr "移除頁面"
 
-#: ../lib/removepage.php:27
-msgid "Confirm removal"
-msgstr ""
-
 #: ../lib/removepage.php:28
 #, fuzzy, php-format
 msgid "You are about to remove '%s'!"

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

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

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

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

From: <var...@us...> - 2011-11-28 14:04:43

Revision: 8184
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8184&view=rev
Author:   vargenau
Date:     2011-11-28 14:04:37 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Add <legend> to <fieldset>

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2011-11-24 15:15:12 UTC (rev 8183)
+++ trunk/lib/plugin/WikiAdminChown.php	2011-11-28 14:04:37 UTC (rev 8184)
@@ -168,6 +168,7 @@
         $header = HTML::fieldset();
         if ($next_action == 'verify') {
             $button_label = _("Yes");
+            $header->pushContent(HTML::legend(_("Confirm ownership change")));
             $header->pushContent(
               HTML::p(HTML::strong(
                 _("Are you sure you want to change the owner of the selected pages?"))));

Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php	2011-11-24 15:15:12 UTC (rev 8183)
+++ trunk/lib/plugin/WikiAdminMarkup.php	2011-11-28 14:04:37 UTC (rev 8184)
@@ -160,6 +160,7 @@
         $header = HTML::fieldset();
         if ($next_action == 'verify') {
             $button_label = _("Yes");
+            $header->pushContent(HTML::legend(_("Confirm markup change")));
             $header->pushContent(
               HTML::p(HTML::strong(
                 _("Are you sure you want to change the markup type of the selected files?"))));

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2011-11-24 15:15:12 UTC (rev 8183)
+++ trunk/lib/plugin/WikiAdminPurge.php	2011-11-28 14:04:37 UTC (rev 8184)
@@ -142,6 +142,7 @@
         $header = HTML::fieldset();
         if ($next_action == 'verify') {
             $button_label = _("Yes");
+            $header->pushContent(HTML::legend(_("Confirm purge")));
             $header->pushContent(HTML::p(HTML::strong(
                 _("Are you sure you want to permanently purge the following files?"))));
         }

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2011-11-24 15:15:12 UTC (rev 8183)
+++ trunk/lib/plugin/WikiAdminRemove.php	2011-11-28 14:04:37 UTC (rev 8184)
@@ -195,6 +195,7 @@
         $header = HTML::fieldset();
         if ($next_action == 'verify') {
             $button_label = _("Yes");
+            $header->pushContent(HTML::legend(_("Confirm removal")));
             $header->pushContent(HTML::p(HTML::strong(
                 _("Are you sure you want to remove the selected files?"))));
         }

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

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

From: <var...@us...> - 2011-11-24 15:15:24

Revision: 8183
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8183&view=rev
Author:   vargenau
Date:     2011-11-24 15:15:12 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Regenerate translations

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

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

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

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-24 15:15:12 UTC (rev 8183)
@@ -1154,7 +1154,7 @@
 $locale["Upgrade"] = "Mettre à jour";
 $locale["Upgrade disabled: user != isAdmin"] = "Mise à jour désactivée, vous n'êtes pas administrateur";
 $locale["Upgrading this PhpWiki"] = "Mise à jour du PhpWiki";
-$locale["Upload"] = "Téléchargé";
+$locale["Upload"] = "Télécharger";
 $locale["Upload File"] = "Déposer un fichier";
 $locale["Upload error: file only partially received"] = "Erreur : le fichier n'a été que partiellement transmis";
 $locale["Upload files to the local InterWiki Upload:<filename>"] = "Transférer les fichiers vers Upload:<filename>";

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/de.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+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."
@@ -5427,7 +5427,7 @@
 msgid "Permanently purge all selected pages."
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Seite »%s« erfolgreich gelöscht."
@@ -5477,7 +5477,7 @@
 msgid "Permanently remove all selected pages."
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Seite »%s« erfolgreich gelöscht."
@@ -6317,20 +6317,24 @@
 msgid "Sorry, this page does not exist."
 msgstr "Leider, diese Seite ist nicht in der Datenbank."
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "Sie sind im Begriff »%s« zu löschen!"
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr "Jemand hat die Seite bereits bearbeitet!"
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6346,16 +6350,20 @@
 msgid "Remove cancelled"
 msgstr "Seite Löschen"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "Sie sind im Begriff »%s« zu löschen!"
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/es.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5302,7 +5302,7 @@
 msgid "Permanently purge all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Página '%s' borrada satisfactoriamente."
@@ -5349,7 +5349,7 @@
 msgid "Permanently remove all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Página '%s' borrada satisfactoriamente."
@@ -6157,20 +6157,24 @@
 msgid "Sorry, this page does not exist."
 msgstr "Apesadumbrada, esta página no está en la base de datos."
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr ""
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "¡Usted está a punto de eliminar '%s'!"
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr "¡Alguien ha modificado la página!"
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6183,16 +6187,20 @@
 msgid "Remove cancelled"
 msgstr "Borrar Página"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Borrar Página"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "¡Usted está a punto de eliminar '%s'!"
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/fr.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5358,7 +5358,7 @@
 msgid "Permanently purge all selected pages."
 msgstr "Purger définitivement toutes les pages sélectionnées."
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Page '%s' purgée avec succès"
@@ -5405,7 +5405,7 @@
 msgid "Permanently remove all selected pages."
 msgstr "Supprimer toutes les pages sélectionnées en permanence."
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Page '%s' supprimée avec succès"
@@ -6230,20 +6230,24 @@
 msgid "Sorry, this page does not exist."
 msgstr "Désolé, cette page n'existe pas."
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr "Purger la page"
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "Vous êtes sur le point de purger '%s' !"
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr "Quelqu'un a modifié la page !"
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6258,16 +6262,20 @@
 msgid "Remove cancelled"
 msgstr "Suppression de la page annulée"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Supprimer la page"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "Vous êtes sur le point de supprimer '%s' !"
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/it.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5278,7 +5278,7 @@
 msgid "Permanently purge all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "La pagina '%s' è stata rimossa correttamente."
@@ -5325,7 +5325,7 @@
 msgid "Permanently remove all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "La pagina '%s' è stata rimossa correttamente."
@@ -6133,20 +6133,24 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr ""
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr ""
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr "Qualcuno ha modificato la pagina!"
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6159,16 +6163,20 @@
 msgid "Remove cancelled"
 msgstr "Cancella la Pagina"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Cancella la Pagina"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr ""
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/ja.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5375,7 +5375,7 @@
 msgid "Permanently purge all selected pages."
 msgstr "選択ページを全て削除"
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, fuzzy, php-format
 msgid "Purged page '%s' successfully."
 msgstr "'%s' の削除に成功しました。"
@@ -5426,7 +5426,7 @@
 msgid "Permanently remove all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, fuzzy, php-format
 msgid "Removed page '%s' successfully."
 msgstr "'%s' の削除に成功しました。"
@@ -6263,21 +6263,25 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 #, fuzzy
 msgid "Purge Page"
 msgstr "変更しませんでした。"
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr ""
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr ""
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6290,16 +6294,20 @@
 msgid "Remove cancelled"
 msgstr "ページ削除"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "ページ削除"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr ""
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/nl.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5269,7 +5269,7 @@
 msgid "Permanently purge all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Pagina '%s' verwijderd."
@@ -5316,7 +5316,7 @@
 msgid "Permanently remove all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Pagina '%s' verwijderd."
@@ -6123,20 +6123,24 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr ""
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "Je staat te verwijderen '%s'!"
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr ""
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6149,16 +6153,20 @@
 msgid "Remove cancelled"
 msgstr "Verwijder Pagina"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Verwijder Pagina"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "Je staat te verwijderen '%s' op het punt!"
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/phpwiki.pot	2011-11-24 15:15:12 UTC (rev 8183)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5263,7 +5263,7 @@
 msgid "Permanently purge all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr ""
@@ -5310,7 +5310,7 @@
 msgid "Permanently remove all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr ""
@@ -6117,20 +6117,24 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr ""
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr ""
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr ""
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6142,16 +6146,20 @@
 msgid "Remove cancelled"
 msgstr ""
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr ""
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr ""
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/sv.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5265,7 +5265,7 @@
 msgid "Permanently purge all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr ""
@@ -5312,7 +5312,7 @@
 msgid "Permanently remove all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Tog bort sidan '%s'."
@@ -6119,20 +6119,24 @@
 msgid "Sorry, this page does not exist."
 msgstr ""
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr ""
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "Du kommer att ta bort \"%s\" permanent!"
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr ""
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6145,16 +6149,20 @@
 msgid "Remove cancelled"
 msgstr "Ta bort sida"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Ta bort sida"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "Du kommer att ta bort \"%s\" permanent!"
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2011-11-24 15:13:32 UTC (rev 8182)
+++ trunk/locale/po/zh.po	2011-11-24 15:15:12 UTC (rev 8183)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:37+0100\n"
+"POT-Creation-Date: 2011-11-24 16:14+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5502,7 +5502,7 @@
 msgid "Permanently purge all selected pages."
 msgstr "永久移除選定的頁面."
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, fuzzy, php-format
 msgid "Purged page '%s' successfully."
 msgstr "成功地移除頁面 '%s'."
@@ -5555,7 +5555,7 @@
 msgid "Permanently remove all selected pages."
 msgstr "永久移除選定的頁面."
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "成功地移除頁面 '%s'."
@@ -6397,21 +6397,25 @@
 msgid "Sorry, this page does not exist."
 msgstr "抱歉, 版本是 %d 的 %s 不在資料庫中."
 
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:59 ../lib/WikiTheme.php:1035
 #, fuzzy
 msgid "Purge Page"
 msgstr "沒有頁面被變更."
 
 #: ../lib/purgepage.php:27
+msgid "Confirm purge"
+msgstr ""
+
+#: ../lib/purgepage.php:28
 #, fuzzy, php-format
 msgid "You are about to purge '%s'!"
 msgstr "你正要永久移除 '%s'!"
 
-#: ../lib/purgepage.php:46 ../lib/removepage.php:46
+#: ../lib/purgepage.php:47 ../lib/removepage.php:47
 msgid "Someone has edited the page!"
 msgstr "有人編輯了此頁面!"
 
-#: ../lib/purgepage.php:47
+#: ../lib/purgepage.php:48
 #, fuzzy, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6426,16 +6430,20 @@
 msgid "Remove cancelled"
 msgstr "移除頁面"
 
-#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
+#: ../lib/removepage.php:24 ../lib/removepage.php:59 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "移除頁面"
 
 #: ../lib/removepage.php:27
+msgid "Confirm removal"
+msgstr ""
+
+#: ../lib/removepage.php:28
 #, fuzzy, php-format
 msgid "You are about to remove '%s'!"
 msgstr "你正要永久移除 '%s'!"
 
-#: ../lib/removepage.php:47
+#: ../lib/removepage.php:48
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "

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

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

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

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

From: <var...@us...> - 2011-11-24 15:13:41

Revision: 8182
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8182&view=rev
Author:   vargenau
Date:     2011-11-24 15:13:32 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
Fix French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-11-22 16:53:45 UTC (rev 8181)
+++ trunk/locale/po/fr.po	2011-11-24 15:13:32 UTC (rev 8182)
@@ -462,7 +462,7 @@
 #: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161
 #: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101
 msgid "Upload"
-msgstr "Téléchargé"
+msgstr "Télécharger"
 
 #: ../lib/editpage.php:716
 msgid "Spell Check"

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

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

From: <var...@us...> - 2011-11-22 16:53:51

Revision: 8181
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8181&view=rev
Author:   vargenau
Date:     2011-11-22 16:53:45 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Add <legend> to <fieldset>

Modified Paths:
--------------
    trunk/lib/purgepage.php
    trunk/lib/removepage.php

Modified: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php	2011-11-07 16:50:45 UTC (rev 8180)
+++ trunk/lib/purgepage.php	2011-11-22 16:53:45 UTC (rev 8181)
@@ -24,7 +24,8 @@
         $purgeB = Button('submit:verify', _("Purge Page"), 'wikiadmin');
         $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
 
-        $fieldset = HTML::fieldset(HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
+        $fieldset = HTML::fieldset(HTML::legend(_('Confirm purge')),
+                                   HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
                      HTML::form(array('method' => 'post',
                                       'action' => $request->getPostURL()),
                                 HiddenInputs(array('currentversion' => $version,

Modified: trunk/lib/removepage.php
===================================================================
--- trunk/lib/removepage.php	2011-11-07 16:50:45 UTC (rev 8180)
+++ trunk/lib/removepage.php	2011-11-22 16:53:45 UTC (rev 8181)
@@ -24,7 +24,8 @@
         $removeB = Button('submit:verify', _("Remove Page"), 'wikiadmin');
         $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
 
-        $fieldset = HTML::fieldset(HTML::p(fmt("You are about to remove '%s'!", $pagelink)),
+        $fieldset = HTML::fieldset(HTML::legend(_('Confirm removal')),
+                                   HTML::p(fmt("You are about to remove '%s'!", $pagelink)),
                      HTML::form(array('method' => 'post',
                                       'action' => $request->getPostURL()),
                                 HiddenInputs(array('currentversion' => $version,

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8180] trunk/config

From: <ru...@us...> - 2011-11-07 16:50:51

Revision: 8180
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8180&view=rev
Author:   rurban
Date:     2011-11-07 16:50:45 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
make first-only the default. be conservative, as the tricky recursion may fail

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2011-11-04 10:38:38 UTC (rev 8179)
+++ trunk/config/config-default.ini	2011-11-07 16:50:45 UTC (rev 8180)
@@ -94,7 +94,7 @@
 ALLOW_USER_PASSWORDS = true
 USER_AUTH_ORDER = PersonalPage
 PASSWORD_LENGTH_MINIMUM = 0
-USER_AUTH_POLICY = stacked
+USER_AUTH_POLICY = first-only
 ENABLE_AUTH_OPENID = false
 ;LDAP_AUTH_HOST = "ldap://localhost:389"
 ;LDAP_BASE_DN = "ou=Users,o=Development,dc=mycompany.com"

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2011-11-04 10:38:38 UTC (rev 8179)
+++ trunk/config/config-dist.ini	2011-11-07 16:50:45 UTC (rev 8180)
@@ -659,10 +659,12 @@
 ;                       methods as in the previous PhpWiki releases (slow)
 ;       strict:     check if the user exists for all methods: 
 ;                       on the first existing user, try the password. 
-;                       dont try the other methods on failure then
+;                       dont try the other methods on failure then. 
+;                   Note: May result in crashes on endless recursion
 ;       stacked:    check the given user - password combination for all
 ;                       methods and return true on the first success.
-USER_AUTH_POLICY = stacked
+;                   Note: May result in crashes on endless recursion
+USER_AUTH_POLICY = first-only
 
 ; Enable the new extended method of handling WikiUsers to support external auth and PAGEPERM.
 ; Servers with memory-limit problems might want to turn it off. It costs ~300KB

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

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

From: <var...@us...> - 2011-11-04 10:38:46

Revision: 8179
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8179&view=rev
Author:   vargenau
Date:     2011-11-04 10:38:38 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Update translations

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

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

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

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-04 10:38:38 UTC (rev 8179)
@@ -703,6 +703,8 @@
 $locale["No pages removed."] = "Aucune page n'a été supprimée.";
 $locale["No pages renamed."] = "Aucune page n'a été renommée.";
 $locale["No pages with bad names had to be deleted."] = "Aucune page supprimées avec un nom invalide.";
+$locale["No revert: no page content"] = "Pas de révocation : pas de contenu dans la page";
+$locale["No revert: same version page"] = "Pas de révocation : même version de la page";
 $locale["No revisions found"] = "Aucune version trouvée";
 $locale["No uploaded file to upload?"] = "Pas de fichier à déposer ?";
 $locale["No userid"] = "Pas d'identifiant utilisateur";
@@ -830,6 +832,8 @@
 $locale["Post new"] = "Poster une annonce";
 $locale["Posted: %s"] = "Posté le %s";
 $locale["Postponed %s for %s."] = "Pas de listes trouvées pour %1\$s";
+$locale["Prediction: %.1f"] = "Prédiction : %.1f";
+$locale["Prediction: %s"] = "Prédiction : %s";
 $locale["Preferences"] = "Préférences";
 $locale["PreferencesInfo"] = "PréférencesInfo";
 $locale["Prev"] = "Précédent";
@@ -855,6 +859,7 @@
 $locale["Purge Markup Cache"] = "Purger le cache";
 $locale["Purge Page"] = "Purger la page";
 $locale["Purge all Pages With Invalid Names"] = "Supprimer les pages dont le nom n'est pas valide";
+$locale["Purge cancelled"] = "Purge de la page annulée";
 $locale["Purge this page"] = "Purger cette page";
 $locale["PurgeHtmlCache"] = "PurgerLeCache";
 $locale["Purged page '%s' successfully."] = "Page '%s' purgée avec succès";
@@ -906,6 +911,7 @@
 $locale["Remove"] = "Supprimer";
 $locale["Remove Comment"] = "Supprimer le commentaire";
 $locale["Remove Page"] = "Supprimer la page";
+$locale["Remove cancelled"] = "Suppression de la page annulée";
 $locale["Remove selected pages"] = "Supprimer les pages sélectionnées";
 $locale["Remove this page"] = "Supprimer cette page";
 $locale["Removed page '%s' successfully."] = "Page '%s' supprimée avec succès";
@@ -926,7 +932,9 @@
 $locale["Restore Anyway"] = "Restaurer quand même";
 $locale["Return to %s"] = "Retourner à %s";
 $locale["Revert"] = "Révoquer";
+$locale["Revert cancelled"] = "Révocation annulée";
 $locale["Revert: %s"] = "Révoquer : %s";
+$locale["Revert: missing required version argument"] = "Révocation : argument de version obligatoire manquant";
 $locale["Revision Not Found"] = "Version non trouvée";
 $locale["RichTable"] = "BeauTableau";
 $locale["RssFeed"] = "RessourcesRss";
@@ -967,6 +975,7 @@
 $locale["Set USE_DB_SESSION to false."] = "Mettre USE_DB_SESSION à false.";
 $locale["Set individual page permissions."] = "Modifier les permissions individuelles de la page.";
 $locale["SetAcl"] = "DéfinirAcl";
+$locale["SetAclSimple"] = "DéfinirAclSimple";
 $locale["Show Group Information"] = "Information sur le groupe";
 $locale["Show Page Trail"] = "Afficher le fil d'Ariane";
 $locale["Show Page Trail at top of page."] = "Afficher le fil d'Ariane en tête de la page.";
@@ -1202,6 +1211,7 @@
 $locale["Watch"] = "Surveiller";
 $locale["Watch Page"] = "Surveiller";
 $locale["WatchPage"] = "Suivre";
+$locale["WatchPage cancelled"] = "Surveillance de la page annulée";
 $locale["We have a total of %d registered users."] = "Nous avons %d utilisateurs enregistrés.";
 $locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Bienvenue sur %s!\nVotre compte email a été vérifié et\nsera utilisé pour les notifications de changements de pages.\nVoir %s";
 $locale["What links here"] = "Pages liées";

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/de.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/es.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/fr.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/it.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/ja.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/nl.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/phpwiki.pot	2011-11-04 10:38:38 UTC (rev 8179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/sv.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2011-11-04 10:36:39 UTC (rev 8178)
+++ trunk/locale/po/zh.po	2011-11-04 10:38:38 UTC (rev 8179)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 11:25+0100\n"
+"POT-Creation-Date: 2011-11-04 11:37+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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

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

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

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

From: <var...@us...> - 2011-11-04 10:36:45

Revision: 8178
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8178&view=rev
Author:   vargenau
Date:     2011-11-04 10:36:39 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Update French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-11-04 10:27:30 UTC (rev 8177)
+++ trunk/locale/po/fr.po	2011-11-04 10:36:39 UTC (rev 8178)
@@ -969,24 +969,20 @@
 msgstr " Désolé, impossible de fusionner."
 
 #: ../lib/loadsave.php:1080
-#, fuzzy
 msgid "Revert: missing required version argument"
-msgstr "argument de version obligatoire manquant"
+msgstr "Révocation : argument de version obligatoire manquant"
 
 #: ../lib/loadsave.php:1087
-#, fuzzy
 msgid "No revert: no page content"
-msgstr "pas de contenu dans la page"
+msgstr "Pas de révocation : pas de contenu dans la page"
 
 #: ../lib/loadsave.php:1092
-#, fuzzy
 msgid "No revert: same version page"
-msgstr "même version de la page"
+msgstr "Pas de révocation : même version de la page"
 
 #: ../lib/loadsave.php:1097
-#, fuzzy
 msgid "Revert cancelled"
-msgstr "Annulé"
+msgstr "Révocation annulée"
 
 #: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
@@ -1401,7 +1397,7 @@
 
 #: ../lib/main.php:1092
 msgid "SetAclSimple"
-msgstr ""
+msgstr "DéfinirAclSimple"
 
 #: ../lib/main.php:1096 ../lib/PagePerm.php:190
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
@@ -3762,12 +3758,12 @@
 #: ../lib/plugin/RateIt.php:269
 #, php-format
 msgid "Prediction: %s"
-msgstr ""
+msgstr "Prédiction : %s"
 
 #: ../lib/plugin/RateIt.php:273
 #, php-format
 msgid "Prediction: %.1f"
-msgstr ""
+msgstr "Prédiction : %.1f"
 
 #: ../lib/plugin/RateIt.php:293
 msgid "Rate It"
@@ -5146,9 +5142,8 @@
 "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos "
 
 #: ../lib/plugin/WatchPage.php:138
-#, fuzzy
 msgid "WatchPage cancelled"
-msgstr "Suivre"
+msgstr "Surveillance de la page annulée"
 
 #: ../lib/plugin/WatchPage.php:160
 msgid ""
@@ -6228,9 +6223,8 @@
 msgstr "Argument obligatoire %s manquant"
 
 #: ../lib/purgepage.php:13
-#, fuzzy
 msgid "Purge cancelled"
-msgstr "Annulé"
+msgstr "Purge de la page annulée"
 
 #: ../lib/purgepage.php:20 ../lib/removepage.php:20
 msgid "Sorry, this page does not exist."
@@ -6261,9 +6255,8 @@
 "toujours retirer de façon permanente cette page de la base de données."
 
 #: ../lib/removepage.php:13
-#, fuzzy
 msgid "Remove cancelled"
-msgstr "Supprimer la page"
+msgstr "Suppression de la page annulée"
 
 #: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
@@ -8757,3 +8750,20 @@
 #: ../themes/Wordpress/templates/browse.tmpl:10
 msgid "View the current version"
 msgstr "Voir la version actuelle"
+
+#, fuzzy
+#~ msgid ""
+#~ "Preview only! Changes not saved. Please continue editing. (You'll find "
+#~ "your edit area at the bottom of the page.)"
+#~ msgstr ""
+#~ "Veuillez continuer votre édition. (Vous trouverez votre %s en bas de "
+#~ "page)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Warning: You are editing an old revision. Saving this page will overwrite "
+#~ "the current version."
+#~ msgstr "Enregistrer cette page écrasera la version actuelle."
+
+#~ msgid "User Preferences"
+#~ msgstr "Préférences de l'utilisateur"

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

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

From: <var...@us...> - 2011-11-04 10:27:40

Revision: 8177
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8177&view=rev
Author:   vargenau
Date:     2011-11-04 10:27:30 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Update translations

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/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2011-11-04 10:09:56 UTC (rev 8176)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2011-11-04 10:27:30 UTC (rev 8177)
@@ -224,7 +224,6 @@
 $locale["Can't open zip file '%s' for reading"] = "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen";
 $locale["Cancel"] = "Abbrechen";
 $locale["Cancel your rating"] = "Bewertung löschen";
-$locale["Cancelled"] = "Abgebrochen";
 $locale["Cannot create directory '%s'"] = "Das Verzeichnis »%s« kann nicht erzeugt werden";
 $locale["Cannot create page with empty name!"] = "Kann Seite mit leerem Namen nicht erzeugen";
 $locale["Cannot open AUTH_GROUP_FILE %s"] = "Kann AUTH_GROUP_FILE %s nicht öffnen";
@@ -1289,13 +1288,11 @@
 $locale["minor edit"] = "geringfügige";
 $locale["minor edits"] = "Kleinere Änderungen";
 $locale["minutes"] = "Minuten";
-$locale["missing required version argument"] = "Parameter version muß angegeben werden";
 $locale["new pages"] = "neue Seiten";
 $locale["new&nbsp;window"] = "neues&nbsp;Fenster";
 $locale["newer than the existing page."] = "neuer als die bestehende Seite.";
 $locale["no RSS items"] = "keine RSS Einträge";
 $locale["no cache used"] = "kein Cache verwendet";
-$locale["no page content"] = "leerer Seiteninalt";
 $locale["no page specified"] = "Keine Seite angegeben";
 $locale["not affected"] = "nicht betroffen";
 $locale["not authenticated"] = "nicht authentifizierten";
@@ -1318,7 +1315,6 @@
 $locale["revert to version %d"] = "Speichere Version %d zurück.";
 $locale["revision by previous author"] = "Revidierte Ausgabe des vorigen Autors";
 $locale["same content"] = "gleiche Seiteninalt";
-$locale["same version page"] = "selbe Version der Seite";
 $locale["saved as "] = "gespeichert als ";
 $locale["saved as %s"] = "gespeichert als %s";
 $locale["sent to %s"] = "an %s gesendet";

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	2011-11-04 10:09:56 UTC (rev 8176)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2011-11-04 10:27:30 UTC (rev 8177)
@@ -556,9 +556,7 @@
 $locale["locked"] = "bloqueada";
 $locale["minor"] = "de menor importancia";
 $locale["minutes"] = "minutas";
-$locale["missing required version argument"] = "parámetro requerido de la versión que falta";
 $locale["new pages"] = "páginas nuevas";
-$locale["no page content"] = "ningún contenido de la página";
 $locale["not authenticated"] = "non authenticado";
 $locale["page not locked"] = "página no está bloqueada";
 $locale["plain file %s"] = "archivo llano %s";
@@ -572,7 +570,6 @@
 $locale["revert to version %d"] = "invierta a la versión %d";
 $locale["revision by previous author"] = "revisión del autor anterior";
 $locale["same content"] = "mismo contenido";
-$locale["same version page"] = "la misma página de la versión";
 $locale["saved as "] = "ahorrado como ";
 $locale["saved as %s"] = "ahorrado como %s";
 $locale["the file '%s'"] = "el archivo %s";

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-04 10:09:56 UTC (rev 8176)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-11-04 10:27:30 UTC (rev 8177)
@@ -222,7 +222,6 @@
 $locale["Can't open zip file '%s' for reading"] = "Impossible d'ouvrir le fichier zip '%s' en lecture";
 $locale["Cancel"] = "Annuler";
 $locale["Cancel your rating"] = "Annuler la notation";
-$locale["Cancelled"] = "Annulé";
 $locale["Cannot create directory '%s'"] = "Impossible de créer le répertoire : « %s »";
 $locale["Cannot open AUTH_GROUP_FILE %s"] = "Impossible d'ouvrir AUTH_GROUP_FILE %s";
 $locale["Case exact?"] = "respect de la casse";
@@ -1326,11 +1325,9 @@
 $locale["minor edit"] = "modification mineure";
 $locale["minor edits"] = "modifications mineures";
 $locale["minutes"] = "minutes";
-$locale["missing required version argument"] = "argument de version obligatoire manquant";
 $locale["new pages"] = "nouvelles pages";
 $locale["newer than the existing page."] = "plus récent que la page existante.";
 $locale["no cache used"] = "pas de cache utilisé";
-$locale["no page content"] = "pas de contenu dans la page";
 $locale["no page specified"] = "aucune page indiquée";
 $locale["not affected"] = "non affectée";
 $locale["not authenticated"] = "non authentifié";
@@ -1355,7 +1352,6 @@
 $locale["revert to version %d"] = "revenir à la version %d";
 $locale["revision by previous author"] = "version par l'auteur précédent";
 $locale["same content"] = "même contenu";
-$locale["same version page"] = "même version de la page";
 $locale["saved as "] = "enregistré sous ";
 $locale["saved as %s"] = "enregistrée sous %s";
 $locale["sent to %s"] = "envoyé à %s";

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2011-11-04 10:09:56 UTC (rev 8176)
+++ trunk/locale/po/de.po	2011-11-04 10:27:30 UTC (rev 8177)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 15:42+0200\n"
+"POT-Creation-Date: 2011-11-04 11:25+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -159,7 +159,7 @@
 msgid "Version %1$s was created because: %2$s"
 msgstr ""
 
-#: ../lib/display.php:74 ../lib/display.php:339
+#: ../lib/display.php:74 ../lib/display.php:344
 #: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
 #: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
 #: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
@@ -176,7 +176,7 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:443
+#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:448
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr "LinkDatenbank"
@@ -184,7 +184,7 @@
 # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte
 # Änderungen"; in terms of newspapers or journalism it's traditionally
 # "NeuesteNachrichten" or much more better "DasNeueste").
-#: ../lib/display.php:170 ../lib/display.php:405 ../lib/loadsave.php:1579
+#: ../lib/display.php:170 ../lib/display.php:410 ../lib/loadsave.php:1574
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
@@ -207,7 +207,7 @@
 msgid "RecentChanges"
 msgstr "NeuesteÄnderungen"
 
-#: ../lib/display.php:207 ../lib/display.php:444
+#: ../lib/display.php:207 ../lib/display.php:449
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
@@ -238,7 +238,7 @@
 msgid "(Redirected from %s)"
 msgstr "(Weitergeleitet von %s)"
 
-#: ../lib/display.php:362 ../themes/Crao/templates/head.tmpl:63
+#: ../lib/display.php:367 ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/head.tmpl:64
 #: ../themes/default/templates/head.tmpl:71
 #: ../themes/default/templates/head.tmpl:72
@@ -383,7 +383,7 @@
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -698,7 +698,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
 #, php-format
 msgid "%s: file not found"
 msgstr "»%s«: Datei nicht gefunden"
@@ -799,7 +799,7 @@
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:292 ../lib/MailNotify.php:309
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
@@ -910,7 +910,7 @@
 msgid "Invalid pagename!"
 msgstr "Ungültiger Seitenname!"
 
-#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1555 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:158
 #: ../themes/default/templates/info.tmpl:159
@@ -924,7 +924,7 @@
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:288
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Neue Seite"
@@ -954,17 +954,17 @@
 msgid "- saved to database as version %d"
 msgstr "- in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1293
 #, php-format
 msgid "MIME file %s"
 msgstr "MIME-Datei %s"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1304
 #, php-format
 msgid "Serialized file %s"
 msgstr "Serialisierte Datei %s"
 
-#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1326
 #, php-format
 msgid "plain file %s"
 msgstr "Nur-Text-Datei %s"
@@ -988,34 +988,27 @@
 msgid " Sorry, cannot merge."
 msgstr " Konnte leider nicht automatisch einpflegen."
 
-#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
-#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:77
-#: ../themes/fusionforge/templates/userprefs.tmpl:254
-#: ../themes/MonoBook/templates/actionbar.tmpl:73
-#: ../themes/Sidebar/templates/actionbar.tmpl:47
-#: ../themes/smaller/templates/actionbar.tmpl:31
-#: ../themes/Wordpress/templates/actionbar.tmpl:60
-msgid "Revert"
-msgstr "Zurückspeichern"
-
-#: ../lib/loadsave.php:1078
-msgid "missing required version argument"
+#: ../lib/loadsave.php:1080
+#, fuzzy
+msgid "Revert: missing required version argument"
 msgstr "Parameter version muß angegeben werden"
 
-#: ../lib/loadsave.php:1086
-msgid "no page content"
+#: ../lib/loadsave.php:1087
+#, fuzzy
+msgid "No revert: no page content"
 msgstr "leerer Seiteninalt"
 
-#: ../lib/loadsave.php:1093
-msgid "same version page"
+#: ../lib/loadsave.php:1092
+#, fuzzy
+msgid "No revert: same version page"
 msgstr "selbe Version der Seite"
 
-#: ../lib/loadsave.php:1100
-msgid "Cancelled"
+#: ../lib/loadsave.php:1097
+#, fuzzy
+msgid "Revert cancelled"
 msgstr "Abgebrochen"
 
-#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
 #: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
 #: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
@@ -1027,7 +1020,7 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
@@ -1038,70 +1031,70 @@
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
 #: ../lib/plugin/WikiAdminSetExternal.php:131
 #: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
-#: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:291
 #: ../themes/fusionforge/templates/userprefs.tmpl:391
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/loadsave.php:1128
+#: ../lib/loadsave.php:1122
 #, php-format
 msgid "revert to version %d"
 msgstr "Speichere Version %d zurück."
 
-#: ../lib/loadsave.php:1134
+#: ../lib/loadsave.php:1129
 #, php-format
 msgid "Revert: %s"
 msgstr "Zurückspeichern: %s"
 
-#: ../lib/loadsave.php:1135
+#: ../lib/loadsave.php:1130
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d in der Datenbank gespeichert als Version %d."
 
-#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: nicht definiert"
 
-#: ../lib/loadsave.php:1163
+#: ../lib/loadsave.php:1158
 msgid "Default InterWiki map file not loaded."
 msgstr "Standard-Datei der InterWikiListe nicht geladen."
 
-#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Die InterWikiListe wird von der externen Datei %s geladen."
 
-#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
+#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
 msgid "Skipping"
 msgstr "Übersprungen"
 
-#: ../lib/loadsave.php:1460
+#: ../lib/loadsave.php:1455
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1467
+#: ../lib/loadsave.php:1462
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Ungültiger Dateityp: %s"
 
-#: ../lib/loadsave.php:1484
+#: ../lib/loadsave.php:1479
 #, php-format
 msgid "Loading '%s'"
 msgstr "»%s« wird geladen"
 
-#: ../lib/loadsave.php:1516
+#: ../lib/loadsave.php:1511
 msgid "Loading up virgin wiki"
 msgstr "Lade neue Seiten in das frische Wiki"
 
-#: ../lib/loadsave.php:1572
+#: ../lib/loadsave.php:1567
 msgid "No uploaded file to upload?"
 msgstr "Keine Datei zum Hochladen?"
 
-#: ../lib/loadsave.php:1575
+#: ../lib/loadsave.php:1570
 #, php-format
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
@@ -1111,41 +1104,41 @@
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:229
+#: ../lib/MailNotify.php:233
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:235
+#: ../lib/MailNotify.php:239
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:261
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:289
+#: ../lib/MailNotify.php:293
 #, php-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../lib/MailNotify.php:306
+#: ../lib/MailNotify.php:310
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:343
+#: ../lib/MailNotify.php:347
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s von Benutzer %s"
 
-#: ../lib/MailNotify.php:379 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:383 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:382
+#: ../lib/MailNotify.php:386
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1456,7 +1449,7 @@
 msgstr "VolltextSuche"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1472
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -2245,7 +2238,7 @@
 msgstr "Bearbeite %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1527 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
 #: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
@@ -2407,7 +2400,7 @@
 msgid "DeadEndPages"
 msgstr "VerwaisteSeiten"
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1028
 #: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "Diff"
@@ -5190,7 +5183,7 @@
 msgid "The page %s is already watched!"
 msgstr "Diese Seite %s is schon beobachtet"
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1027
 #: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
@@ -5215,7 +5208,12 @@
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:158
+#: ../lib/plugin/WatchPage.php:138
+#, fuzzy
+msgid "WatchPage cancelled"
+msgstr "SeiteBeobarten"
+
+#: ../lib/plugin/WatchPage.php:160
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
@@ -5429,7 +5427,7 @@
 msgid "Permanently purge all selected pages."
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:53
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Seite »%s« erfolgreich gelöscht."
@@ -5479,7 +5477,7 @@
 msgid "Permanently remove all selected pages."
 msgstr "Endgültige Löschung aller ausgewählten Seiten."
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:53
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Seite »%s« erfolgreich gelöscht."
@@ -5593,7 +5591,7 @@
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
 
 #: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
-#: ../lib/WikiTheme.php:1034
+#: ../lib/WikiTheme.php:1031
 msgid "Rename Page"
 msgstr "Seite Umbenennen"
 
@@ -5969,7 +5967,7 @@
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiForm.php:74 ../lib/WikiTheme.php:1033
+#: ../lib/plugin/WikiForm.php:74 ../lib/WikiTheme.php:1030
 #: ../lib/WikiUserNew.php:510 ../lib/WikiUser.php:228
 #: ../themes/blog/themeinfo.php:69 ../themes/Crao/templates/signin.tmpl:53
 #: ../themes/default/templates/login.tmpl:71
@@ -6310,24 +6308,29 @@
 msgid "Required argument %s missing"
 msgstr "Erforderliches Argument »%s« fehlt"
 
-#: ../lib/purgepage.php:18 ../lib/removepage.php:18
+#: ../lib/purgepage.php:13
+#, fuzzy
+msgid "Purge cancelled"
+msgstr "Abgebrochen"
+
+#: ../lib/purgepage.php:20 ../lib/removepage.php:20
 msgid "Sorry, this page does not exist."
 msgstr "Leider, diese Seite ist nicht in der Datenbank."
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr "Seiten endgültig löschen"
 
-#: ../lib/purgepage.php:25
+#: ../lib/purgepage.php:27
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "Sie sind im Begriff »%s« zu löschen!"
 
-#: ../lib/purgepage.php:44 ../lib/removepage.php:44
+#: ../lib/purgepage.php:46 ../lib/removepage.php:46
 msgid "Someone has edited the page!"
 msgstr "Jemand hat die Seite bereits bearbeitet!"
 
-#: ../lib/purgepage.php:45
+#: ../lib/purgepage.php:47
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6338,16 +6341,21 @@
 "neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch "
 "von der Datenbank permanent löschen wollen."
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
+#: ../lib/removepage.php:13
+#, fuzzy
+msgid "Remove cancelled"
+msgstr "Seite Löschen"
+
+#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Seite Löschen"
 
-#: ../lib/removepage.php:25
+#: ../lib/removepage.php:27
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "Sie sind im Begriff »%s« zu löschen!"
 
-#: ../lib/removepage.php:45
+#: ../lib/removepage.php:47
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "
@@ -7032,7 +7040,7 @@
 msgid "'%s': Bad page name"
 msgstr "»%s«: Ungültiger Seitenname"
 
-#: ../lib/WikiTheme.php:1032 ../themes/blog/themeinfo.php:68
+#: ../lib/WikiTheme.php:1029 ../themes/blog/themeinfo.php:68
 #: ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
@@ -7046,20 +7054,20 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/WikiTheme.php:1032 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Seite Sperren"
 
-#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/WikiTheme.php:1033 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Seite Freigeben"
 
-#: ../lib/WikiTheme.php:1208
+#: ../lib/WikiTheme.php:1205
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../lib/WikiTheme.php:1302 ../themes/Hawaiian/themeinfo.php:34
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
 #: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
@@ -7067,13 +7075,13 @@
 msgid "Printer"
 msgstr "Drucker"
 
-#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../lib/WikiTheme.php:1303 ../themes/MacOSX/themeinfo.php:106
 #: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
 #: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr "Obere u. untere Werkzeugleisten"
 
-#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1304 ../themes/Hawaiian/themeinfo.php:35
 #: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
 #: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
 #: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
@@ -7081,16 +7089,16 @@
 msgid "Modern"
 msgstr "Modern"
 
-#: ../lib/WikiTheme.php:1808
+#: ../lib/WikiTheme.php:1805
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Zusatzprogramm %s: undefiniert"
 
-#: ../lib/WikiTheme.php:1831
+#: ../lib/WikiTheme.php:1828
 msgid "Related Links"
 msgstr "Verwandte Links"
 
-#: ../lib/WikiTheme.php:1852
+#: ../lib/WikiTheme.php:1849
 msgid "External Links"
 msgstr "Externe Links"
 
@@ -7804,6 +7812,16 @@
 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:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:254
+#: ../themes/MonoBook/templates/actionbar.tmpl:73
+#: ../themes/Sidebar/templates/actionbar.tmpl:47
+#: ../themes/smaller/templates/actionbar.tmpl:31
+#: ../themes/Wordpress/templates/actionbar.tmpl:60
+msgid "Revert"
+msgstr "Zurückspeichern"
+
 #: ../themes/default/templates/addcomment.tmpl:15
 msgid "Add Comment"
 msgstr "Neuer Kommentar"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-11-04 10:09:56 UTC (rev 8176)
+++ trunk/locale/po/es.po	2011-11-04 10:27:30 UTC (rev 8177)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 15:42+0200\n"
+"POT-Creation-Date: 2011-11-04 11:25+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -163,7 +163,7 @@
 msgid "Version %1$s was created because: %2$s"
 msgstr ""
 
-#: ../lib/display.php:74 ../lib/display.php:339
+#: ../lib/display.php:74 ../lib/display.php:344
 #: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
 #: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
 #: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
@@ -180,12 +180,12 @@
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:443
+#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:448
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr ""
 
-#: ../lib/display.php:170 ../lib/display.php:405 ../lib/loadsave.php:1579
+#: ../lib/display.php:170 ../lib/display.php:410 ../lib/loadsave.php:1574
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
@@ -208,7 +208,7 @@
 msgid "RecentChanges"
 msgstr "CambiosRecientes"
 
-#: ../lib/display.php:207 ../lib/display.php:444
+#: ../lib/display.php:207 ../lib/display.php:449
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
@@ -237,7 +237,7 @@
 msgid "(Redirected from %s)"
 msgstr "(vuelto a dirigir de %s)"
 
-#: ../lib/display.php:362 ../themes/Crao/templates/head.tmpl:63
+#: ../lib/display.php:367 ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/head.tmpl:64
 #: ../themes/default/templates/head.tmpl:71
 #: ../themes/default/templates/head.tmpl:72
@@ -381,7 +381,7 @@
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -692,7 +692,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s: error mientras que maneja error:"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
 #, php-format
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
@@ -788,7 +788,7 @@
 msgid "PhpWikiAdministration"
 msgstr "AdministraciónDePhpWiki"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:292 ../lib/MailNotify.php:309
 #, php-format
 msgid "Edited by: %s"
 msgstr "Editar: %s"
@@ -896,7 +896,7 @@
 msgid "Invalid pagename!"
 msgstr ""
 
-#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1555 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:158
 #: ../themes/default/templates/info.tmpl:159
@@ -910,7 +910,7 @@
 msgid "from %s"
 msgstr "de %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:288
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Página nueva"
@@ -939,17 +939,17 @@
 msgid "- saved to database as version %d"
 msgstr "- ahorrado a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1293
 #, php-format
 msgid "MIME file %s"
 msgstr "Archivo %s del MIME"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1304
 #, php-format
 msgid "Serialized file %s"
 msgstr "Archivo serializado %s"
 
-#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1326
 #, php-format
 msgid "plain file %s"
 msgstr "archivo llano %s"
@@ -970,34 +970,26 @@
 msgid " Sorry, cannot merge."
 msgstr " Apesadumbrado, no puede combinarse."
 
-#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
-#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:77
-#: ../themes/fusionforge/templates/userprefs.tmpl:254
-#: ../themes/MonoBook/templates/actionbar.tmpl:73
-#: ../themes/Sidebar/templates/actionbar.tmpl:47
-#: ../themes/smaller/templates/actionbar.tmpl:31
-#: ../themes/Wordpress/templates/actionbar.tmpl:60
-msgid "Revert"
-msgstr "Invierta"
-
-#: ../lib/loadsave.php:1078
-msgid "missing required version argument"
+#: ../lib/loadsave.php:1080
+#, fuzzy
+msgid "Revert: missing required version argument"
 msgstr "parámetro requerido de la versión que falta"
 
-#: ../lib/loadsave.php:1086
-msgid "no page content"
+#: ../lib/loadsave.php:1087
+#, fuzzy
+msgid "No revert: no page content"
 msgstr "ningún contenido de la página"
 
-#: ../lib/loadsave.php:1093
-msgid "same version page"
+#: ../lib/loadsave.php:1092
+#, fuzzy
+msgid "No revert: same version page"
 msgstr "la misma página de la versión"
 
-#: ../lib/loadsave.php:1100
-msgid "Cancelled"
+#: ../lib/loadsave.php:1097
+msgid "Revert cancelled"
 msgstr ""
 
-#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
 #: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
 #: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
@@ -1009,7 +1001,7 @@
 msgid "Yes"
 msgstr "Si"
 
-#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
@@ -1020,70 +1012,70 @@
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
 #: ../lib/plugin/WikiAdminSetExternal.php:131
 #: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
-#: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:291
 #: ../themes/fusionforge/templates/userprefs.tmpl:391
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/loadsave.php:1128
+#: ../lib/loadsave.php:1122
 #, php-format
 msgid "revert to version %d"
 msgstr "invierta a la versión %d"
 
-#: ../lib/loadsave.php:1134
+#: ../lib/loadsave.php:1129
 #, php-format
 msgid "Revert: %s"
 msgstr "Invierta: %s"
 
-#: ../lib/loadsave.php:1135
+#: ../lib/loadsave.php:1130
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- versión %d ahorrada a la base de datos como versión %d"
 
-#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s: no definido"
 
-#: ../lib/loadsave.php:1163
+#: ../lib/loadsave.php:1158
 msgid "Default InterWiki map file not loaded."
 msgstr "Archivo del InterMapa de Wiki del defecto no cargado."
 
-#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Cargamento InterMapaDeWiki del archivo externo %s."
 
-#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
+#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
 msgid "Skipping"
 msgstr "El saltar"
 
-#: ../lib/loadsave.php:1460
+#: ../lib/loadsave.php:1455
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1467
+#: ../lib/loadsave.php:1462
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Mal tipo del archivo:  %s"
 
-#: ../lib/loadsave.php:1484
+#: ../lib/loadsave.php:1479
 #, php-format
 msgid "Loading '%s'"
 msgstr "'%s' que carga"
 
-#: ../lib/loadsave.php:1516
+#: ../lib/loadsave.php:1511
 msgid "Loading up virgin wiki"
 msgstr "El cargar encima de wiki virginal"
 
-#: ../lib/loadsave.php:1572
+#: ../lib/loadsave.php:1567
 msgid "No uploaded file to upload?"
 msgstr "¿Ningún archivo uploaded a upload?"
 
-#: ../lib/loadsave.php:1575
+#: ../lib/loadsave.php:1570
 #, php-format
 msgid "Uploading %s"
 msgstr "%s uploading"
@@ -1093,41 +1085,41 @@
 msgid "PageChange Notification of %s"
 msgstr "Pagine la notificación del cambio de %s"
 
-#: ../lib/MailNotify.php:229
+#: ../lib/MailNotify.php:233
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:235
+#: ../lib/MailNotify.php:239
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:261
 msgid "Page change"
 msgstr "Cambio de la página"
 
-#: ../lib/MailNotify.php:289
+#: ../lib/MailNotify.php:293
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:306
+#: ../lib/MailNotify.php:310
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La página retitula %s a %s"
 
-#: ../lib/MailNotify.php:343
+#: ../lib/MailNotify.php:347
 #, php-format
 msgid "User %s removed page %s"
 msgstr "El usuarios %s eliminado página %s"
 
-#: ../lib/MailNotify.php:379 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:383 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "Verificación Del Email"
 
-#: ../lib/MailNotify.php:382
+#: ../lib/MailNotify.php:386
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1435,7 +1427,7 @@
 msgstr "BúsquedaDelTexto"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1472
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -2215,7 +2207,7 @@
 msgstr "Editar %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1527 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
 #: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
@@ -2377,7 +2369,7 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1028
 #: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr "Diferencia"
@@ -5071,7 +5063,7 @@
 msgid "The page %s is already watched!"
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1027
 #: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
@@ -5096,7 +5088,12 @@
 msgid "ERROR: No email defined! You need to do this in your "
 msgstr ""
 
-#: ../lib/plugin/WatchPage.php:158
+#: ../lib/plugin/WatchPage.php:138
+#, fuzzy
+msgid "WatchPage cancelled"
+msgstr "Cambio de la página"
+
+#: ../lib/plugin/WatchPage.php:160
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
@@ -5305,7 +5302,7 @@
 msgid "Permanently purge all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:53
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Página '%s' borrada satisfactoriamente."
@@ -5352,7 +5349,7 @@
 msgid "Permanently remove all selected pages."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:53
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Página '%s' borrada satisfactoriamente."
@@ -5461,7 +5458,7 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
-#: ../lib/WikiTheme.php:1034
+#: ../lib/WikiTheme.php:1031
 msgid "Rename Page"
 msgstr ""
 
@@ -5824,7 +5821,7 @@
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiForm.php:74 ../lib/WikiTheme.php:1033
+#: ../lib/plugin/WikiForm.php:74 ../lib/WikiTheme.php:1030
 #: ../lib/WikiUserNew.php:510 ../lib/WikiUser.php:228
 #: ../themes/blog/themeinfo.php:69 ../themes/Crao/templates/signin.tmpl:53
 #: ../themes/default/templates/login.tmpl:71
@@ -6151,24 +6148,29 @@
 msgid "Required argument %s missing"
 msgstr ""
 
-#: ../lib/purgepage.php:18 ../lib/removepage.php:18
+#: ../lib/purgepage.php:13
+#, fuzzy
+msgid "Purge cancelled"
+msgstr "Cambio de la página"
+
+#: ../lib/purgepage.php:20 ../lib/removepage.php:20
 msgid "Sorry, this page does not exist."
 msgstr "Apesadumbrada, esta página no está en la base de datos."
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr ""
 
-#: ../lib/purgepage.php:25
+#: ../lib/purgepage.php:27
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "¡Usted está a punto de eliminar '%s'!"
 
-#: ../lib/purgepage.php:44 ../lib/removepage.php:44
+#: ../lib/purgepage.php:46 ../lib/removepage.php:46
 msgid "Someone has edited the page!"
 msgstr "¡Alguien ha modificado la página!"
 
-#: ../lib/purgepage.php:45
+#: ../lib/purgepage.php:47
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6176,16 +6178,21 @@
 "the database."
 msgstr ""
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
+#: ../lib/removepage.php:13
+#, fuzzy
+msgid "Remove cancelled"
+msgstr "Borrar Página"
+
+#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Borrar Página"
 
-#: ../lib/removepage.php:25
+#: ../lib/removepage.php:27
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "¡Usted está a punto de eliminar '%s'!"
 
-#: ../lib/removepage.php:45
+#: ../lib/removepage.php:47
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "
@@ -6869,7 +6876,7 @@
 msgid "'%s': Bad page name"
 msgstr "'%s': Mal nombre de la página"
 
-#: ../lib/WikiTheme.php:1032 ../themes/blog/themeinfo.php:68
+#: ../lib/WikiTheme.php:1029 ../themes/blog/themeinfo.php:68
 #: ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
@@ -6883,20 +6890,20 @@
 msgid "Sign Out"
 msgstr "Registro Hacia fuera"
 
-#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/WikiTheme.php:1032 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Bloquear Página"
 
-#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/WikiTheme.php:1033 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Desbloquear Página"
 
-#: ../lib/WikiTheme.php:1208
+#: ../lib/WikiTheme.php:1205
 msgid ""
 "Some action(page) wanted to add more headers, but they were already printed."
 msgstr ""
 
-#: ../lib/WikiTheme.php:1305 ../themes/Hawaiian/themeinfo.php:34
+#: ../lib/WikiTheme.php:1302 ../themes/Hawaiian/themeinfo.php:34
 #: ../themes/MacOSX/themeinfo.php:105 ../themes/MonoBook/themeinfo.php:109
 #: ../themes/Portland/themeinfo.php:63 ../themes/shamino_com/themeinfo.php:59
 #: ../themes/Sidebar/themeinfo.php:120 ../themes/SpaceWiki/themeinfo.php:46
@@ -6904,13 +6911,13 @@
 msgid "Printer"
 msgstr "Impresora"
 
-#: ../lib/WikiTheme.php:1306 ../themes/MacOSX/themeinfo.php:106
+#: ../lib/WikiTheme.php:1303 ../themes/MacOSX/themeinfo.php:106
 #: ../themes/MonoBook/themeinfo.php:110 ../themes/shamino_com/themeinfo.php:60
 #: ../themes/wikilens/themeinfo.php:32
 msgid "Top & bottom toolbars"
 msgstr "Toolbars superiores y inferiores"
 
-#: ../lib/WikiTheme.php:1307 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1304 ../themes/Hawaiian/themeinfo.php:35
 #: ../themes/MonoBook/themeinfo.php:111 ../themes/Portland/themeinfo.php:64
 #: ../themes/shamino_com/themeinfo.php:61 ../themes/Sidebar/themeinfo.php:121
 #: ../themes/SpaceWiki/themeinfo.php:47 ../themes/wikilens/themeinfo.php:33
@@ -6918,16 +6925,16 @@
 msgid "Modern"
 msgstr "Moderno"
 
-#: ../lib/WikiTheme.php:1808
+#: ../lib/WikiTheme.php:1805
 #, php-format
 msgid "Plugin %s: undefined"
 msgstr "Plugin %s: indefinido"
 
-#: ../lib/WikiTheme.php:1831
+#: ../lib/WikiTheme.php:1828
 msgid "Related Links"
 msgstr "Acoplamientos Relacionados"
 
-#: ../lib/WikiTheme.php:1852
+#: ../lib/WikiTheme.php:1849
 msgid "External Links"
 msgstr "Acoplamientos Externos"
 
@@ -7632,6 +7639,16 @@
 msgid "Enter your UserId to sign in"
 msgstr ""
 
+#: ../themes/default/templates/actionbar.tmpl:31
+#: ../themes/fusionforge/templates/actionbar.tmpl:77
+#: ../themes/fusionforge/templates/userprefs.tmpl:254
+#: ../themes/MonoBook/templates/actionbar.tmpl:73
+#: ../themes/Sidebar/templates/actionbar.tmpl:47
+#: ../themes/smaller/templates/actionbar.tmpl:31
+#: ../themes/Wordpress/templates/actionbar.tmpl:60
+msgid "Revert"
+msgstr "Invierta"
+
 #: ../themes/default/templates/addcomment.tmpl:15
 msgid "Add Comment"
 msgstr "Agregue El Comentario"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-11-04 10:09:56 UTC (rev 8176)
+++ trunk/locale/po/fr.po	2011-11-04 10:27:30 UTC (rev 8177)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-20 15:42+0200\n"
+"POT-Creation-Date: 2011-11-04 11:25+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -158,7 +158,7 @@
 msgid "Version %1$s was created because: %2$s"
 msgstr "La version %1$s a été créée car : %2$s"
 
-#: ../lib/display.php:74 ../lib/display.php:339
+#: ../lib/display.php:74 ../lib/display.php:344
 #: ../lib/plugin/HelloWorld.php:65 ../lib/plugin/PageGroup.php:158
 #: ../lib/plugin/PageGroup.php:169 ../lib/plugin/PageGroup.php:185
 #: ../lib/plugin/PageGroup.php:192 ../lib/plugin/PageHistory.php:236
@@ -175,12 +175,12 @@
 msgid "%s: %s"
 msgstr "%s : %s"
 
-#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:443
+#: ../lib/display.php:105 ../lib/display.php:206 ../lib/display.php:448
 #: ../lib/plugin/LinkDatabase.php:42
 msgid "LinkDatabase"
 msgstr "LiensDatabase"
 
-#: ../lib/display.php:170 ../lib/display.php:405 ../lib/loadsave.php:1579
+#: ../lib/display.php:170 ../lib/display.php:410 ../lib/loadsave.php:1574
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentChanges.php:1160
@@ -203,7 +203,7 @@
 msgid "RecentChanges"
 msgstr "DernièresModifs"
 
-#: ../lib/display.php:207 ../lib/display.php:444
+#: ../lib/display.php:207 ../lib/display.php:449
 #: ../lib/plugin/FileInfo.php:124 ../lib/TextSearchQuery.php:115
 #, php-format
 msgid "Unsupported argument: %s=%s"
@@ -232,7 +232,7 @@
 msgid "(Redirected from %s)"
 msgstr "(Redirigé de %s)"
 
-#: ../lib/display.php:362 ../themes/Crao/templates/head.tmpl:63
+#: ../lib/display.php:367 ../themes/Crao/templates/head.tmpl:63
 #: ../themes/Crao/templates/head.tmpl:64
 #: ../themes/default/templates/head.tmpl:71
 #: ../themes/default/templates/head.tmpl:72
@@ -378,7 +378,7 @@
 
 #: ../lib/editpage.php:571 ../lib/plugin/PasswordReset.php:154
 #: ../lib/plugin/UserPreferences.php:39 ../lib/plugin/WatchPage.php:122
-#: ../lib/plugin/WatchPage.php:142 ../themes/blog/templates/navbar.tmpl:17
+#: ../lib/plugin/WatchPage.php:144 ../themes/blog/templates/navbar.tmpl:17
 #: ../themes/Crao/templates/head.tmpl:79 ../themes/Crao/templates/head.tmpl:80
 #: ../themes/Crao/templates/navbar.tmpl:24
 #: ../themes/default/templates/head.tmpl:87
@@ -690,7 +690,7 @@
 msgid "%s: error while handling error:"
 msgstr "%s : erreur pendant la gestion de l'erreur :"
 
-#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1158
+#: ../lib/FileFinder.php:187 ../lib/loadsave.php:1153
 #, php-format
 msgid "%s: file not found"
 msgstr "%s : fichier non trouvé"
@@ -786,7 +786,7 @@
 msgid "PhpWikiAdministration"
 msgstr "AdministrationDePhpWiki"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:288 ../lib/MailNotify.php:305
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:292 ../lib/MailNotify.php:309
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifié par : %s"
@@ -895,7 +895,7 @@
 msgid "Invalid pagename!"
 msgstr "Nom de page invalide !"
 
-#: ../lib/loadsave.php:913 ../lib/loadsave.php:1560 ../lib/PageType.php:136
+#: ../lib/loadsave.php:913 ../lib/loadsave.php:1555 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
 #: ../lib/plugin/WantedPages.php:51 ../themes/default/templates/info.tmpl:158
 #: ../themes/default/templates/info.tmpl:159
@@ -909,7 +909,7 @@
 msgid "from %s"
 msgstr "du %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:284
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:288
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nouvelle page"
@@ -937,17 +937,17 @@
 msgid "- saved to database as version %d"
 msgstr "- enregistrée dans la base de données sous la version %d"
 
-#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1298
+#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1293
 #, php-format
 msgid "MIME file %s"
 msgstr "fichier MIME %s"
 
-#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1309
+#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1304
 #, php-format
 msgid "Serialized file %s"
 msgstr "Fichier sérialisé %s"
 
-#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1331
+#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1326
 #, php-format
 msgid "plain file %s"
 msgstr "fichier brut %s"
@@ -968,34 +968,27 @@
 msgid " Sorry, cannot merge."
 msgstr " Désolé, impossible de fusionner."
 
-#: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
-#: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
-#: ../themes/fusionforge/templates/actionbar.tmpl:77
-#: ../themes/fusionforge/templates/userprefs.tmpl:254
-#: ../themes/MonoBook/templates/actionbar.tmpl:73
-#: ../themes/Sidebar/templates/actionbar.tmpl:47
-#: ../themes/smaller/templates/actionbar.tmpl:31
-#: ../themes/Wordpress/templates/actionbar.tmpl:60
-msgid "Revert"
-msgstr "Révoquer"
-
-#: ../lib/loadsave.php:1078
-msgid "missing required version argument"
+#: ../lib/loadsave.php:1080
+#, fuzzy
+msgid "Revert: missing required version argument"
 msgstr "argument de version obligatoire manquant"
 
-#: ../lib/loadsave.php:1086
-msgid "no page content"
+#: ../lib/loadsave.php:1087
+#, fuzzy
+msgid "No revert: no page content"
 msgstr "pas de contenu dans la page"
 
-#: ../lib/loadsave.php:1093
-msgid "same version page"
+#: ../lib/loadsave.php:1092
+#, fuzzy
+msgid "No revert: same version page"
 msgstr "même version de la page"
 
-#: ../lib/loadsave.php:1100
-msgid "Cancelled"
+#: ../lib/loadsave.php:1097
+#, fuzzy
+msgid "Revert cancelled"
 msgstr "Annulé"
 
-#: ../lib/loadsave.php:1112 ../lib/plugin/PasswordReset.php:102
+#: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:102
 #: ../lib/plugin/PasswordReset.php:145 ../lib/plugin/UserPreferences.php:116
 #: ../lib/plugin/WatchPage.php:83 ../lib/plugin/WikiAdminChmod.php:141
 #: ../lib/plugin/WikiAdminChown.php:170 ../lib/plugin/WikiAdminMarkup.php:162
@@ -1007,7 +1000,7 @@
 msgid "Yes"
 msgstr "Oui"
 
-#: ../lib/loadsave.php:1114 ../lib/plugin/PasswordReset.php:105
+#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:105
 #: ../lib/plugin/PasswordReset.php:148 ../lib/plugin/TranslateText.php:113
 #: ../lib/plugin/UserPreferences.php:118 ../lib/plugin/WatchPage.php:85
 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:154
@@ -1018,70 +1011,70 @@
 #: ../lib/plugin/WikiAdminSelect.php:148 ../lib/plugin/WikiAdminSetAcl.php:210
 #: ../lib/plugin/WikiAdminSetExternal.php:131
 #: ../lib/plugin/WikiAdminUtils.php:293 ../lib/plugin/WikiFormRich.php:307
-#: ../lib/purgepage.php:23 ../lib/removepage.php:23 ../lib/upgrade.php:791
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:791
 #: ../themes/default/templates/login.tmpl:88
 #: ../themes/default/templates/userprefs.tmpl:291
 #: ../themes/fusionforge/templates/userprefs.tmpl:391
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../lib/loadsave.php:1128
+#: ../lib/loadsave.php:1122
 #, php-format
 msgid "revert to version %d"
 msgstr "revenir à la version %d"
 
-#: ../lib/loadsave.php:1134
+#: ../lib/loadsave.php:1129
 #, php-format
 msgid "Revert: %s"
 msgstr "Révoquer : %s"
 
-#: ../lib/loadsave.php:1135
+#: ../lib/loadsave.php:1130
 #, php-format
 msgid "- version %d saved to database as version %d"
 msgstr "- version %d sauvée dans la base de données sous la version %d"
 
-#: ../lib/loadsave.php:1153 ../lib/WikiGroup.php:838
+#: ../lib/loadsave.php:1148 ../lib/WikiGroup.php:838
 #, php-format
 msgid "%s: not defined"
 msgstr "%s : non défini"
 
-#: ../lib/loadsave.php:1163
+#: ../lib/loadsave.php:1158
 msgid "Default InterWiki map file not loaded."
 msgstr "Carte InterWiki par défaut non chargée."
 
-#: ../lib/loadsave.php:1170 ../lib/PageType.php:298
+#: ../lib/loadsave.php:1165 ../lib/PageType.php:298
 #, php-format
 msgid "Loading InterWikiMap from external file %s."
 msgstr "Chargement de la CarteInterWiki depuis le fichier %s."
 
-#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1359
+#: ../lib/loadsave.php:1341 ../lib/loadsave.php:1354
 msgid "Skipping"
 msgstr "Ignoré"
 
-#: ../lib/loadsave.php:1460
+#: ../lib/loadsave.php:1455
 #, php-format
 msgid "Empty or not existing source. Unable to load: %s"
 msgstr ""
 
-#: ../lib/loadsave.php:1467
+#: ../lib/loadsave.php:1462
 #, php-format
 msgid "Bad file type: %s"
 msgstr "Mauvais type de fichier : %s"
 
-#: ../lib/loadsave.php:1484
+#: ../lib/loadsave.php:1479
 #, php-format
 msgid "Loading '%s'"
 msgstr "Chargement de « %s »"
 
-#: ../lib/loadsave.php:1516
+#: ../lib/loadsave.php:1511
 msgid "Loading up virgin wiki"
 msgstr "Chargement du nouveau wiki"
 
-#: ../lib/loadsave.php:1572
+#: ../lib/loadsave.php:1567
 msgid "No uploaded file to upload?"
 msgstr "Pas de fichier à déposer ?"
 
-#: ../lib/loadsave.php:1575
+#: ../lib/loadsave.php:1570
 #, php-format
 msgid "Uploading %s"
 msgstr "Téléchargement de %s"
@@ -1091,41 +1084,41 @@
 msgid "PageChange Notification of %s"
 msgstr "Notification de changement de la page %s"
 
-#: ../lib/MailNotify.php:229
+#: ../lib/MailNotify.php:233
 #, php-format
 msgid "sent to %s"
 msgstr "envoyé à %s"
 
-#: ../lib/MailNotify.php:235
+#: ../lib/MailNotify.php:239
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Erreur : impossible d'envoyer %s à %s"
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:261
 msgid "Page change"
 msgstr "Modification de la page"
 
-#: ../lib/MailNotify.php:289
+#: ../lib/MailNotify.php:293
 #, php-format
 msgid "Summary: %s"
 msgstr "Résumé : %s"
 
-#: ../lib/MailNotify.php:306
+#: ../lib/MailNotify.php:310
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Page renommée de %s à %s"
 
-#: ../lib/MailNotify.php:343
+#: ../lib/MailNotify.php:347
 #, php-format
 msgid "User %s removed page %s"
 msgstr "L'utilisateur %s a supprimé la page %s"
 
-#: ../lib/MailNotify.php:379 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:383 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "Vérification de l'adresse électronique"
 
-#: ../lib/MailNotify.php:382
+#: ../lib/MailNotify.php:386
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1434,7 +1427,7 @@
 msgstr "RechercheEnTexteIntégral"
 
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
-#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
+#: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1472
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
 #: ../themes/Crao/templates/navbar.tmpl:52
@@ -2218,7 +2211,7 @@
 msgstr "Éditer %s"
 
 #: ../lib/plugin/Calendar.php:41 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1530 ../lib/WikiUser.php:478
+#: ../lib/WikiTheme.php:1527 ../lib/WikiUser.php:478
 #: ../themes/blog/templates/sidebar.tmpl:16
 #: ../themes/Crao/templates/head.tmpl:83
 #: ../themes/Crao/templates/navbar.tmpl:29
@@ -2381,7 +2374,7 @@
 msgid "DeadEndPages"
 msgstr ""
 
-#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1031
+#: ../lib/plugin/Diff.php:36 ../lib/WikiTheme.php:1028
 #: ../themes/blog/themeinfo.php:67
 msgid "Diff"
 msgstr ""
@@ -5126,7 +5119,7 @@
 msgid "The page %s is already watched!"
 msgstr "Cette page %s fait déjà partie de votre liste de suivi !"
 
-#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1030
+#: ../lib/plugin/WatchPage.php:88 ../lib/WikiTheme.php:1027
 #: ../themes/blog/templates/actionbar.tmpl:19 ../themes/blog/themeinfo.php:66
 #: ../themes/Crao/templates/actionbar.tmpl:5
 #: ../themes/default/templates/actionbar.tmpl:16
@@ -5152,7 +5145,12 @@
 msgstr ""
 "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos "
 
-#: ../lib/plugin/WatchPage.php:158
+#: ../lib/plugin/WatchPage.php:138
+#, fuzzy
+msgid "WatchPage cancelled"
+msgstr "Suivre"
+
+#: ../lib/plugin/WatchPage.php:160
 msgid ""
 "E-Mail Notification for the current page successfully stored in your "
 "preferences."
@@ -5365,7 +5363,7 @@
 msgid "Permanently purge all selected pages."
 msgstr "Purger définitivement toutes les pages sélectionnées."
 
-#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:53
+#: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:55
 #, php-format
 msgid "Purged page '%s' successfully."
 msgstr "Page '%s' purgée avec succès"
@@ -5412,7 +5410,7 @@
 msgid "Permanently remove all selected pages."
 msgstr "Supprimer toutes les pages sélectionnées en permanence."
 
-#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:53
+#: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:55
 #, php-format
 msgid "Removed page '%s' successfully."
 msgstr "Page '%s' supprimée avec succès"
@@ -5522,7 +5520,7 @@
 msgstr "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?"
 
 #: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
-#: ../lib/WikiTheme.php:1034
+#: ../lib/WikiTheme.php:1031
 msgid "Rename Page"
 msgstr "Renommer la page"
 
@@ -5893,7 +5891,7 @@
 msgid "Provide generic WikiForm input buttons"
 msgstr ""
 
-#: ../lib/plugin/WikiForm.php:74 ../lib/WikiTheme.php:1033
+#: ../lib/plugin/WikiForm.php:74 ../lib/WikiTheme.php:1030
 #: ../lib/WikiUserNew.php:510 ../lib/WikiUser.php:228
 #: ../themes/blog/themeinfo.php:69 ../themes/Crao/templates/signin.tmpl:53
 #: ../themes/default/templates/login.tmpl:71
@@ -6229,24 +6227,29 @@
 msgid "Required argument %s missing"
 msgstr "Argument obligatoire %s manquant"
 
-#: ../lib/purgepage.php:18 ../lib/removepage.php:18
+#: ../lib/purgepage.php:13
+#, fuzzy
+msgid "Purge cancelled"
+msgstr "Annulé"
+
+#: ../lib/purgepage.php:20 ../lib/removepage.php:20
 msgid "Sorry, this page does not exist."
 msgstr "Désolé, cette page n'existe pas."
 
-#: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:58 ../lib/WikiTheme.php:1035
 msgid "Purge Page"
 msgstr "Purger la page"
 
-#: ../lib/purgepage.php:25
+#: ../lib/purgepage.php:27
 #, php-format
 msgid "You are about to purge '%s'!"
 msgstr "Vous êtes sur le point de purger '%s' !"
 
-#: ../lib/purgepage.php:44 ../lib/removepage.php:44
+#: ../lib/purgepage.php:46 ../lib/removepage.php:46
 msgid "Someone has edited the page!"
 msgstr "Quelqu'un a modifié la page !"
 
-#: ../lib/purgepage.php:45
+#: ../lib/purgepage.php:47
 #, php-format
 msgid ""
 "Since you started the purge process, someone has saved a new version of %s.  "
@@ -6257,16 +6260,21 @@
 "enregistré une nouvelle version de %s. Veuillez vérifier que vous désirez "
 "toujours retirer de façon permanente cette page de la base de données."
 
-#: ../lib/removepage.php:22 ../lib/removepage.php:56 ../lib/WikiTheme.php:1037
+#: ../lib/removepage.php:13
+#, fuzzy
+msgid "Remove cancelled"
+msgstr "Supprimer la page"
+
+#: ../lib/removepage.php:24 ../lib/removepage.php:58 ../lib/WikiTheme.php:1034
 msgid "Remove Page"
 msgstr "Supprimer la page"
 
-#: ../lib/removepage.php:25
+#: ../lib/removepage.php:27
 #, php-format
 msgid "You are about to remove '%s'!"
 msgstr "Vous êtes sur le point de supprimer '%s' !"
 
-#: ../lib/removepage.php:45
+#: ../lib/removepage.php:47
 #, php-format
 msgid ""
 "Since you started the deletion process, someone has saved a new version of "
@@ -6949,7 +6957,7 @@
 msgid "'%s': Bad page name"
 msgstr "'%s' : nom de page non valide"
 
-#: ../lib/WikiTheme.php:1032 ../themes/blog/themeinfo.php:68
+#: ../lib/WikiTheme.php:1029 ../themes/blog/themeinfo.php:68
 #: ../themes/Crao/templates/signin.tmpl:14
 #: ../themes/Crao/templates/signin.tmpl:30
 #: ../themes/default/templates/signin.tmpl:16
@@ -6963,20 +6971,20 @@
 msgid "Sign Out"
 msgstr "Se déconnecter"
 
-#: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
+#: ../lib/WikiTheme.php:1032 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Verrouiller la page"
 
-#: ../lib/WikiTheme.php:1036 ../themes/MacOSX/themeinfo.php:137
+#: ../lib/WikiTheme.php:1033 ../themes/MacOSX/themeinfo.php:137
 msgid "Unlock Page"
 msgstr "Déverrouiller la page"
 
-#: ../lib/WikiTheme.php:1208
+#: ../lib/WikiTheme.php:1205
 msgid ""
 "Some action(page) wanted to add more headers, but they were already p...
 
[truncated message content]

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

From: <var...@us...> - 2011-11-04 10:10:03

Revision: 8176
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8176&view=rev
Author:   vargenau
Date:     2011-11-04 10:09:56 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Warning message if action cancelled

Modified Paths:
--------------
    trunk/lib/purgepage.php
    trunk/lib/removepage.php

Modified: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php	2011-11-04 10:04:45 UTC (rev 8175)
+++ trunk/lib/purgepage.php	2011-11-04 10:09:56 UTC (rev 8176)
@@ -9,7 +9,9 @@
     $pagelink = WikiLink($page);
 
     if ($request->getArg('cancel')) {
-        $request->redirect(WikiURL($page)); // noreturn
+        $request->redirect(WikiURL($page,
+                           array('warningmsg' => _('Purge cancelled'))));
+        // noreturn
     }
 
     $current = $page->getCurrentRevision();

Modified: trunk/lib/removepage.php
===================================================================
--- trunk/lib/removepage.php	2011-11-04 10:04:45 UTC (rev 8175)
+++ trunk/lib/removepage.php	2011-11-04 10:09:56 UTC (rev 8176)
@@ -9,7 +9,9 @@
     $pagelink = WikiLink($page);
 
     if ($request->getArg('cancel')) {
-        $request->redirect(WikiURL($page)); // noreturn
+        $request->redirect(WikiURL($page, 
+                           array('warningmsg' => _('Remove cancelled')))); 
+        // noreturn
     }
 
     $current = $page->getCurrentRevision();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8175] trunk/lib/plugin/WatchPage.php

From: <var...@us...> - 2011-11-04 10:04:56

Revision: 8175
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8175&view=rev
Author:   vargenau
Date:     2011-11-04 10:04:45 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Warning message if action cancelled

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

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2011-11-04 09:27:08 UTC (rev 8174)
+++ trunk/lib/plugin/WatchPage.php	2011-11-04 10:04:45 UTC (rev 8175)
@@ -135,7 +135,9 @@
                     $errmsg = '';
                 if ($request->getArg('cancel')) {
                     $request->redirect(WikiURL($request->getArg('pagename'),
-                                               false, 'absolute_url')); // noreturn
+                        array('warningmsg' => _('WatchPage cancelled')),
+                        'absolute_url'));
+                    // noreturn
                     return;
                 }
                 if ($request->getArg('edit')) {

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

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

From: <var...@us...> - 2011-11-04 09:27:14

Revision: 8174
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8174&view=rev
Author:   vargenau
Date:     2011-11-04 09:27:08 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Redirect to page with warningmsg rather than PrintXML

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2011-11-04 09:23:48 UTC (rev 8173)
+++ trunk/lib/loadsave.php	2011-11-04 09:27:08 UTC (rev 8174)
@@ -1073,35 +1073,29 @@
     $mesg = HTML::div();
     $pagename = $request->getArg('pagename');
     $version = $request->getArg('version');
-    if (!$version) {
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 HTML::p(_("missing required version argument")));
-        return;
-    }
     $dbi =& $request->_dbi;
     $page = $dbi->getPage($pagename);
+    if (!$version) {
+        $request->redirect(WikiURL($page,
+                           array('warningmsg' => _('Revert: missing required version argument'))));
+        // noreturn
+    }
     $current = $page->getCurrentRevision();
     $currversion = $current->getVersion();
     if ($currversion == 0) {
-        $mesg->pushContent(' ', _("no page content"));
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 $mesg);
-        flush();
-        return;
+        $request->redirect(WikiURL($page,
+                           array('errormsg' => _('No revert: no page content'))));
+        // noreturn
     }
     if ($currversion == $version) {
-        $mesg->pushContent(' ', _("same version page"));
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 $mesg);
-        flush();
-        return;
+        $request->redirect(WikiURL($page,
+                           array('warningmsg' => _('No revert: same version page'))));
+        // noreturn
     }
     if ($request->getArg('cancel')) {
-        $mesg->pushContent(' ', _("Cancelled"));
-        PrintXML(HTML::p(fmt("Revert")," ",WikiLink($pagename)),
-                 $mesg);
-        flush();
-        return;
+        $request->redirect(WikiURL($page,
+                           array('warningmsg' => _('Revert cancelled'))));
+        // noreturn
     }
     if (!$request->getArg('verify')) {
         $mesg->pushContent(HTML::p(fmt("Are you sure to revert %s to version $version?", WikiLink($pagename))),

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8173] trunk/lib/display.php

From: <var...@us...> - 2011-11-04 09:23:55

Revision: 8173
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8173&view=rev
Author:   vargenau
Date:     2011-11-04 09:23:48 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Add class to error message; add warningmsg like errormsg

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

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2011-11-02 15:22:12 UTC (rev 8172)
+++ trunk/lib/display.php	2011-11-04 09:23:48 UTC (rev 8173)
@@ -295,8 +295,13 @@
                                            RedirectorLink($redirect_from)));
     // abuse the $redirected template var for some status update notice
     } elseif ($request->getArg('errormsg')) {
-        $redirect_message = $request->getArg('errormsg');
+        $redirect_message = HTML::p(array('class' => 'error'),
+                                          $request->getArg('errormsg'));
         $request->setArg('errormsg', false);
+    } elseif ($request->getArg('warningmsg')) {
+        $redirect_message = HTML::p(array('class' => 'warning_msg'),
+                                          $request->getArg('warningmsg'));
+        $request->setArg('errormsg', false);
     }
 
     $request->appendValidators(array('pagerev' => $revision->getVersion(),

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

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

From: <var...@us...> - 2011-11-02 15:22:19

Revision: 8172
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8172&view=rev
Author:   vargenau
Date:     2011-11-02 15:22:12 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Avoid non-monotonic message when reverting

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

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2011-11-02 14:32:49 UTC (rev 8171)
+++ trunk/lib/loadsave.php	2011-11-02 15:22:12 UTC (rev 8172)
@@ -1126,6 +1126,7 @@
     $content = $rev->getPackedContent();
     $versiondata = $rev->_data;
     $versiondata['summary'] = sprintf(_("revert to version %d"), $version);
+    $versiondata['mtime'] = time();
     $new = $page->save($content, $currversion + 1, $versiondata);
     $dbi->touch();
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8171] trunk/lib/MailNotify.php

From: <var...@us...> - 2011-11-02 14:32:55

Revision: 8171
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8171&view=rev
Author:   vargenau
Date:     2011-11-02 14:32:49 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Convert error object to string

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2011-11-02 13:08:16 UTC (rev 8170)
+++ trunk/lib/MailNotify.php	2011-11-02 14:32:49 UTC (rev 8171)
@@ -212,7 +212,11 @@
         if (!$ok && isset($ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1])) {
             // get last error message
             $last_err = $ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1];
-            fwrite($f, "\nX-MailFailure: " . $last_err);
+            fwrite($f, "\nX-MailFailure: " .
+                       "errno: " . $last_err->errno . ", " .
+                       "errstr: " . $last_err->errstr . ", " .
+                       "errfile: " . $last_err->errfile . ", " .
+                       "errline: " . $last_err->errline);
         }
         fwrite($f, "\nDate: " . CTime());
         fwrite($f, "\nSubject: $encoded_subject");

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

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

From: <var...@us...> - 2011-11-02 13:08:22

Revision: 8170
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8170&view=rev
Author:   vargenau
Date:     2011-11-02 13:08:16 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Allow all numeric page names

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2011-10-20 13:44:48 UTC (rev 8169)
+++ trunk/lib/WikiTheme.php	2011-11-02 13:08:16 UTC (rev 8170)
@@ -1016,9 +1016,6 @@
             }
             $pagename = $page->getName();
         }
-        elseif (is_numeric($page_or_rev)) {
-            $version = $page_or_rev;
-        }
         else {
             $pagename = (string) $page_or_rev;
         }

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

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

From: <var...@us...> - 2011-10-20 13:44:58

Revision: 8169
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8169&view=rev
Author:   vargenau
Date:     2011-10-20 13:44:48 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Update translations

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

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

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

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-10-20 13:44:48 UTC (rev 8169)
@@ -915,7 +915,7 @@
 $locale["Rename Page"] = "Renommer la page";
 $locale["Rename selected pages"] = "Renommer les pages sélectionnées";
 $locale["Rename to"] = "Renommer en";
-$locale["Renamed page from '%s' to '%s'."] = "Renommer la page de '%s' à '%s'.";
+$locale["Renamed page from '%s' to '%s'."] = "Page renommée de '%s' à '%s'.";
 $locale["Replace"] = "Remplacer";
 $locale["Replace with"] = "Remplacer par";
 $locale["Replaced '%s' with '%s' in page '%s'."] = "%s a bien été modifié par %s dans la page %s.";

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

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

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/de.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/es.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/fr.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/it.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/ja.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/nl.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/phpwiki.pot	2011-10-20 13:44:48 UTC (rev 8169)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/sv.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2011-10-20 13:42:39 UTC (rev 8168)
+++ trunk/locale/po/zh.po	2011-10-20 13:44:48 UTC (rev 8169)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 16:52+0200\n"
+"POT-Creation-Date: 2011-10-20 15:42+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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

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

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

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

From: <var...@us...> - 2011-10-20 13:42:46

Revision: 8168
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8168&view=rev
Author:   vargenau
Date:     2011-10-20 13:42:39 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Update French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2011-10-03 14:54:13 UTC (rev 8167)
+++ trunk/locale/po/fr.po	2011-10-20 13:42:39 UTC (rev 8168)
@@ -5488,7 +5488,7 @@
 #: ../lib/plugin/WikiAdminRename.php:92 ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page from '%s' to '%s'."
-msgstr "Renommer la page de '%s' à '%s'."
+msgstr "Page renommée de '%s' à '%s'."
 
 #: ../lib/plugin/WikiAdminRename.php:101
 #, php-format

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

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

From: <var...@us...> - 2011-10-03 14:54:24

Revision: 8167
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8167&view=rev
Author:   vargenau
Date:     2011-10-03 14:54:13 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Updated translations

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/ja/LC_MESSAGES/phpwiki.php
    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	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2011-10-03 14:54:13 UTC (rev 8167)
@@ -127,7 +127,6 @@
 $locale["Access denied to change page '%s'."] = "Zugang verweigert um Seite '%s' zu ändern.";
 $locale["Access denied to rename page '%s'."] = "Zugang verweigert um Seite '%s' zu ändern.";
 $locale["Action Page"] = "Aktion Seite";
-$locale["Action page"] = "Aktion Seite";
 $locale["ActionPage"] = "Aktion Seite";
 $locale["Add %s"] = "%s Hinzufügen";
 $locale["Add %s hours to the server's local time when reporting times."] = "Addieren Sie %s Stunden zur lokalen Serverzeit, bei jeder Zeitanzeige (z.B. NeuesteÄnderungen).";
@@ -622,7 +621,6 @@
 $locale["Lock page to enable link"] = "Seite sperren, um den Link zu aktivieren";
 $locale["Locked"] = "Gesperrt";
 $locale["Locking pages"] = "Seiten sperren";
-$locale["Login"] = "Anmelden";
 $locale["MIME file %s"] = "MIME-Datei %s";
 $locale["MISSING"] = "FEHLEND";
 $locale["Make use of the Google API"] = "Benutze die Google API";
@@ -694,7 +692,6 @@
 $locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] = "Beachte: Nur wenn Sie Ihre persönliche HomePage mit dem selben Seitennamen wie Ihre Benutzernamen erzeugen, werden Sie Ihre BenutzerEinstellungen speichern können.";
 $locale["Nothing found"] = "Nichts gefunden";
 $locale["OK"] = "OK";
-$locale["Okay"] = "OK";
 $locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] = "Ihre alte persönliche HomePage %s ohne gespeichertem Passwort wurde mit einem leeren Password gespeichert. Setzen Sie ein Passwort in Ihren BenutzerEinstellungen.";
 $locale["OldStyleTable"] = "TraditionellerTabellenStil";
 $locale["Older page:"] = "Ältere Seite:";
@@ -734,7 +731,7 @@
 $locale["Page Type"] = "Seitentyp";
 $locale["Page Version"] = "Seiten Version";
 $locale["Page change"] = "Seiten Änderung";
-$locale["Page could not be updated. %s doesn't exist!\n"] = "Seite konnte nicht geändert werden. %s existiert nicht!\n";
+$locale["Page could not be updated. %s doesn't exist!"] = "Seite konnte nicht geändert werden. %s existiert nicht!";
 $locale["Page info"] = "Seiten Info";
 $locale["Page names with prefix '%s'"] = "Seitennamen mit dem Anfangswort »%s«";
 $locale["Page names with suffix '%s'"] = "Seitennamen mit Endwort »%s«";
@@ -837,7 +834,6 @@
 $locale["Querying backend directly for '%s'"] = "DB Debug Informationen von der Seite »%s«";
 $locale["Quick Search"] = "SchnellSuche";
 $locale["Random Page"] = "ZufallsSeite";
-$locale["Random page"] = "Zufalls Seite";
 $locale["RandomPage"] = "ZufallsSeite";
 $locale["Rate"] = "Bewerte";
 $locale["Rate It"] = "Bewerte es";
@@ -885,11 +881,9 @@
 $locale["Removing pages"] = "Die Seitenlöschung in diesem Wiki";
 $locale["Rename"] = "Umbenennen";
 $locale["Rename Page"] = "Seite Umbenennen";
-$locale["Rename page"] = "Seite umbenennen";
 $locale["Rename selected pages"] = "Ausgewählte Seiten umbenennen";
 $locale["Rename to"] = "Umbennen zu";
-$locale["Renamed page '%s' to '%s'."] = "Seite '%s' auf '%s' umbenannt.";
-$locale["Renamed page from '%s' to '%s'"] = "Seite '%s' auf '%s' umbenannt.";
+$locale["Renamed page from '%s' to '%s'."] = "Seite '%s' auf '%s' umbenannt.";
 $locale["Replace"] = "Ersetze";
 $locale["Replace all occurences of the given string in the content of all pages."] = "Ersetze alle Wörter in den angegebenen Seiten.";
 $locale["Replace with"] = "Ersetze mit";
@@ -1119,13 +1113,11 @@
 $locale["Upgrade"] = "Updaten";
 $locale["Upload"] = "Hochladen";
 $locale["Upload File"] = "Datei Hochladen";
-$locale["Upload file"] = "Datei Hochladen";
 $locale["Uploading %s"] = "%s wird hochgeladen";
 $locale["Uploading failed."] = "Hochladen fehlgeschlagen.";
 $locale["Uploading zip dumps"] = "Das Hochladen von ZIP-Dumps in diesem Wiki";
 $locale["Use old markup"] = "Alte Formatierungssyntax verwenden";
 $locale["User %s removed page %s"] = "Seite gelöscht %s von Benutzer %s";
-$locale["User Preferences"] = "Benutzer Einstellungen";
 $locale["User not found in LDAP"] = "Benutzer in LDAP nicht gefunden";
 $locale["User page"] = "Benutzer Seite";
 $locale["User preferences for this project"] = "Einstellungen für dieses Projekt";
@@ -1172,7 +1164,7 @@
 $locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Willkommen bei %s!\nIhr E-Mail Konto ist bestätigt und\nwird benutzt, um SeitenÄnderungs Benachrichtigungen per E-Mail zu versenden.\nSiehe %s";
 $locale["What links here"] = "Was verlinkt hierher";
 $locale["Who Is Online"] = "Wer ist Online";
-$locale["Who is online"] = "Wer ist Online";
+$locale["Who is Online"] = "Wer ist Online";
 $locale["WhoIsOnline"] = "WerIstOnline";
 $locale["Width"] = "Breite";
 $locale["Wiki Name"] = "Name des Wikis";
@@ -1285,7 +1277,6 @@
 $locale["incoming"] = "eingehend";
 $locale["individual page permission"] = "individuelles Zugriffsrecht";
 $locale["invalid %s ignored"] = "ungültiges %s ignoriert";
-$locale["invalid argument %s"] = "Ungültiger Parameter %s";
 $locale["latest comment by "] = "Letzter Kommentar von ";
 $locale["load files into this wiki"] = "um Seiten in dieses Wiki zu laden";
 $locale["lock this page"] = "um diese Seite zu sperren";

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	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2011-10-03 14:54:13 UTC (rev 8167)
@@ -345,7 +345,6 @@
 $locale["Purged page '%s' successfully."] = "Página '%s' borrada satisfactoriamente.";
 $locale["Quick Search"] = "Busqueda rápida";
 $locale["Random Page"] = "Página al Azar";
-$locale["Random page"] = "Página al Azar";
 $locale["RandomPage"] = "PáginaAlAzar";
 $locale["Rating"] = "Grados";
 $locale["Recent Changes"] = "Cambios Recientes";
@@ -368,6 +367,7 @@
 $locale["Removed page '%s' successfully."] = "Página '%s' borrada satisfactoriamente.";
 $locale["Removing pages"] = "Borrar páginas";
 $locale["Rename"] = "Retitule";
+$locale["Renamed page from '%s' to '%s'."] = "retitulado de '%s' para '%s'.";
 $locale["Replace"] = "Substituya";
 $locale["Replace with"] = "Substituya por";
 $locale["Reset password of user: "] = "Restablecimiento de la contraseña de usuario: ";
@@ -480,7 +480,6 @@
 $locale["Upload error: unknown error #"] = "Error del upload: error desconocido #";
 $locale["Uploading %s"] = "%s uploading";
 $locale["User %s removed page %s"] = "El usuarios %s eliminado página %s";
-$locale["User Preferences"] = "Usuario Preferencias";
 $locale["User preferences for user %s"] = "Preferencias por usuario '%s'";
 $locale["UserPreferences"] = "UsuarioPreferencias";
 $locale["UserRatings"] = "GradosUsuario.";

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

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-10-03 14:54:13 UTC (rev 8167)
@@ -10,7 +10,7 @@
 $locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d versions par auteur.";
 $locale[" Keep the latest contributions of the last %d authors up to %d days."] = "Garder les dernières contributions des derniers %d auteurs jusqu'à %d jours.";
 $locale[" Keep up to %d minor edits, but keep them no longer than %d days."] = "Garder jusqu'à %d édition mineures, mais pas plus que %d jours.";
-$locale[" Skipped"] = "Ignoré.";
+$locale[" Skipped"] = "Ignoré";
 $locale[" Sorry, cannot merge."] = " Désolé, impossible de fusionner.";
 $locale[" and "] = " et ";
 $locale[" for all pages linking to %s"] = " pour les pages liées à %s.";
@@ -52,7 +52,7 @@
 $locale["%s does not know about the language '%s', using 'en' instead."] = "%s ne connait pas le langage '%s', utilisation de 'en' a la place.";
 $locale["%s has no subpages defined."] = "La page %s n'a aucune sous-page définie.";
 $locale["%s is disallowed on this wiki."] = "L'action %s est interdite sur ce wiki.";
-$locale["%s is empty"] = "%s est vide.";
+$locale["%s is empty"] = "%s est vide";
 $locale["%s is empty."] = "%s est vide.";
 $locale["%s is missing"] = "%s est manquant";
 $locale["%s is not locked!"] = "%s n'est pas verrouillé!";
@@ -75,9 +75,9 @@
 $locale["%s: argument index out of range"] = "%s : index d'argument hors intervalle";
 $locale["%s: error while handling error:"] = "%s : erreur pendant la gestion de l'erreur :";
 $locale["%s: file not found"] = "%s : fichier non trouvé";
-$locale["%s: no such class"] = "<%s : pas de section de ce type>";
+$locale["%s: no such class"] = "%s : classe inexistante";
 $locale["%s: no such revision %d."] = "%s(%d) : version inexistante";
-$locale["%s: not a subclass of WikiPlugin."] = "%s n'est pas une sous classe de WikiPlugin.";
+$locale["%s: not a subclass of WikiPlugin."] = "%s n'est pas une sous-classe de WikiPlugin.";
 $locale["%s: not defined"] = "%s : non défini";
 $locale["' in page name."] = "' dans le nom de la page.";
 $locale["'%s': Bad page name"] = "'%s' : nom de page non valide";
@@ -128,7 +128,6 @@
 $locale["Access denied to rename page '%s'."] = "Accès refusé pour renommer la page '%s'.";
 $locale["Access for you is forbidden to %s."] = "L'accès à %s vous est interdit.";
 $locale["Action Page"] = "Page d'action";
-$locale["Action page"] = "Page d'action";
 $locale["Add %s"] = "Ajouter %s";
 $locale["Add %s hours to the server's local time when reporting times."] = "Ajouter %s heures à l'heure locale du serveur pour afficher les horodatages.";
 $locale["Add Comment"] = "Ajouter un commentaire";
@@ -171,7 +170,7 @@
 $locale["Approve"] = "Approuver";
 $locale["Archives"] = "Archives";
 $locale["Are you sure you want to change the owner of the selected pages?"] = "Êtes-vous sûr de vouloir changer le propriétaire des pages sélectionnées ?";
-$locale["Are you sure you want to permanently change access rights to the selected files?"] = "Ëtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers sélectionnés ?";
+$locale["Are you sure you want to permanently change access rights to the selected files?"] = "Êtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers sélectionnés ?";
 $locale["Are you sure you want to permanently change the selected files?"] = "Êtes-vous sûr de vouloir modifier de manière permanente les fichiers sélectionnés ?";
 $locale["Are you sure you want to permanently purge the following files?"] = "Êtes-vous sûr de vouloir purger définitivement les pages suivantes ?";
 $locale["Are you sure you want to remove the selected files?"] = "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?";
@@ -382,7 +381,7 @@
 $locale["E-mail address '%s' is properly formatted"] = "L'adresse électronique '%s' semble être bien formée.";
 $locale["E-mail address confirmation"] = "Vérification de l'adresse électronique";
 $locale["ERROR uploading '%s'"] = "ERREUR en déposant '%s' : ";
-$locale["ERROR: No email defined! You need to do this in your "] = "ERREUR : pas d'adresse électronique definie! Vous devez le faire dans vos ";
+$locale["ERROR: No email defined! You need to do this in your "] = "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos ";
 $locale["Easy navigation buttons for %s"] = "Boutons de navigation rapide pour %s";
 $locale["Edit"] = "Modifier";
 $locale["Edit %s"] = "Éditer %s";
@@ -399,8 +398,8 @@
 $locale["Editing pages"] = "Modifier des pages";
 $locale["Either %s is missing or DATABASE_TYPE != '%s'"] = "%s est manquant ou DATABASE_TYPE != '%s'";
 $locale["Elapsed time: %s s"] = "Temps écoulé : %s s";
-$locale["Email not yet verified."] = "Adresse électronique pas encore vérifiée";
-$locale["Email verified."] = "Adresse électronique vérifiée";
+$locale["Email not yet verified."] = "Adresse électronique pas encore vérifiée.";
+$locale["Email verified."] = "Adresse électronique vérifiée.";
 $locale["Embed hidden comments in WikiPages."] = "Cacher des commentaires dans une PageWiki.";
 $locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu.";
 $locale["Empty link to: %s"] = "Lien vide vers : %s";
@@ -561,7 +560,7 @@
 $locale["InterWikiSearch"] = "RechercheInterWiki";
 $locale["Invalid ACL"] = "ACL invalide";
 $locale["Invalid [] syntax ignored"] = "Syntaxe [] invalide ignorée";
-$locale["Invalid argument %s"] = "Argument non valable : %s";
+$locale["Invalid argument %s"] = "Argument non valable %s";
 $locale["Invalid argument: %s=%s"] = "Argument non valable : %s=%s";
 $locale["Invalid attribute %s=%s for image %s"] = "Attribut non valable %s=%s pour l'image %s";
 $locale["Invalid chmod string"] = "Chaîne de caractère invalide pour le changement de mode";
@@ -598,7 +597,6 @@
 $locale["Link"] = "Lien";
 $locale["Link to page"] = "Lien vers une page";
 $locale["LinkDatabase"] = "LiensDatabase";
-$locale["LinkSearch"] = "RechercheLive";
 $locale["Links"] = "Liens";
 $locale["List"] = "Liste";
 $locale["List PageHistory for %s"] = "Historique de %s";
@@ -633,7 +631,6 @@
 $locale["Lock Page"] = "Verrouiller la page";
 $locale["Locked"] = "Verrouillé";
 $locale["Locking pages"] = "Verrouiller des pages";
-$locale["Login"] = "S'identifier";
 $locale["Logout"] = "Déconnexion";
 $locale["MIME file %s"] = "fichier MIME %s";
 $locale["MISSING"] = "MANQUANT";
@@ -642,7 +639,7 @@
 $locale["Make the page external?"] = "Rendre la page externe ?";
 $locale["Make the page public?"] = "Rendre la page publique ?";
 $locale["Make the page read-only?"] = "Rendre la page non modifiable ?";
-$locale["Make use of the Google API"] = "Faire usage de l'API Google";
+$locale["Make use of the Google API"] = "Utiliser l'API Google";
 $locale["Markup"] = "Syntaxe";
 $locale["Markup cache purged!"] = "Cache de marques purgé !";
 $locale["Members:"] = "Membres :";
@@ -719,7 +716,6 @@
 $locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] = "Note: Vous pourrez enregistrer vos PréférencesUtilisateurs uniquement si vous créez votre propre page d'accueil portant le nom de votre identifiant.";
 $locale["Nothing found"] = "Aucun résultat";
 $locale["OK"] = "OK";
-$locale["Okay"] = "OK";
 $locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] = "L'ancienne page %s sans mot de passe attribué a été mise à jour avec un mot de passe vide. Définissez un mot de passe dans vos PréférencesUtilisateurs.";
 $locale["Old and new pages"] = "Pages anciennes et nouvelles";
 $locale["OldStyleTable"] = "TableauAncienStyle";
@@ -756,7 +752,7 @@
 $locale["Page Info"] = "Infos sur la page";
 $locale["Page Locked"] = "Page verrouillée";
 $locale["Page Name"] = "Nom de la page";
-$locale["Page Trail"] = "File d'Ariane";
+$locale["Page Trail"] = "Fil d'Ariane";
 $locale["Page Type"] = "Type de page";
 $locale["Page Version"] = "Version de la page";
 $locale["Page change"] = "Modification de la page";
@@ -867,7 +863,6 @@
 $locale["Querying backend directly for '%s'"] = "Requête directe au backend pour « %s »";
 $locale["Quick Search"] = "Recherche rapide";
 $locale["Random Page"] = "Une page au hasard";
-$locale["Random page"] = "Une page au hasard";
 $locale["RandomPage"] = "PageAléatoire";
 $locale["Rate"] = "Note";
 $locale["Rate It"] = "Notez-la";
@@ -918,11 +913,9 @@
 $locale["Removing pages"] = "Supprimer les pages";
 $locale["Rename"] = "Renommer";
 $locale["Rename Page"] = "Renommer la page";
-$locale["Rename page"] = "Renommer la page";
 $locale["Rename selected pages"] = "Renommer les pages sélectionnées";
 $locale["Rename to"] = "Renommer en";
-$locale["Renamed page '%s' to '%s'."] = "Page '%s' renommée en '%s'.";
-$locale["Renamed page from '%s' to '%s'"] = "Renommer la page de '%s' à '%s'";
+$locale["Renamed page from '%s' to '%s'."] = "Renommer la page de '%s' à '%s'.";
 $locale["Replace"] = "Remplacer";
 $locale["Replace with"] = "Remplacer par";
 $locale["Replaced '%s' with '%s' in page '%s'."] = "%s a bien été modifié par %s dans la page %s.";
@@ -1000,12 +993,12 @@
 $locale["Skipping"] = "Ignoré";
 $locale["Some internal editing error"] = "Erreur interne pendant la modification";
 $locale["Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save."] = "Certaines modifications n'ont pas pu être combinées automatiquement. Veuillez regarder les sections commençant par « %s », et se terminant par « %s ». Vous devrez éditer ces sections à la main avant de cliquer sur Enregistrer.";
-$locale["Someone has edited the page!"] = "Quelqu'un a édité la page !";
+$locale["Someone has edited the page!"] = "Quelqu'un a modifié la page !";
 $locale["Sorry but this file is too big."] = "Désolé, mais le fichier est trop gros.";
 $locale["Sorry for the inconvenience."] = "Désolé pour la gêne occasionnée.";
 $locale["Sorry! You must wait at least 20 minutes until you can vote again!"] = "Désolé, vous devez attendre au moins 20 minutes avant de pouvoir revoter !";
 $locale["Sorry, no dynamic DB Session support."] = "Désolé, Session dynamique non supportées.";
-$locale["Sorry, this page does not exist."] = "Désolé, cette page n'existe pas";
+$locale["Sorry, this page does not exist."] = "Désolé, cette page n'existe pas.";
 $locale["Sorry, this version of PHP cannot create PNG image files."] = "Désolé, cette version de PHP ne peut pas créer des fichiers d'image PNG.";
 $locale["Sorry. Access Restrictions not yet implemented"] = "Désolé. Restriction d'accès pas encore disponible";
 $locale["Sort by %s"] = "Trier par %s";
@@ -1156,7 +1149,6 @@
 $locale["Upload"] = "Téléchargé";
 $locale["Upload File"] = "Déposer un fichier";
 $locale["Upload error: file only partially received"] = "Erreur : le fichier n'a été que partiellement transmis";
-$locale["Upload file"] = "Déposer un fichier";
 $locale["Upload files to the local InterWiki Upload:<filename>"] = "Transférer les fichiers vers Upload:<filename>";
 $locale["Upload images or media files"] = "Déposer des images ou des médias";
 $locale["Uploading %s"] = "Téléchargement de %s";
@@ -1164,7 +1156,6 @@
 $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"] = "Mes préférences";
 $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";
@@ -1216,7 +1207,7 @@
 $locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Bienvenue sur %s!\nVotre compte email a été vérifié et\nsera utilisé pour les notifications de changements de pages.\nVoir %s";
 $locale["What links here"] = "Pages liées";
 $locale["Who Is Online"] = "Qui est en ligne";
-$locale["Who is online"] = "Qui est en ligne";
+$locale["Who is Online"] = "Qui est en ligne";
 $locale["WhoIsOnline"] = "QuiEstEnLigne";
 $locale["Width"] = "Largeur";
 $locale["Wiki Admin"] = "Administration du wiki";
@@ -1251,10 +1242,10 @@
 $locale["You must be an administrator to use this plugin."] = "Vous devez être un administrateur pour utiliser ce plugin.";
 $locale["You must be logged in to view ratings."] = "Vous devez vous identifier pour voir les évaluations.";
 $locale["You must sign in to %s."] = "Vous devez vous inscrire pour %s.";
-$locale["You must sign in to watch pages."] = "Vous devez vous identifier pour surveiller des pages";
+$locale["You must sign in to watch pages."] = "Vous devez vous identifier pour surveiller des pages.";
 $locale["You must specify a directory to dump to"] = "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde";
 $locale["You stored an empty password in your '%s' page."] = "Vous n'avez pas saisi de mot de passe pour la page %s.";
-$locale["Your E-Mail"] = "Adresse électronique";
+$locale["Your E-Mail"] = "Votre adresse électronique";
 $locale["Your PHP version is too old. You must have at least PHP 4.3.9"] = "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 4.3.9";
 $locale["Your UserPreferences have been successfully reset to default."] = "Vos préférences ont été réinitialisées avec succès";
 $locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Votre choix '%s' de WikiDB DB ne peut pas être utilisé pour DbSession.";
@@ -1322,7 +1313,6 @@
 $locale["incoming"] = "entrant";
 $locale["individual page permission"] = "permission de page individuelle";
 $locale["invalid %s ignored"] = "%s non valable ignoré";
-$locale["invalid argument %s"] = "Argument non valable : %s";
 $locale["keep old"] = "garder l'ancien";
 $locale["latest comment by "] = "dernier commentaire par ";
 $locale["load files into this wiki"] = "importer des fichiers dans ce wiki";

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	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2011-10-03 14:54:13 UTC (rev 8167)
@@ -193,6 +193,7 @@
 $locale["Remove this page"] = "Rimuovi la pagina";
 $locale["Removed page '%s' successfully."] = "La pagina '%s' è stata rimossa correttamente.";
 $locale["Removing pages"] = "Rimuovi la pagina";
+$locale["Renamed page from '%s' to '%s'."] = "Cambia titolo %s a %s";
 $locale["Reset Preferences"] = "Ripristina Preferenze";
 $locale["Restore Anyway"] = "Restore Comunque";
 $locale["Revert"] = "Ritorni";
@@ -239,7 +240,6 @@
 $locale["Unlock Page"] = "Sblocca la Pagina";
 $locale["Unlocking pages"] = "Sblocca la Pagina";
 $locale["User %s removed page %s"] = "Utente %s pagina %s rimossa";
-$locale["User Preferences"] = "Utente Preferenze";
 $locale["User not found in LDAP"] = "Utente non trovato in LDAP";
 $locale["User preferences for this project"] = "Utente Preferenze per questo progetto";
 $locale["User preferences for user %s"] = "Preferenze per l'utente %s";

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

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/ja/LC_MESSAGES/phpwiki.php	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php	2011-10-03 14:54:13 UTC (rev 8167)
@@ -13,7 +13,6 @@
 $locale["<none>"] = "<なし>";
 $locale["<system language>"] = "<システム言語>";
 $locale["<system theme>"] = "<システムテーマ>";
-$locale["Action page"] = "操作ページ";
 $locale["Add %s"] = "ヒット数";
 $locale["Adjust"] = "調整";
 $locale["Admin"] = "管理";
@@ -106,7 +105,6 @@
 $locale["Lock Page"] = "ページロック";
 $locale["Locked"] = "ロックしました";
 $locale["Locking pages"] = "ページをロック中です。";
-$locale["Login"] = "ログイン";
 $locale["MIME file %s"] = "MIMEファイル %s";
 $locale["Markup"] = "マークアップ";
 $locale["Markup cache purged!"] = "マークアップキャッシュを破棄しました!";
@@ -120,7 +118,6 @@
 $locale["No revisions found"] = "リビジョンが見つかりません。";
 $locale["None"] = "なし";
 $locale["Note:"] = "ノート:";
-$locale["Okay"] = "おっけー";
 $locale["OldStyleTable"] = "旧スタイルのテーブル";
 $locale["PHP syntax highlighting"] = "PHP構文ハイライト";
 $locale["Page Locked"] = "ページをロックしました。";
@@ -203,7 +200,6 @@
 $locale["Update Preferences"] = "設定を更新しました";
 $locale["Upload"] = "アップロード";
 $locale["Upload File"] = "ファイル読込み";
-$locale["Upload file"] = "ファイル読込み";
 $locale["Uploading %s"] = "%s をアップロード中です。";
 $locale["Use old markup"] = "古いマークアップを使用";
 $locale["User page"] = "ユーザーページ";

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	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php	2011-10-03 14:54:13 UTC (rev 8167)
@@ -117,7 +117,6 @@
 $locale["TitleSearch"] = "TitelZoek";
 $locale["Unlock Page"] = "Sluit Pagina Af";
 $locale["Update Preferences"] = "Zet Voorkeuren";
-$locale["User Preferences"] = "Gebruikers Voorkeuren";
 $locale["UserPreferences"] = "GebruikersVoorkeuren";
 $locale["Version"] = "Versie";
 $locale["Version "] = "Versie ";

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/po/de.po	2011-10-03 14:54:13 UTC (rev 8167)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 14:48+0200\n"
+"POT-Creation-Date: 2011-10-03 16:52+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -531,13 +531,13 @@
 
 #: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
 #: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
-#: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
-#: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
-#: ../lib/upgrade.php:543 ../lib/upgrade.php:546 ../lib/upgrade.php:578
-#: ../lib/upgrade.php:580 ../lib/upgrade.php:607 ../lib/upgrade.php:667
-#: ../lib/upgrade.php:692 ../lib/upgrade.php:835 ../lib/upgrade.php:838
-#: ../lib/upgrade.php:905
+#: ../lib/plugin/WikiPoll.php:220 ../lib/stdlib.php:1953
+#: ../lib/upgrade.php:195 ../lib/upgrade.php:398 ../lib/upgrade.php:412
+#: ../lib/upgrade.php:432 ../lib/upgrade.php:441 ../lib/upgrade.php:465
+#: ../lib/upgrade.php:493 ../lib/upgrade.php:543 ../lib/upgrade.php:546
+#: ../lib/upgrade.php:578 ../lib/upgrade.php:580 ../lib/upgrade.php:607
+#: ../lib/upgrade.php:667 ../lib/upgrade.php:692 ../lib/upgrade.php:835
+#: ../lib/upgrade.php:838 ../lib/upgrade.php:905
 msgid "OK"
 msgstr "OK"
 
@@ -754,6 +754,8 @@
 msgstr "Wiki Seiten als Dateien in lokales Verzeichnis speichern"
 
 #: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
+#: ../themes/MonoBook/templates/navbar.tmpl:61
+#: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "Upload File"
 msgstr "Datei Hochladen"
 
@@ -1989,8 +1991,8 @@
 
 #: ../lib/plugin/AppendText.php:89
 #, php-format
-msgid "Page could not be updated. %s doesn't exist!\n"
-msgstr "Seite konnte nicht geändert werden. %s existiert nicht!\n"
+msgid "Page could not be updated. %s doesn't exist!"
+msgstr "Seite konnte nicht geändert werden. %s existiert nicht!"
 
 #: ../lib/plugin/AppendText.php:123
 #, php-format
@@ -2693,9 +2695,12 @@
 msgid "%s parameter missing"
 msgstr "%s Argument fehlt"
 
-#: ../lib/plugin/GoogleMaps.php:103
+#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
+#: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
+#: ../lib/plugin/YouTube.php:136
 #, php-format
-msgid "invalid argument %s"
+msgid "Invalid argument %s"
 msgstr "Ungültiger Parameter %s"
 
 #: ../lib/plugin/GoogleMaps.php:123
@@ -5225,7 +5230,7 @@
 msgstr "Zeige Überblick über alle aktuellen Benutzersessions."
 
 #: ../lib/plugin/WhoIsOnline.php:75
-msgid "Who is online"
+msgid "Who is Online"
 msgstr "Wer ist Online"
 
 #: ../lib/plugin/WhoIsOnline.php:78
@@ -5550,9 +5555,9 @@
 msgid "Access denied to rename page '%s'."
 msgstr "Zugang verweigert um Seite '%s' zu ändern."
 
-#: ../lib/plugin/WikiAdminRename.php:92
+#: ../lib/plugin/WikiAdminRename.php:92 ../lib/plugin/WikiAdminRename.php:107
 #, php-format
-msgid "Renamed page from '%s' to '%s'"
+msgid "Renamed page from '%s' to '%s'."
 msgstr "Seite '%s' auf '%s' umbenannt."
 
 #: ../lib/plugin/WikiAdminRename.php:101
@@ -5560,11 +5565,6 @@
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:107
-#, php-format
-msgid "Renamed page '%s' to '%s'."
-msgstr "Seite '%s' auf '%s' umbenannt."
-
 #: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
@@ -5593,8 +5593,9 @@
 "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
 
 #: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
-msgid "Rename page"
-msgstr "Seite umbenennen"
+#: ../lib/WikiTheme.php:1034
+msgid "Rename Page"
+msgstr "Seite Umbenennen"
 
 #: ../lib/plugin/WikiAdminRename.php:225
 msgid "Select the pages to rename:"
@@ -5974,6 +5975,7 @@
 #: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/MonoBook/templates/signin.tmpl:19
+#: ../themes/Sidebar/templates/signin.tmpl:17
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Anmelden"
@@ -6308,13 +6310,6 @@
 msgid "Required argument %s missing"
 msgstr "Erforderliches Argument »%s« fehlt"
 
-#: ../lib/plugin/YouTube.php:104 ../lib/plugin/YouTube.php:106
-#: ../lib/plugin/YouTube.php:108 ../lib/plugin/YouTube.php:110
-#: ../lib/plugin/YouTube.php:134 ../lib/plugin/YouTube.php:136
-#, php-format
-msgid "Invalid argument %s"
-msgstr "Ungültiger Parameter %s"
-
 #: ../lib/purgepage.php:18 ../lib/removepage.php:18
 msgid "Sorry, this page does not exist."
 msgstr "Leider, diese Seite ist nicht in der Datenbank."
@@ -6520,10 +6515,6 @@
 msgid "Unable to open directory '%s' for reading"
 msgstr "Konnte Verzeichnis »%s« nicht zum Lesen öffnen"
 
-#: ../lib/stdlib.php:1953
-msgid "Okay"
-msgstr "OK"
-
 #: ../lib/stdlib.php:2138 ../lib/stdlib.php:2151
 #, php-format
 msgid "... (first %s words)"
@@ -7055,10 +7046,6 @@
 msgid "Sign Out"
 msgstr "Abmelden"
 
-#: ../lib/WikiTheme.php:1034
-msgid "Rename Page"
-msgstr "Seite Umbenennen"
-
 #: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Seite Sperren"
@@ -8004,8 +7991,10 @@
 msgstr "Benutzer Seite"
 
 #: ../themes/default/templates/info.tmpl:153
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/info.tmpl:159
-msgid "Action page"
+msgid "Action Page"
 msgstr "Aktion Seite"
 
 #: ../themes/default/templates/info.tmpl:156
@@ -8488,11 +8477,6 @@
 
 #: ../themes/fusionforge/templates/actionbar.tmpl:20
 #: ../themes/fusionforge/templates/actionbar.tmpl:40
-msgid "Action Page"
-msgstr "Aktion Seite"
-
-#: ../themes/fusionforge/templates/actionbar.tmpl:20
-#: ../themes/fusionforge/templates/actionbar.tmpl:40
 msgid "Page"
 msgstr "Seite"
 
@@ -8578,6 +8562,7 @@
 
 #: ../themes/fusionforge/templates/navbar.tmpl:14
 #: ../themes/fusionforge/templates/userprefs.tmpl:294
+#: ../themes/MonoBook/templates/navbar.tmpl:20
 msgid "Random Page"
 msgstr "ZufallsSeite"
 
@@ -8598,8 +8583,9 @@
 msgstr "Meine Benutzer Seite"
 
 #: ../themes/fusionforge/templates/navbar.tmpl:27
-msgid "User Preferences"
-msgstr "Benutzer Einstellungen"
+#: ../themes/MonoBook/templates/signin.tmpl:11
+msgid "My Preferences"
+msgstr "Meine Voreinstellungen"
 
 #: ../themes/fusionforge/templates/userprefs.tmpl:189
 msgid "User preferences for this project"
@@ -8730,10 +8716,6 @@
 msgid "Like pages"
 msgstr "Ähnliche Seiten"
 
-#: ../themes/MonoBook/templates/navbar.tmpl:20
-msgid "Random page"
-msgstr "Zufalls Seite"
-
 #: ../themes/MonoBook/templates/navbar.tmpl:30
 msgid "Find page"
 msgstr "Seite finden"
@@ -8763,11 +8745,6 @@
 
 #: ../themes/MonoBook/templates/navbar.tmpl:61
 #: ../themes/Sidebar/templates/navbar.tmpl:51
-msgid "Upload file"
-msgstr "Datei Hochladen"
-
-#: ../themes/MonoBook/templates/navbar.tmpl:61
-#: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "Upload images or media files"
 msgstr ""
 
@@ -8787,10 +8764,6 @@
 msgid "My Discussion"
 msgstr "Meine Diskussion"
 
-#: ../themes/MonoBook/templates/signin.tmpl:11
-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").
@@ -8864,10 +8837,6 @@
 msgid "Search term(s)"
 msgstr ""
 
-#: ../themes/Sidebar/templates/signin.tmpl:17
-msgid "Login"
-msgstr "Anmelden"
-
 #: ../themes/Sidebar/templates/signin.tmpl:19
 msgid "Login required..."
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2011-10-03 14:49:15 UTC (rev 8166)
+++ trunk/locale/po/es.po	2011-10-03 14:54:13 UTC (rev 8167)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-03 14:48+0200\n"
+"POT-Creation-Date: 2011-10-03 16:52+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -36,7 +36,6 @@
 msgid "Attribute %s, value: %s"
 msgstr ""
 
-# lib/msql.php:221 lib/msql.php:296
 #: ../lib/CachedMarkup.php:577
 #, php-format
 msgid "Relation %s to page %s"
@@ -109,7 +108,6 @@
 msgid "version %d"
 msgstr "versión %d"
 
-# lib/pageinfo.php:70
 #: ../lib/diff.php:244 ../lib/plugin/Diff.php:106
 msgid "current version"
 msgstr "versión actual"
@@ -187,7 +185,6 @@
 msgid "LinkDatabase"
 msgstr ""
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/display.php:170 ../lib/display.php:405 ../lib/loadsave.php:1579
 #: ../lib/plugin/RecentChanges.php:62 ../lib/plugin/RecentChanges.php:210
 #: ../lib/plugin/RecentChanges.php:217 ../lib/plugin/RecentChanges.php:393
@@ -235,7 +232,6 @@
 msgid "BackLinks for %s"
 msgstr "AcoplamientosTraseros por %s"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/display.php:294
 #, php-format
 msgid "(Redirected from %s)"
@@ -250,7 +246,6 @@
 msgid "SandBox"
 msgstr "CajaDeArena"
 
-# lib/pageinfo.php:70
 #: ../lib/editpage.php:163 ../lib/editpage.php:584
 msgid "Your version"
 msgstr "Versión actual:"
@@ -462,7 +457,6 @@
 msgid "Save"
 msgstr "Guardar"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/editpage.php:709
 msgid "Changes"
 msgstr "Cambios"
@@ -499,7 +493,6 @@
 msgid "Undo"
 msgstr "Deshaga"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/EditToolbar.php:50
 msgid "Undo disabled"
 msgstr "Deshaga lisiado"
@@ -522,7 +515,6 @@
 msgid "Search & Replace"
 msgstr "Busque Y Substituya"
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/EditToolbar.php:55
 msgid "Search for"
 msgstr "Buscar"
@@ -533,13 +525,13 @@
 
 #: ../lib/EditToolbar.php:57 ../lib/plugin/SyncWiki.php:299
 #: ../lib/plugin/SyncWiki.php:325 ../lib/plugin/SyncWiki.php:348
-#: ../lib/plugin/WikiPoll.php:220 ../lib/upgrade.php:195
-#: ../lib/upgrade.php:398 ../lib/upgrade.php:412 ../lib/upgrade.php:432
-#: ../lib/upgrade.php:441 ../lib/upgrade.php:465 ../lib/upgrade.php:493
-#: ../lib/upgrade.php:543 ../lib/upgrade.php:546 ../lib/upgrade.php:578
-#: ../lib/upgrade.php:580 ../lib/upgrade.php:607 ../lib/upgrade.php:667
-#: ../lib/upgrade.php:692 ../lib/upgrade.php:835 ../lib/upgrade.php:838
-#: ../lib/upgrade.php:905
+#: ../lib/plugin/WikiPoll.php:220 ../lib/stdlib.php:1953
+#: ../lib/upgrade.php:195 ../lib/upgrade.php:398 ../lib/upgrade.php:412
+#: ../lib/upgrade.php:432 ../lib/upgrade.php:441 ../lib/upgrade.php:465
+#: ../lib/upgrade.php:493 ../lib/upgrade.php:543 ../lib/upgrade.php:546
+#: ../lib/upgrade.php:578 ../lib/upgrade.php:580 ../lib/upgrade.php:607
+#: ../lib/upgrade.php:667 ../lib/upgrade.php:692 ../lib/upgrade.php:835
+#: ../lib/upgrade.php:838 ../lib/upgrade.php:905
 msgid "OK"
 msgstr ""
 
@@ -613,7 +605,6 @@
 msgid "Ignore wiki formatting"
 msgstr "No haga caso del formato del wiki"
 
-# lib/pageinfo.php:70
 #: ../lib/EditToolbar.php:166
 msgid "Your signature"
 msgstr "Su firma"
@@ -644,7 +635,6 @@
 msgid "Page Name"
 msgstr "Nombre de la Página"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/EditToolbar.php:196 ../themes/default/templates/redirect.tmpl:17
 #: ../themes/default/templates/redirect.tmpl:40
 msgid "Redirect"
@@ -667,7 +657,6 @@
 msgid "Undo Search & Replace"
 msgstr "Deshaga La Búsqueda Y Substitúyala"
 
-# lib/diff.php:997
 #: ../lib/EditToolbar.php:316 ../lib/EditToolbar.php:319
 msgid "Insert Categories"
 msgstr ""
@@ -708,7 +697,6 @@
 msgid "%s: file not found"
 msgstr "%s: fichero no encontrado"
 
-# lib/diff.php:997
 #: ../lib/IniConfig.php:993
 msgid "CategoryGroup"
 msgstr "GrupoCategoría"
@@ -759,6 +747,8 @@
 msgstr "Descarga al directorio"
 
 #: ../lib/loadsave.php:75 ../themes/fusionforge/templates/navbar.tmpl:19
+#: ../themes/MonoBook/templates/navbar.tmpl:61
+#: ../themes/Sidebar/templates/navbar.tmpl:51
 msgid "Upload File"
 msgstr "Archivo Del Upload"
 
@@ -878,14 +868,12 @@
 msgid "%s bytes written"
 msgstr "%s octetos"
 
-# lib/editpage.php:19
 #: ../lib/loadsave.php:684 ../lib/loadsave.php:761 ../lib/loadsave.php:796
 #: ../lib/loadsave.php:826
 #, php-format
 msgid "... copied to %s"
 msgstr "... copia de [%s]"
 
-# lib/editpage.php:19
 #: ../lib/loadsave.php:687 ../lib/loadsave.php:763 ../lib/loadsave.php:798
 #: ../lib/loadsave.php:828
 #, php-format
@@ -900,7 +888,6 @@
 msgid "... not found"
 msgstr "... no encontrado"
 
-# lib/pageinfo.php:9
 #: ../lib/loadsave.php:897
 msgid "Empty pagename!"
 msgstr "¡Escriba un nombre de página!"
@@ -983,7 +970,6 @@
 msgid " Sorry, cannot merge."
 msgstr " Apesadumbrado, no puede combinarse."
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/loadsave.php:1077 ../lib/loadsave.php:1087 ../lib/loadsave.php:1094
 #: ../lib/loadsave.php:1101 ../themes/default/templates/actionbar.tmpl:31
 #: ../themes/fusionforge/templates/actionbar.tmpl:77
@@ -1046,7 +1032,6 @@
 msgid "revert to version %d"
 msgstr "invierta a la versión %d"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/loadsave.php:1134
 #, php-format
 msgid "Revert: %s"
@@ -1113,13 +1098,11 @@
 msgid "sent to %s"
 msgstr ""
 
-# lib/msql.php:29 lib/mysql.php:36
 #: ../lib/MailNotify.php:235
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/MailNotify.php:257
 msgid "Page change"
 msgstr "Cambio de la página"
@@ -1281,7 +1264,6 @@
 msgid "upload a zip dump"
 msgstr "para upload una descarga del cierre relámpago"
 
-# lib/pageinfo.php:70
 #: ../lib/main.php:573
 msgid "verify the current action"
 msgstr "para verificar la acción actual"
@@ -1362,7 +1344,6 @@
 msgid "Uploading zip dumps"
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../lib/main.php:615
 msgid "Verify the current action"
 msgstr ""
@@ -1448,13 +1429,11 @@
 msgid "PageDump"
 msgstr "DescargeDeLaPágina"
 
-# lib/fullsearch.php:48
 #: ../lib/main.php:1123 ../lib/plugin/FullTextSearch.php:46
 #: ../lib/plugin/WantedPagesOld.php:126
 msgid "FullTextSearch"
 msgstr "BúsquedaDelTexto"
 
-# lib/fullsearch.php:48
 #: ../lib/main.php:1131 ../lib/plugin/RecentChanges.php:808
 #: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1475
 #: ../themes/Crao/templates/navbar.tmpl:5
@@ -1509,7 +1488,6 @@
 msgid "Sort by %s"
 msgstr "Clase por %s"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/PageList.php:120
 msgid "reverse"
 msgstr "invierta"
@@ -1788,13 +1766,11 @@
 msgid "AddComment"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/AddComment.php:43
 #, php-format
 msgid "Show and add comments for %s"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/AddComment.php:73 ../lib/plugin/WikiForum.php:71
 msgid "No pagename specified"
 msgstr ""
@@ -1991,7 +1967,7 @@
 
 #: ../lib/plugin/AppendText.php:89
 #, php-format
-msgid "Page could not be updated. %s doesn't exist!\n"
+msgid "Page could not be updated. %s doesn't exist!"
 msgstr ""
 
 #: ../lib/plugin/AppendText.php:123
@@ -2032,7 +2008,6 @@
 msgid "Atom Aggregator Plugin"
 msgstr ""
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../lib/plugin/_AuthInfo.php:35
 msgid "AuthInfo"
 msgstr ""
@@ -2265,7 +2240,6 @@
 msgid "Wk"
 msgstr ""
 
-# lib/diff.php:997
 #: ../lib/plugin/CategoryPage.php:44
 msgid "CategoryPage"
 msgstr "CategoríaPágina"
@@ -2354,7 +2328,6 @@
 msgid "Create a Table of Contents and automatically link to headers"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/CreateToc.php:378 ../lib/plugin/Template.php:108
 msgid "No page specified."
 msgstr ""
@@ -2483,7 +2456,6 @@
 msgid "Requires WikiAdmin privileges to edit."
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/ExternalSearch.php:40
 msgid "ExternalSearch"
 msgstr ""
@@ -2503,7 +2475,6 @@
 "reference/plugins/like"
 msgstr ""
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../lib/plugin/FileInfo.php:40
 msgid "FileInfo"
 msgstr ""
@@ -2565,7 +2536,6 @@
 msgid "foaf must be a URI starting with http://"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/FoafViewer.php:142
 msgid "Title"
 msgstr ""
@@ -2591,7 +2561,6 @@
 msgid "Plugin not run: not in browse mode"
 msgstr ""
 
-# lib/msql.php:221 lib/msql.php:296
 #: ../lib/plugin/FrameInclude.php:89 ../lib/plugin/Template.php:123
 #, php-format
 msgid "Recursive inclusion of page %s"
@@ -2688,9 +2657,12 @@
 msgid "%s parameter missing"
 msgstr ""
 
-#: ../lib/plugin/GoogleMaps.php:103
+#: ../lib/plugin/GoogleMaps.php:103 ../lib/plugin/YouTube.php:104
+#: ../lib/plugin/YouTube.php:106 ../lib/plugin/YouTube.php:108
+#: ../lib/plugin/YouTube.php:110 ../lib/plugin/YouTube.php:134
+#: ../lib/plugin/YouTube.php:136
 #, php-format
-msgid "invalid argument %s"
+msgid "Invalid argument %s"
 msgstr ""
 
 #: ../lib/plugin/GoogleMaps.php:123
@@ -2705,12 +2677,10 @@
 msgid "Make use of the Google API"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/GooglePlugin.php:93
 msgid "Nothing found"
 msgstr ""
 
-# lib/pageinfo.php:10 lib/stdlib.php:239
 #: ../lib/plugin/GoTo.php:37
 msgid "GoTo"
 msgstr ""
@@ -2719,7 +2689,6 @@
 msgid "Go to or create page."
 msgstr ""
 
-# lib/pageinfo.php:10 lib/stdlib.php:239
 #: ../lib/plugin/GoTo.php:78 ../lib/plugin/WikiAdminSelect.php:130
 #: ../lib/plugin/WikiAdminSelect.php:141
 #: ../themes/MonoBook/templates/navbar.tmpl:33
@@ -2743,7 +2712,6 @@
 msgid "No dot graph given"
 msgstr ""
 
-# lib/msql.php:29 lib/mysql.php:36
 #: ../lib/plugin/GraphViz.php:278 ../lib/plugin/GraphViz.php:286
 #: ../lib/plugin/SpellCheck.php:139 ../lib/plugin/SyntaxHighlighter.php:142
 #, php-format
@@ -2822,13 +2790,11 @@
 msgid "Error: rev must be a positive integer."
 msgstr ""
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/IncludePage.php:157
 #, php-format
 msgid "Included from %s (revision %d)"
 msgstr "Inserción de '%s' (revisión %d)"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/IncludePage.php:159
 #, php-format
 msgid "Included from %s"
@@ -2860,12 +2826,10 @@
 msgid "IncludeTree"
 msgstr ""
 
-# lib/diff.php:997
 #: ../lib/plugin/IncludeTree.php:43
 msgid "Dynamic Category Tree"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/InterWikiSearch.php:31
 msgid "InterWikiSearch"
 msgstr "InterWikiBúsqueda"
@@ -2878,7 +2842,6 @@
 msgid "Wiki Name"
 msgstr "Nombre de la Wiki"
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/plugin/InterWikiSearch.php:88 ../lib/plugin/RecentChanges.php:805
 #: ../lib/plugin/SemanticSearchAdvanced.php:107
 #: ../themes/Crao/templates/navbar.tmpl:43
@@ -2904,7 +2867,6 @@
 msgid "Simple jabber presence plugin"
 msgstr ""
 
-# lib/stdlib.php:207 lib/stdlib.php:215
 #: ../lib/plugin/LdapSearch.php:54
 msgid "LdapSearch"
 msgstr ""
@@ -2976,7 +2938,6 @@
 msgid "Unsupported format argument %s"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/LinkSearch.php:35 ../lib/plugin/LinkSearch.php:109
 msgid "LinkSearch"
 msgstr ""
@@ -2994,7 +2955,6 @@
 msgid "Filter by this link. These are pagenames. With autocompletion."
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../lib/plugin/LinkSearch.php:94
 msgid "outgoing"
 msgstr ""
@@ -3371,7 +3331,6 @@
 msgid "minor edit"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/PageHistory.php:241
 msgid "History of changes."
 msgstr ""
@@ -3381,7 +3340,6 @@
 msgid "List PageHistory for %s"
 msgstr ""
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../lib/plugin/PageInfo.php:32 ../themes/Crao/templates/actionbar.tmpl:28
 #: ../themes/default/templates/actionbar.tmpl:36
 #: ../themes/MonoBook/templates/actionbar.tmpl:77
@@ -3640,12 +3598,10 @@
 msgid "List the most popular tags."
 msgstr "Las tags más populares."
 
-# lib/diff.php:997
 #: ../lib/plugin/PopularTags.php:52 ../lib/plugin/_WikiTranslation.php:51
 msgid "CategoryCategory"
 msgstr "CategoriaCategoria"
 
-# lib/diff.php:997
 #: ../lib/plugin/PopularTags.php:71
 msgid "Category"
 msgstr "Categoría"
@@ -3747,17 +3703,14 @@
 msgid "Rating: %.1f (%d votes)"
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../lib/plugin/RateIt.php:148
 msgid "Your current rating: "
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../lib/plugin/RateIt.php:149
 msgid "Your current prediction: "
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../lib/plugin/RateIt.php:150
 msgid "Change your rating from "
 msgstr ""
@@ -3766,7 +3719,6 @@
 msgid " to "
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../lib/plugin/RateIt.php:152
 msgid "Add your rating: "
 msgstr ""
@@ -3824,7 +3776,6 @@
 msgid "UserContribs"
 msgstr ""
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RecentChanges.php:59
 #: ../themes/MonoBook/templates/navbar.tmpl:18
 #: ../themes/Sidebar/templates/navbar.tmpl:46
@@ -3954,12 +3905,10 @@
 msgid "All %s are listed below."
 msgstr "Todos los %s se enumeran abajo."
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/RecentChanges.php:386 ../lib/plugin/RecentComments.php:82
 msgid "No comments found"
 msgstr "Ningunos comentarios encontrados"
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/RecentChanges.php:388
 msgid "No changes found"
 msgstr "Ningunos cambios encontrados"
@@ -3968,7 +3917,6 @@
 msgid "Click to add this feed to your sidebar"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/RecentChanges.php:806
 msgid "Title Search"
 msgstr "Una búsqueda de títulos"
@@ -3977,7 +3925,6 @@
 msgid "List all recent changes in this wiki."
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/RecentChanges.php:1370
 msgid "Show changes for:"
 msgstr "Demuestre los cambios para:"
@@ -4024,7 +3971,6 @@
 msgid "Page once only"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/RecentChanges.php:1483
 msgid "Full changes"
 msgstr ""
@@ -4108,12 +4054,10 @@
 msgid "List of changes on all pages which are linked to from this page."
 msgstr "Enumere todas las páginas que se liguen a esta página."
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RelatedChanges.php:57 ../lib/plugin/RelatedChanges.php:86
 msgid "Related Changes"
 msgstr "Cambios Relacionados"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/RelatedChanges.php:86 ../themes/Crao/templates/navbar.tmpl:16
 #: ../themes/MonoBook/templates/navbar.tmpl:55
 msgid "RelatedChanges"
@@ -4174,7 +4118,6 @@
 msgid "Display the list of relations and attributes on this page."
 msgstr "Mostrar la lista de las relaciones y atributos en esta página."
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/SemanticRelations.php:88
 #: ../lib/plugin/SemanticRelations.php:108 ../lib/plugin/SemanticSearch.php:58
 msgid "SemanticSearch"
@@ -4199,7 +4142,6 @@
 msgid "Find out how to add relations and attributes to pages."
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/SemanticSearchAdvanced.php:62
 #: ../lib/plugin/SemanticSearch.php:220
 msgid "SemanticSearchAdvanced"
@@ -4473,7 +4415,6 @@
 msgid "no cache used"
 msgstr ""
 
-# lib/diff.php:1015
 #: ../lib/plugin/SystemInfo.php:122
 msgid "cached pagedata:"
 msgstr "Página archivada:"
@@ -4750,7 +4691,6 @@
 msgid "Include an external web page within the body of a wiki page."
 msgstr ""
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/Transclude.php:60
 msgid "Transcluded page"
 msgstr ""
@@ -4760,7 +4700,6 @@
 msgid "See: %s"
 msgstr ""
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/Transclude.php:118
 #, php-format
 msgid "Transcluded from %s"
@@ -4827,7 +4766,6 @@
 msgid "From english to %s: "
 msgstr ""
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/TranslateText.php:110
 msgid "Translate"
 msgstr ""
@@ -4840,7 +4778,6 @@
 msgid "Includes the content of all SubPages of the current page."
 msgstr ""
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/UnfoldSubpages.php:165
 #, php-format
 msgid "Included from %s:"
@@ -4976,7 +4913,6 @@
 msgid "Password cannot be changed."
 msgstr "La contraseña no puede ser cambiada."
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/UserPreferences.php:149
 msgid "No changes."
 msgstr "Ningunos cambios."
@@ -5175,7 +5111,7 @@
 msgstr ""
 
 #: ../lib/plugin/WhoIsOnline.php:75
-msgid "Who is online"
+msgid "Who is Online"
 msgstr ""
 
 #: ../lib/plugin/WhoIsOnline.php:78
@@ -5219,7 +5155,6 @@
 msgid "%d pages have been changed."
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminChmod.php:87 ../lib/plugin/WikiAdminChown.php:99
 #: ../lib/plugin/WikiAdminMarkup.php:102
 #: ../lib/plugin/WikiAdminSearchReplace.php:113
@@ -5380,7 +5315,6 @@
 msgid "Didn't purge page '%s'. Access denied."
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminPurge.php:77
 msgid "One page has been permanently purged:"
 msgstr ""
@@ -5390,7 +5324,6 @@
 msgid "%d pages have been permanently purged:"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminPurge.php:85
 msgid "No pages purged."
 msgstr ""
@@ -5429,7 +5362,6 @@
 msgid "Didn't remove page '%s'. Access denied."
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminRemove.php:121
 msgid "One page has been removed:"
 msgstr ""
@@ -5439,7 +5371,6 @@
 msgid "%d pages have been removed:"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminRemove.php:129
 msgid "No pages removed."
 msgstr ""
@@ -5493,38 +5424,30 @@
 msgid "Access denied to rename page '%s'."
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:92
+#: ../lib/plugin/WikiAdminRename.php:92 ../lib/plugin/WikiAdminRename.php:107
 #, php-format
-msgid "Renamed page from '%s' to '%s'"
-msgstr ""
+msgid "Renamed page from '%s' to '%s'."
+msgstr "retitulado de '%s' para '%s'."
 
 #: ../lib/plugin/WikiAdminRename.php:101
 #, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminRename.php:107
-#, php-format
-msgid "Renamed page '%s' to '%s'."
-msgstr ""
-
 #: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminRename.php:124
 msgid "One page has been renamed:"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminRename.php:127
 #, php-format
 msgid "%d pages have been renamed:"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiAdminRename.php:133
 msgid "No pages renamed."
 msgstr ""
@@ -5538,7 +5461,8 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminRename.php:215 ../lib/plugin/WikiAdminRename.php:241
-msgid "Rename page"
+#: ../lib/WikiTheme.php:1034
+msgid "Rename Page"
 msgstr ""
 
 #: ../lib/plugin/WikiAdminRename.php:225
@@ -5870,7 +5794,6 @@
 msgid "WikiBlog"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/plugin/WikiBlog.php:91
 #, php-format
 msgid "Show and add blogs for %s"
@@ -5907,6 +5830,7 @@
 #: ../themes/default/templates/login.tmpl:71
 #: ../themes/default/templates/login.tmpl:86
 #: ../themes/MonoBook/templates/signin.tmpl:19
+#: ../themes/Sidebar/templates/signin.tmpl:17
 #: ../themes/smaller/templates/signin.tmpl:54
 msgid "Sign In"
 msgstr "Muestra Adentro"
@@ -5958,7 +5882,6 @@
 msgid "Missing %s for %s"
 msgstr ""
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/plugin/WikiPoll.php:223
 msgid "Reset"
 msgstr ""
@@ -5988,7 +5911,6 @@
 msgid "AllPagesOwnedByMe"
 msgstr ""
 
-# lib/diff.php:997
 #: ../lib/plugin/_WikiTranslation.php:52
 msgid "CategoryHomePages"
 msgstr ""
@@ -6012,7 +5934,6 @@
 msgid "FindPage"
 msgstr "BuscarPágina"
 
-# lib/stdlib.php:384 lib/stdlib.php:445
 #: ../lib/plugin/_WikiTranslation.php:56
 msgid "FullRecentChanges"
 msgstr ""
@@ -6153,7 +6074,6 @@
 msgid "HomePageAlias"
 msgstr "PáginaPrincipalAlias"
 
-# lib/fullsearch.php:48
 #: ../lib/plugin/_WikiTranslation.php:91
 msgid "InterWiki"
 msgstr "InterWiki"
@@ -6231,18 +6151,10 @@
 msgid "Required argument %s missing"
 msgstr ""
 
-#: ../lib/plugin/YouTube.php:104 ../lib/plugin/YouTube.php:106
-#: ../lib/plugin/YouTube.php:108 ../lib/plugin/YouTube.php:110
-#: ../lib/plugin/YouTube.php:134 ../lib/plugin/YouTube.php:136
-#, php-format
-msgid "Invalid argument %s"
-msgstr ""
-
 #: ../lib/purgepage.php:18 ../lib/removepage.php:18
 msgid "Sorry, this page does not exist."
 msgstr "Apesadumbrada, esta página no está en la base de datos."
 
-# lib/pageinfo.php:21
 #: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1038
 msgid "Purge Page"
 msgstr ""
@@ -6252,7 +6164,6 @@
 msgid "You are about to purge '%s'!"
 msgstr "¡Usted está a punto de eliminar '%s'!"
 
-# lib/editpage.php:23
 #: ../lib/purgepage.php:44 ../lib/removepage.php:44
 msgid "Someone has edited the page!"
 msgstr "¡Alguien ha modificado la página!"
@@ -6385,7 +6296,6 @@
 msgid "Revision Not Found"
 msgstr "Revisión No encontrada"
 
-# lib/pageinfo.php:36
 #: ../lib/stdlib.php:1289
 #, php-format
 msgid "I'm sorry.  Version %d of %s is not in the database."
@@ -6439,10 +6349,6 @@
 msgid "Unable to open directory '%s' for reading"
 msgstr ""
 
-#: ../lib/stdlib.php:1953
-msgid "Okay"
-msgstr ""
-
 #: ../lib/stdlib.php:2138 ../lib/stdlib.php:2151
 #, php-format
 msgid "... (first %s words)"
@@ -6494,7 +6400,6 @@
 msgid "ActionPage"
 msgstr ""
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../lib/upgrade.php:121
 msgid "_AuthInfo"
 msgstr ""
@@ -6667,7 +6572,6 @@
 msgid "%s not found in %s"
 msgstr ""
 
-# lib/msql.php:29 lib/mysql.php:36
 #: ../lib/upgrade.php:991
 #, php-format
 msgid "couldn't move %s to %s"
@@ -6728,7 +6632,6 @@
 "de la INSTALACIÓN y mueva la base de datos a una localización permanente o "
 "arriesgúela el perder de todas las páginas!"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/WikiDB.php:551
 #, php-format
 msgid "renamed from %s"
@@ -6844,7 +6747,6 @@
 msgid "Rating"
 msgstr "Grados"
 
-# lib/pageinfo.php:10 lib/stdlib.php:239
 #: ../lib/wikilens/PageListColumns.php:381
 msgid "Go?"
 msgstr ""
@@ -6857,7 +6759,6 @@
 msgid "Avg. Rating"
 msgstr ""
 
-# lib/pageinfo.php:21
 #: ../lib/wikilens/PageListColumns.php:390
 msgid "Top Recommendations"
 msgstr ""
@@ -6891,13 +6792,11 @@
 msgid "Argument '%s' not declared by plugin."
 msgstr "Parámetro '%s' no declarada por plugin."
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/WikiPlugin.php:357
 #, php-format
 msgid "Plugin %s failed."
 msgstr "Plugin '%s' falló."
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/WikiPlugin.php:363
 #, php-format
 msgid "Plugin %s disabled."
@@ -6984,10 +6883,6 @@
 msgid "Sign Out"
 msgstr "Registro Hacia fuera"
 
-#: ../lib/WikiTheme.php:1034
-msgid "Rename Page"
-msgstr ""
-
 #: ../lib/WikiTheme.php:1035 ../themes/MacOSX/themeinfo.php:136
 msgid "Lock Page"
 msgstr "Bloquear Página"
@@ -7023,7 +6918,6 @@
 msgid "Modern"
 msgstr "Moderno"
 
-# lib/msql.php:237 lib/msql.php:312
 #: ../lib/WikiTheme.php:1808
 #, php-format
 msgid "Plugin %s: undefined"
@@ -7107,7 +7001,6 @@
 msgid "Wrong password: "
 msgstr ""
 
-# lib/msql.php:29 lib/mysql.php:36
 #: ../lib/WikiUser/LDAP.php:214
 #, php-format
 msgid "Could not connect to LDAP host %s"
@@ -7254,7 +7147,6 @@
 "Entre en contacto con por favor a su administrador de PhpWiki para la ayuda."
 
 # old-style. new style (1.3.x) is CategoryHomePages
-# lib/diff.php:997
 #: ../lib/WikiUser.php:456 ../themes/default/templates/homepage.tmpl:37
 msgid "CategoryHomepage"
 msgstr "CategoríaHomepage"
@@ -7276,13 +7168,11 @@
 "Viejo UserPage %s sin la contraseña almacenada puesta al día con contraseña "
 "vacía. Fije una contraseña en su UsuarioPreferencias."
 
-# lib/msql.php:29 lib/mysql.php:36
 #: ../lib/WikiUser/POP3.php:77
 #, php-format
 msgid "Couldn't connect to %s"
 msgstr "No podía conectar con %s"
 
-# lib/pageinfo.php:21
 #: ../lib/WysiwygEdit/Wikiwyg.php:69
 msgid "Apply changes"
 msgstr ""
@@ -7291,17 +7181,14 @@
 msgid "Exit toolbar"
 msgstr ""
 
-# lib/fullsearch.php:48
 #: ../lib/WysiwygEdit/Wikiwyg.php:71
 msgid "Title 1"
 msgstr "Título 1"
 
-# lib/fullsearch.php:48
 #: ../lib/WysiwygEdit/Wikiwyg.php:72
 msgid "Title 2"
 msgstr "Título 2"
 
-# lib/fullsearch.php:48
 #: ../lib/WysiwygEdit/Wikiwyg.php:73
 msgid "Title 3"
 msgstr "Título 3"
@@ -7366,7 +7253,6 @@
 msgid "HowTo"
 msgstr ""
 
-# lib/pageinfo.php:26 lib/pageinfo.php:75
 #: ../themes/blog/templates/actionbar.tmpl:15
 #: ../themes/smaller/templates/actionbar.tmpl:36
 msgid "Info"
@@ -7396,7 +7282,6 @@
 msgid "Headline"
 msgstr ""
 
-# lib/diff.php:997
 #: ../themes/blog/templates/blogform.tmpl:18
 #: ../themes/default/templates/blogform.tmpl:18
 #: ../themes/fusionforge/templates/blogform.tmpl:18
@@ -7486,7 +7371,6 @@
 msgid "You are viewing an old revision of this page."
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../themes/blog/templates/browse.tmpl:8
 #: ../themes/blog/templates/viewsource.tmpl:13
 #: ../themes/Crao/templates/browse.tmpl:8
@@ -7646,7 +7530,6 @@
 msgid "Warning: You are editing an old revision."
 msgstr ""
 
-# lib/pageinfo.php:70
 #: ../themes/Crao/templates/editpage.tmpl:20
 #: ../themes/default/templates/editpage.tmpl:22
 #: ../themes/fusionforge/templates/editpage.tmpl:17
@@ -7729,7 +7612,6 @@
 msgid "Today"
 msgstr "Hoy"
 
-# lib/fullsearch.php:48
 #: ../themes/Crao/templates/navbar.tmpl:47
 #: ../themes/default/templates/search.tmpl:20
 #: ../themes/default/templates/search.tmpl:25
@@ -7936,8 +7818,10 @@
 msgstr ""
 
 #: ../themes/default/templates/info.tmpl:153
+#: ../themes/fusionforge/templates/actionbar.tmpl:20
+#: ../themes/fusionforge/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/info.tmpl:159
-msgid "Action page"
+msgid "Action Page"
 msgstr ""
 
 #: ../themes/default/templates/info.tmpl:156
@@ -8392,11 +8276,6 @@
 
 #: ../themes/...
 
[truncated message content]

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

From: <var...@us...> - 2011-10-03 14:49:25

Revision: 8166
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8166&view=rev
Author:   vargenau
Date:     2011-10-03 14:49:15 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Fix case to be consistent

Modified Paths:
--------------
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/WhoIsOnline.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl
    trunk/themes/default/templates/info.tmpl
    trunk/themes/fusionforge/templates/navbar.tmpl

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/lib/plugin/GoogleMaps.php	2011-10-03 14:49:15 UTC (rev 8166)
@@ -100,7 +100,7 @@
         case "Satellite": $type = "_SATELLITE_TYPE"; break;
         case "Map":       $type = "_MAP_TYPE"; break;
         case "Hybrid":    $type = "_HYBRID_TYPE"; break;
-        default: return $this->error(sprintf(_("invalid argument %s"), $MapType));
+        default: return $this->error(sprintf(_("Invalid argument %s"), $MapType));
         }
         $div = HTML::div(array('id'=>$id,'style'=>'width: '.$width.'; height: '.$height));
 

Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/lib/plugin/WhoIsOnline.php	2011-10-03 14:49:15 UTC (rev 8166)
@@ -72,7 +72,7 @@
     function box($args=false, $request=false, $basepage=false) {
         if (!$request) $request =& $GLOBALS['request'];
         $stats = $this->getStats($request->_dbi,$request,'summary');
-        return $this->makeBox(_("Who is online"),
+        return $this->makeBox(_("Who is Online"),
                               HTML(HTML::Raw('&middot; '),
                                    WikiLink(_("WhoIsOnline"),'auto',
                                             fmt("%d online users", $stats['NUM_USERS']))));

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/lib/plugin/WikiAdminRename.php	2011-10-03 14:49:15 UTC (rev 8166)
@@ -89,7 +89,7 @@
                     $version = $current->getVersion();
                     $meta = $current->_data;
                     $text = $current->getPackedContent();
-                    $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'"), $name, $newname);
+                    $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'."), $name, $newname);
                     $meta['is_minor_edit'] = 1;
                     $meta['author'] = $request->_user->UserName();
                     unset($meta['mtime']); // force new date
@@ -104,7 +104,7 @@
                         $meta['author'] = $request->_user->UserName();
                         $page->save($text, 1, $meta);
                     }
-                    $ul->pushContent(HTML::li(fmt("Renamed page '%s' to '%s'.",
+                    $ul->pushContent(HTML::li(fmt("Renamed page from '%s' to '%s'.",
                                                   $name, WikiLink($newname))));
                     $count++;
                 } else {
@@ -212,7 +212,7 @@
             $header = $this->renameForm($header, $post_args, $singlepage);
         } else {
             if ($singlepage === true) {
-                $button_label = _("Rename page");
+                $button_label = _("Rename Page");
             } else {
                 $button_label = _("Rename selected pages");
             }
@@ -238,7 +238,7 @@
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
                           HTML::fieldset(
-                              HTML::legend(_("Rename page")),
+                              HTML::legend(_("Rename Page")),
                               $header,
                               $buttons,
                               $list,

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/MonoBook/templates/info.tmpl	2011-10-03 14:49:15 UTC (rev 8166)
@@ -156,7 +156,7 @@
     $pagetype []= _("User page");
 }
 if (isActionPage($page->getName())) {
-    $pagetype []= _("Action page");
+    $pagetype []= _("Action Page");
 }
 if ($page->get('pagetype') == 'wikiblog') {
     $pagetype []= _("Blog page");

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2011-10-03 14:49:15 UTC (rev 8166)
@@ -58,7 +58,7 @@
       <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
     <?php } ?>
     <?php if ($user->isSignedIn()) { ?>
-      <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+      <li><? $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
     <?php } ?>
     <li>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2011-10-03 14:49:15 UTC (rev 8166)
@@ -48,7 +48,7 @@
       <li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
     <?php } ?>
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
-      <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+      <li><? $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
       <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
     <?php } ?>
     <li>

Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/default/templates/info.tmpl	2011-10-03 14:49:15 UTC (rev 8166)
@@ -150,7 +150,7 @@
     $pagetype []= _("User page");
 }
 if (isActionPage($page->getName())) {
-    $pagetype []= _("Action page");
+    $pagetype []= _("Action Page");
 }
 if ($page->get('pagetype') == 'wikiblog') {
     $pagetype []= _("Blog page");

Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl	2011-10-03 14:48:04 UTC (rev 8165)
+++ trunk/themes/fusionforge/templates/navbar.tmpl	2011-10-03 14:49:15 UTC (rev 8166)
@@ -24,5 +24,5 @@
      <?php if ($dbh->isWikiPage($username)) { ?>
        <tr><td class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></td></tr>
      <?php } ?>
-     <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></td></tr>
+     <tr><td class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("My Preferences")) ?></td></tr>
    <?php } ?>

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

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

From: <var...@us...> - 2011-10-03 14:48:11

Revision: 8165
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8165&view=rev
Author:   vargenau
Date:     2011-10-03 14:48:04 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
"Login" --> "Sign In"

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

Modified: trunk/themes/Sidebar/templates/signin.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/signin.tmpl	2011-10-03 12:57:13 UTC (rev 8164)
+++ trunk/themes/Sidebar/templates/signin.tmpl	2011-10-03 14:48:04 UTC (rev 8165)
@@ -14,7 +14,7 @@
     <li id="pt-userpage"><?php echo WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li>
   <?php } ?>
   <!-- Login -->
-  <li id="pt-login"><?php echo HTML::a(array('href'=>'?auth[login]=1'),$sp,_("Login"),$sp) ?></li>
+  <li id="pt-login"><?php echo HTML::a(array('href'=>'?auth[login]=1'),$sp,_("Sign In"),$sp) ?></li>
 <?php } else { ?>
      <li id="pt-login"><a id="login"><?php echo _("Login required...") ?></a></li>
 <?php } ?>

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 .. 119 120 121 122 123 .. 538 > >> (Page 121 of 538)